Unarelith/OpenMiner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[external/lua] Changed repo for Windows compatibility. [external/entt] Now using latest stable version.

Browse Source
This commit is contained in:
Quentin Bazin 2020-05-23 03:57:30 +02:00
parent e104e6fc0d
commit 5753fc2847
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -15,4 +15,4 @@
ignore = dirty ignore = dirty
[submodule "external/lua"] [submodule "external/lua"]
path = external/lua path = external/lua
url = https://github.com/walterschell/Lua.git url = https://github.com/xpol/lua

7
CMakeLists.txt
View File

@ -75,11 +75,13 @@ if(NOT EXISTS "${PROJECT_SOURCE_DIR}/external/gamekit/CMakeLists.txt")
message(FATAL_ERROR "The submodules were not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.") message(FATAL_ERROR "The submodules were not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.")
endif() endif()
set(BUILD_SHARED_LIBS OFF)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# - EnTT # - EnTT
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
add_subdirectory(external/entt) add_subdirectory(external/entt)
include_directories(external/entt/single_include) include_directories(external/entt/src)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# - gamekit # - gamekit
@ -95,7 +97,10 @@ add_subdirectory(external/zlib ${CMAKE_CURRENT_BINARY_DIR}/external/zlib)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# - lua # - lua
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
set(LUA_BUILD_WLUA OFF CACHE BOOL "")
add_subdirectory(external/lua) add_subdirectory(external/lua)
include_directories(external/lua/src ${CMAKE_CURRENT_BINARY_DIR}/external/lua)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# - sol3 (sol2 v3.x) # - sol3 (sol2 v3.x)

2
external/entt vendored

@ -1 +1 @@
Subproject commit 39baa59625ff59cda4425721a0c52819fd715476 Subproject commit bf0160adbd8fb405d758808f879de917e81465ca

2
external/lua vendored

@ -1 +1 @@
Subproject commit 722505a73df1b2f42d5dde5c617b33edf7edbd43 Subproject commit 8eb1482b493a3a44f004c86baeeb0683ec094542

4
source/common/CMakeLists.txt
View File

@ -23,7 +23,7 @@ add_dependencies(${PROJECT_NAME}
zlib zlib
EnTT EnTT
gamekit gamekit
lua_static liblua
sol2 sol2
) )
@ -48,7 +48,7 @@ endif ()
target_link_libraries(${PROJECT_NAME} PUBLIC target_link_libraries(${PROJECT_NAME} PUBLIC
sol2 sol2
lua_static liblua
gamekit gamekit
zlib zlib
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}