mirror of
https://github.com/ApfelTeeSaft/gameBase.git
synced 2026-08-26 19:23:30 +00:00
improved dependency management
This commit is contained in:
@@ -1,3 +1,6 @@
|
||||
[submodule "external/glfw"]
|
||||
path = external/glfw
|
||||
url = https://github.com/glfw/glfw
|
||||
[submodule "external/lua"]
|
||||
path = external/lua
|
||||
url = https://github.com/lua/lua
|
||||
|
||||
+11
-6
@@ -3,24 +3,29 @@ project(gameBase)
|
||||
|
||||
set(CMAKE_BUILD_TYPE Debug)
|
||||
cmake_policy(SET CMP0015 NEW)
|
||||
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||
|
||||
set(states abstractAppState.cpp)
|
||||
set(core inputManager.cpp mapping.h stateManager.cpp luaManager.cpp)
|
||||
set(util util.cpp)
|
||||
|
||||
set(GLFW_DIR vb01/external/glfw)
|
||||
set(LUA_DIR external/lua-5.4.4/src)
|
||||
set(LUA_DIR external/lua)
|
||||
|
||||
include_directories(../${GLFW_DIR}/include/GLFW)
|
||||
|
||||
#set(LUA_LIB_DIR ${LUA_DIR})
|
||||
set(LUA_LIB_DIR ${LUA_DIR})
|
||||
include_directories(${LUA_DIR})
|
||||
link_directories(${LUA_DIR})
|
||||
|
||||
add_library(gameBase ${states} ${core} ${util})
|
||||
|
||||
add_library(gameBase STATIC ${states} ${core} ${util})
|
||||
set(GLFW_DIR ../vb01/external/glfw)
|
||||
set(LIB_NAME gameBase)
|
||||
|
||||
link_directories(../../build/external/${GLFW_DIR}/src)
|
||||
target_link_libraries(${LIB_NAME} glfw)
|
||||
set(GLFW_LIB_DIR ../vb01/build/external/glfw/src)
|
||||
target_include_directories(${LIB_NAME} PUBLIC ${GLFW_DIR}/include/GLFW)
|
||||
target_link_directories(${LIB_NAME} PUBLIC ${GLFW_LIB_DIR})
|
||||
|
||||
target_link_libraries(${LIB_NAME} lua)
|
||||
target_link_libraries(gameBase glfw)
|
||||
|
||||
|
||||
+1
Submodule external/lua added at 8426d9b4d4
Reference in New Issue
Block a user