Now using LuaJIT. Closed #91.

Unarelith · Jul 9, 2020 · 02b9f8b · 02b9f8b
1 parent c8643e0
commit 02b9f8b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -15,7 +15,8 @@
 	ignore = dirty
 [submodule "external/lua"]
 	path = external/lua
-	url = https://github.com/Unarelith/lua
+	url = https://github.com/WohlSoft/LuaJIT
+	ignore = dirty
 [submodule "external/SFML"]
 	path = external/SFML
 	url = https://github.com/SFML/SFML
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -113,18 +113,12 @@ include_directories(external/zlib ${CMAKE_CURRENT_BINARY_DIR}/external/zlib)
 #------------------------------------------------------------------------------
 # - lua
 #------------------------------------------------------------------------------
-set(LUA_BUILD_LUA_LUAC OFF CACHE BOOL "")
-set(LUA_BUILD_WLUA OFF CACHE BOOL "")
-set(LUA_USE_READLINE OFF CACHE BOOL "")
-
 add_subdirectory(external/lua)
-include_directories(external/lua/src ${CMAKE_CURRENT_BINARY_DIR}/external/lua)
+include_directories(external/lua/src)
 
 #------------------------------------------------------------------------------
 # - sol3 (sol2 v3.x)
 #------------------------------------------------------------------------------
-set(LUA_LOCAL_DIR external/lua)
-
 add_subdirectory(external/sol2)
 
 #------------------------------------------------------------------------------

diff --git a/external/lua b/external/lua
diff --git a/source/common/CMakeLists.txt b/source/common/CMakeLists.txt
@@ -25,7 +25,7 @@ add_dependencies(${PROJECT_NAME}
 	zlib
 	EnTT
 	gamekit
-	liblua
+	libluajit
 	sol2
 )
 
@@ -52,7 +52,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
 	sfml-network
 	sfml-system
 	sol2
-	liblua
+	libluajit
 	gamekit
 	zlib
 	${OPENGL_LIBRARIES}