Ruckneum/townforge
1
0
Fork 0
forked from townforge/townforge
Code Issues Pull Requests Projects Releases Wiki Activity

fix build when used in a submodule

Browse Source
This commit is contained in:
Crypto City 2021-04-03 21:50:34 +00:00
parent 2eec2f6371
commit 254661c45c
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/procsky vendored

@ -1 +1 @@
Subproject commit 1ca51ea04659b822a66f646e1b6f30a5873f55a0
Subproject commit 22394d1cb6fe50e0319091e3d8e58ded93563eee

2
external/tb vendored

@ -1 +1 @@
Subproject commit 52867a82f287ea9f1d4d1035d2028651d56d1b16
Subproject commit cc42b616d9d794143401618f807adb617cdd126c

20
src/game/CMakeLists.txt
View File

@ -248,21 +248,21 @@ monero_add_executable(game
# these aren't seen if set in external/CMakeLists.txt
if (STATIC)
set(URHO3D_LIBRARY "${CMAKE_BINARY_DIR}/external/urho3d/lib/${CMAKE_STATIC_LIBRARY_PREFIX}Urho3D${CMAKE_STATIC_LIBRARY_SUFFIX}")
set(URHO3D_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/../../external/urho3d/lib/${CMAKE_STATIC_LIBRARY_PREFIX}Urho3D${CMAKE_STATIC_LIBRARY_SUFFIX}")
if (NOT WIN32 AND NOT APPLE)
set(URHO3D_LIBRARY "${URHO3D_LIBRARY}" GL)
endif()
set(TB_LIBRARY "${CMAKE_BINARY_DIR}/external/tb/src/tb/${CMAKE_STATIC_LIBRARY_PREFIX}TurboBadgerLib${CMAKE_STATIC_LIBRARY_SUFFIX}")
set(TB_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/../../external/tb/src/tb/${CMAKE_STATIC_LIBRARY_PREFIX}TurboBadgerLib${CMAKE_STATIC_LIBRARY_SUFFIX}")
else()
set(URHO3D_LIBRARY "${CMAKE_BINARY_DIR}/external/urho3d/lib/${CMAKE_SHARED_LIBRARY_PREFIX}Urho3D${CMAKE_SHARED_LIBRARY_SUFFIX}")
set(TB_LIBRARY "${CMAKE_BINARY_DIR}/external/tb/src/tb/${CMAKE_SHARED_LIBRARY_PREFIX}TurboBadgerLib${CMAKE_SHARED_LIBRARY_SUFFIX}")
set(URHO3D_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/../../external/urho3d/lib/${CMAKE_SHARED_LIBRARY_PREFIX}Urho3D${CMAKE_SHARED_LIBRARY_SUFFIX}")
set(TB_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/../../external/tb/src/tb/${CMAKE_SHARED_LIBRARY_PREFIX}TurboBadgerLib${CMAKE_SHARED_LIBRARY_SUFFIX}")
endif()
include_directories(BEFORE "${CMAKE_SOURCE_DIR}/external/procsky")
include_directories(BEFORE "${CMAKE_BINARY_DIR}/external/urho3d/include")
include_directories(BEFORE "${CMAKE_BINARY_DIR}/external/urho3d/include/Urho3D/ThirdParty")
include_directories(BEFORE "${CMAKE_SOURCE_DIR}/external/tb/src")
include_directories(BEFORE "${CMAKE_SOURCE_DIR}/external/tb/src/tb")
include_directories(BEFORE "${CMAKE_BINARY_DIR}/external/tb/src/tb")
include_directories(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/../../external/procsky")
include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/../../external/urho3d/include")
include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/../../external/urho3d/include/Urho3D/ThirdParty")
include_directories(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/../../external/tb/src")
include_directories(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/../../external/tb/src/tb")
include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/../../external/tb/src/tb")
if (NOT CC_NO_EXTERNAL_DEPS)
add_dependencies(game TurboBadgerLib procsky urho3d_ext boost_ext)
endif()