WIP

CMakeLists.txt

@@ -6,6 +6,7 @@ project(OpenXRay)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+#set(CMAKE_VERBOSE_MAKEFILE ON)
 
 if (CMAKE_VERBOSE_MAKEFILE)
     set(CMAKE_EXECUTE_PROCESS_COMMAND_ECHO STDOUT)
@@ -181,9 +182,6 @@ endif()
 
 message(STATUS "USE_LTO: ${USE_LTO}")
 
-set(LUA_LIBRARIES xrLuajit)
-set(LUA_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/Externals/LuaJIT/src")
-
 if (PROJECT_PLATFORM_ARM)
     add_compile_options(-mfpu=neon)
 elseif (PROJECT_PLATFORM_ARM64)
@@ -227,7 +225,6 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
         MIXED
     )
     add_compile_options(-Og)
-    set(LUA_LIBRARIES xrLuajit-debug)
 endif()
 
 add_compile_definitions(
@@ -265,6 +262,8 @@ endif()
 
 message("Using ${MEMORY_ALLOCATOR} memory allocator")
 
+option(XRAY_USE_LUAJIT "Use LuaJIT" ON)
+
 add_subdirectory(Externals)
 
 add_compile_options(

Externals/CMakeLists.txt

@@ -1,9 +1,16 @@
-add_subdirectory(LuaJIT-proj)
+if (XRAY_USE_LUAJIT)
+    add_subdirectory(LuaJIT-proj)
+else()
+    find_package(Lua51 REQUIRED)
+endif()
+
 add_subdirectory(xrLuaFix)
 add_subdirectory(luabind)
+
 if (USE_CXIMAGE)
     add_subdirectory(cximage)
 endif()
+
 add_subdirectory(GameSpy)
 add_subdirectory(OPCODE)
 add_subdirectory(ode)