fix building and LuaJIT name

OpenXRay · Jun 3, 2018 · f9a9e8e · f9a9e8e
1 parent f7fa055
commit f9a9e8e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
+[submodule "Externals/LuaJIT"]
+	path = Externals/LuaJIT
+	url = https://github.com/q4a/LuaJIT.git
 [submodule "Externals/luabind"]
 	path = Externals/luabind
 	url = https://github.com/q4a/luabind-deboostified.git

diff --git a/Externals/luajit → Externals/LuaJIT b/Externals/luajit → Externals/LuaJIT
diff --git a/src/xrCore/CMakeLists.txt b/src/xrCore/CMakeLists.txt
@@ -1,10 +1,6 @@
-<<<<<<< HEAD
 project(xrCore)
 
 list(APPEND DIRS
-=======
-add_dir (
->>>>>>> upstream/xd_dev
 	"."
 	"Animation"
 	"Compression"
@@ -20,18 +16,9 @@ add_dir (
 
 add_dir("${DIRS}")
 
-<<<<<<< HEAD
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/pugixml/src ${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include)
 
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
 target_link_libraries(${PROJECT_NAME} ${SDL2_LIB} ${OPENSSL_LIBRARIES} ${LZO_LIBRARY} ${CRYPTO_LIBRARY} ${PUGIXML_LIBRARY})
-=======
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include)
-
-add_library(xrCore SHARED ${XRCORE__SOURCES} ${XRCORE__INCLUDES})
-
-set_target_properties(xrCore PROPERTIES PREFIX "")
-target_link_libraries(xrCore ${SDL2_LIB} ${OPENSSL_LIBRARIES} ${LZO_LIBRARY} ${CRYPTO_LIBRARY} ${PUGIXML_LIBRARY})
->>>>>>> upstream/xd_dev