From 27ccda5b10d32043d870f56c92994097da2e8239 Mon Sep 17 00:00:00 2001 From: CPunch Date: Wed, 13 Dec 2023 16:33:32 -0600 Subject: [PATCH] added Lua to vendor sources - TODO: add Lua to our makefile eventually --- .gitmodules | 3 +++ CMakeLists.txt | 14 +++++++++++--- vendor/Lua | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) create mode 160000 vendor/Lua diff --git a/.gitmodules b/.gitmodules index db4de7c..f7de013 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "tdata"] path = tdata url = https://github.com/OpenFusionProject/tabledata.git +[submodule "vendor/Lua"] + path = vendor/Lua + url = https://github.com/walterschell/Lua.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 7aee17d..9aa65f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,20 +34,28 @@ else() set(BIN_NAME fusion) endif() +# add lua +option(LUA_BUILD_COMPILER OFF) +option(LUA_ENABLE_SHARED OFF) +option(LUA_ENABLE_TESTING OFF) +add_subdirectory(vendor/Lua) + include_directories(src vendor) -file(GLOB_RECURSE SOURCES src/**.[ch]pp vendor/**.[ch]pp vendor/**.[ch] version.h) +file(GLOB_RECURSE VENDOR_SOURCES vendor/bcrypt/**.[ch] vendor/mingw/**.h vendor/INIReader.hpp vendor/JSON.hpp) + +file(GLOB_RECURSE SOURCES src/**.[ch]pp version.h) configure_file(version.h.in ${CMAKE_SOURCE_DIR}/version.h @ONLY) -add_executable(openfusion ${SOURCES}) +add_executable(openfusion ${SOURCES} ${VENDOR_SOURCES}) set_target_properties(openfusion PROPERTIES OUTPUT_NAME ${BIN_NAME}) # find sqlite3 and use it find_package(SQLite3 REQUIRED) target_include_directories(openfusion PRIVATE ${SQLite3_INCLUDE_DIRS}) -target_link_libraries(openfusion PRIVATE ${SQLite3_LIBRARIES}) +target_link_libraries(openfusion PRIVATE lua_static ${SQLite3_LIBRARIES}) # Makes it so config, tdata, etc. get picked up when starting via the debugger in VS set_property(TARGET openfusion PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") diff --git a/vendor/Lua b/vendor/Lua new file mode 160000 index 0000000..88246d6 --- /dev/null +++ b/vendor/Lua @@ -0,0 +1 @@ +Subproject commit 88246d621abf7b6fba9332f49229d507f020e450