q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-22 10:20:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Patched to compile on Linux.

Browse Source 
(The EntitiesMP and/or GameMP libraries need symbols exported from the main
binary, but when we built the engine as a static library to reuse it between
the client and server, the Linux linker stripped out symbols those libraries
needed. If we can force these symbols to remain, or maybe move to shared
library..? then we can avoid building the engine sources twice to get the
dedicated server too. For now, though...good enough!)
This commit is contained in:
Ryan C. Gordon 2016-04-02 21:55:48 -04:00
parent 74a7321a7f
commit a96fe8de8b
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Sources/CMakeLists.txt
View File

@ -379,7 +379,7 @@ if (USE_I386_ASM)
list(APPEND ADDITIONAL_ENGINE_SRCS SoundMixer386.o) list(APPEND ADDITIONAL_ENGINE_SRCS SoundMixer386.o)
endif() endif()
add_library(SeriousEngine STATIC set(ENGINE_SRCS
${ENGINE_ENTITIES_CPP} ${ENGINE_ENTITIES_CPP}
Engine/Engine.cpp Engine/Engine.cpp
Engine/Base/Anim.cpp Engine/Base/Anim.cpp
@ -577,9 +577,9 @@ add_library(SeriousEngine STATIC
Engine/zlib/uncompr.c Engine/zlib/uncompr.c
${ADDITIONAL_ENGINE_SRCS} ${ADDITIONAL_ENGINE_SRCS}
) )
add_dependencies(SeriousEngine ParseAllEntities)
add_executable(SeriousSam add_executable(SeriousSam
${ENGINE_SRCS}
SeriousSam/LevelInfo.cpp SeriousSam/LevelInfo.cpp
SeriousSam/CmdLine.cpp SeriousSam/CmdLine.cpp
SeriousSam/SeriousSam.cpp SeriousSam/SeriousSam.cpp
@ -593,23 +593,27 @@ add_executable(SeriousSam
SeriousSam/SplashScreen.cpp SeriousSam/SplashScreen.cpp
SeriousSam/MainWindow.cpp SeriousSam/MainWindow.cpp
) )
target_link_libraries(SeriousSam SeriousEngine)
add_dependencies(SeriousSam ParseAllEntities) add_dependencies(SeriousSam ParseAllEntities)
add_executable(SeriousSamDedicated # !!! FIXME: this is an option because you have to recompile the entire engine twice.
DedicatedServer/DedicatedServer.cpp # !!! FIXME: If we can put the engine in a static library and not lose symbols,
# !!! FIXME: that's a better plan and we can remove the toggle here.
option(BUILD_DEDICATED_SERVER "Compile the dedicated server, too" FALSE)
if(BUILD_DEDICATED_SERVER)
add_executable(SeriousSamDedicated ${ENGINE_SRCS} DedicatedServer/DedicatedServer.cpp)
add_dependencies(SeriousSamDedicated ParseAllEntities)
) )
target_link_libraries(SeriousSamDedicated SeriousEngine)
add_dependencies(SeriousSamDedicated ParseAllEntities)
if(MACOSX) if(MACOSX)
find_library(COCOA_FRAMEWORK Cocoa) find_library(COCOA_FRAMEWORK Cocoa)
target_link_libraries(SeriousSam "${COCOA_FRAMEWORK}") target_link_libraries(SeriousSam "${COCOA_FRAMEWORK}")
target_link_libraries(SeriousSam "${CMAKE_CURRENT_SOURCE_DIR}/lib/macosx/libSDL-1.2.0.dylib") target_link_libraries(SeriousSam "${CMAKE_CURRENT_SOURCE_DIR}/lib/macosx/libSDL-1.2.0.dylib")
target_link_libraries(SeriousSam "${CMAKE_CURRENT_SOURCE_DIR}/lib/macosx/libSDLmain.a") target_link_libraries(SeriousSam "${CMAKE_CURRENT_SOURCE_DIR}/lib/macosx/libSDLmain.a")
target_link_libraries(SeriousSamDedicated "${COCOA_FRAMEWORK}") if(BUILD_DEDICATED_SERVER)
target_link_libraries(SeriousSamDedicated "${CMAKE_CURRENT_SOURCE_DIR}/lib/macosx/libSDL-1.2.0.dylib") target_link_libraries(SeriousSamDedicated "${COCOA_FRAMEWORK}")
target_link_libraries(SeriousSamDedicated "${CMAKE_CURRENT_SOURCE_DIR}/lib/macosx/libSDLmain.a") target_link_libraries(SeriousSamDedicated "${CMAKE_CURRENT_SOURCE_DIR}/lib/macosx/libSDL-1.2.0.dylib")
target_link_libraries(SeriousSamDedicated "${CMAKE_CURRENT_SOURCE_DIR}/lib/macosx/libSDLmain.a")
endif()
endif() endif()
if(LINUX) if(LINUX)
@ -618,10 +622,12 @@ if(LINUX)
target_link_libraries(SeriousSam "dl") target_link_libraries(SeriousSam "dl")
target_link_libraries(SeriousSam "pthread") target_link_libraries(SeriousSam "pthread")
set_target_properties(SeriousSamDedicated PROPERTIES LINK_FLAGS "-Wl,-rpath,$ORIGIN") if(BUILD_DEDICATED_SERVER)
target_link_libraries(SeriousSamDedicated "m") set_target_properties(SeriousSamDedicated PROPERTIES LINK_FLAGS "-Wl,-rpath,$ORIGIN")
target_link_libraries(SeriousSamDedicated "dl") target_link_libraries(SeriousSamDedicated "m")
target_link_libraries(SeriousSamDedicated "pthread") target_link_libraries(SeriousSamDedicated "dl")
target_link_libraries(SeriousSamDedicated "pthread")
endif()
endif() endif()
# end of CMakeLists.txt ... # end of CMakeLists.txt ...