Merge remote-tracking branch 'upstream/xd_dev' into linux

Author: q4a

.gitmodules

@@ -1,7 +1,3 @@
-[submodule "Externals/luajit"]
-	path = Externals/luajit
-	url = https://github.com/q4a/LuaJIT.git
-	branch = xray
 [submodule "Externals/luabind"]
 	path = Externals/luabind
 	url = https://github.com/q4a/luabind-deboostified.git
@@ -63,6 +59,3 @@
 [submodule "Externals/gli"]
 	path = Externals/gli
 	url = https://github.com/g-truc/gli.git
-[submodule "Externals/glslang"]
-	path = Externals/glslang
-	url = https://github.com/KhronosGroup/glslang.git

CMakeLists.txt

@@ -8,7 +8,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive --std=c++17")
 
 add_definitions(-D_MT -D_CPPUNWIND -DPURE_DYNAMIC_CAST -DDECLARE_SPECIALIZATION -DM_NOSTDCONTAINERS_EXT -DUSE_OGL)
 
-set(LUA_INCLUDE_DIR Externals/luajit/src)
+set(LUA_INCLUDE_DIR Externals/LuaJIT/src)
 set(LUA_LIBRARIES luajit)
 set(LUA_FOUND 1)
 if (NOT WIN32)

Externals/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_subdirectory(luajit)
+add_subdirectory(LuaJIT)
 add_subdirectory(luabind)
 add_subdirectory(lzo)
 add_subdirectory(cximage)