Merge pull request #1010 from jameskr97/feature/update-luajit

📚 Update LuaJIT
etternagame · Jul 16, 2021 · 614c4d0 · 614c4d0
2 parents 021eae5 + 418be3d
commit 614c4d0
Show file tree

Hide file tree

Showing 248 changed files with 10,779 additions and 5,538 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -91,7 +91,7 @@ target_link_libraries(Etterna PRIVATE SQLiteCpp sqlite3)
 target_link_libraries(Etterna PRIVATE zlib)
 target_link_libraries(Etterna PRIVATE rapidjson)
 target_link_libraries(Etterna PRIVATE websocketpp)
-target_link_libraries(Etterna PRIVATE luajit)
+target_link_libraries(Etterna PRIVATE libluajit)
 target_link_libraries(Etterna PRIVATE discord-rpc)
 target_link_libraries(Etterna PRIVATE muFFT)
 target_link_libraries(Etterna PRIVATE glfw)

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
@@ -39,7 +39,7 @@ add_subdirectory(rapidjson)
 add_subdirectory(stb)
 
 ## Remaining Libraries
-add_subdirectory(LuaJIT-2.1.0-beta3)
+add_subdirectory(luajit)
 add_subdirectory(muFFT)
 add_subdirectory(glew-1.5.8)
 add_subdirectory(pcre)
@@ -72,7 +72,7 @@ list(APPEND EXT_TARGETS
     ogg vorbis glfw
     libcurl fmt)
 
-list(APPEND LUA_TARGETS luajit lua minilua buildvm)
+list(APPEND LUA_TARGETS luajit libluajit minilua buildvm)
 
 ## Sort all extern libraries to a IDE folder/filter
 set_property(TARGET ${EXT_TARGETS} PROPERTY FOLDER "External Libraries")

diff --git a/extern/LuaJIT-2.1.0-beta3/CMakeLists.txt b/extern/LuaJIT-2.1.0-beta3/CMakeLists.txt