mirror of
https://github.com/OpenFusionProject/OpenFusion.git
synced 2024-12-22 11:20:05 +00:00
added Lua to vendor sources
- TODO: add Lua to our makefile eventually
This commit is contained in:
parent
d9ebb4e3ef
commit
27ccda5b10
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -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
|
||||
|
@ -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}")
|
||||
|
1
vendor/Lua
vendored
Submodule
1
vendor/Lua
vendored
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 88246d621abf7b6fba9332f49229d507f020e450
|
Loading…
Reference in New Issue
Block a user