q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2025-02-20 00:20:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

ASM is now an Option, and so is Pandora build. Tremor can be used instead of Vorbis, and the binary is rename to ssam to avoid collision in name for inplace compiling

Browse Source
This commit is contained in:
ptitSeb 2016-04-06 13:31:53 +02:00
parent 9581eeb02a
commit ebb70977ea
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Sources/CMakeLists.txt
View File

@ -84,7 +84,7 @@ endif()
# !!! FIXME: you currently need this, but I'd like to flip this to not use # !!! FIXME: you currently need this, but I'd like to flip this to not use
# !!! FIXME: assembly language. And maybe delete the asm code too. # !!! FIXME: assembly language. And maybe delete the asm code too.
set(USE_I386_ASM TRUE) option(USE_I386_ASM "Use X86 ASM" TRUE)
if (USE_I386_ASM) if (USE_I386_ASM)
# You need the Netwide Assembler (NASM) to build this on Intel systems. # You need the Netwide Assembler (NASM) to build this on Intel systems.
@ -102,7 +102,15 @@ else()
add_definitions(-DUSE_PORTABLE_C=1) add_definitions(-DUSE_PORTABLE_C=1)
endif() endif()
option(PANDORA "Compile for Pandora" FALSE)
if (PANDORA)
add_definitions(-DPANDORA=1)
endif()
option(USE_TREMOR "Use Tremor instead of Vorbis" FALSE)
if (USE_TREMOR)
add_definitions(-DUSE_TREMOR=1)
endif()
# !!! FIXME: I currently force this, but you shouldn't _have_ to. # !!! FIXME: I currently force this, but you shouldn't _have_ to.
add_definitions(-DSINGLE_THREADED=1) add_definitions(-DSINGLE_THREADED=1)
@ -111,8 +119,16 @@ include_directories(
. .
External/SDL12 External/SDL12
External/libogg/include External/libogg/include
External/libvorbis/include
) )
if(USE_TREMOR)
if(PANDORA)
include_directories(/mnt/utmp/codeblocks/usr/include/tremor)
else()
# !!!Do something here!
endif()
else()
include_directories(External/libvorbis/include)
endif()
# We build ECC, then use it to generate C++ code for the game entities... # We build ECC, then use it to generate C++ code for the game entities...
macro(add_parser_and_scanner _PARSER _SCANNER) macro(add_parser_and_scanner _PARSER _SCANNER)
@ -594,7 +610,7 @@ set(ENGINE_SRCS
${ADDITIONAL_ENGINE_SRCS} ${ADDITIONAL_ENGINE_SRCS}
) )
add_executable(SeriousSam add_executable(ssam
${ENGINE_SRCS} ${ENGINE_SRCS}
SeriousSam/LevelInfo.cpp SeriousSam/LevelInfo.cpp
SeriousSam/CmdLine.cpp SeriousSam/CmdLine.cpp
@ -609,7 +625,7 @@ add_executable(SeriousSam
SeriousSam/MenuGadgets.cpp SeriousSam/MenuGadgets.cpp
SeriousSam/MenuPrinting.cpp SeriousSam/MenuPrinting.cpp
) )
add_dependencies(SeriousSam ParseEntities) add_dependencies(ssam ParseEntities)
# !!! FIXME: this is an option because you have to recompile the entire engine twice. # !!! FIXME: this is an option because you have to recompile the entire engine twice.
# !!! FIXME: If we can put the engine in a static library and not lose symbols, # !!! FIXME: If we can put the engine in a static library and not lose symbols,
@ -622,9 +638,9 @@ endif()
if(MACOSX) if(MACOSX)
find_library(COCOA_FRAMEWORK Cocoa) find_library(COCOA_FRAMEWORK Cocoa)
target_link_libraries(SeriousSam "${COCOA_FRAMEWORK}") target_link_libraries(ssam "${COCOA_FRAMEWORK}")
target_link_libraries(SeriousSam "${CMAKE_CURRENT_SOURCE_DIR}/lib/macosx/libSDL-1.2.0.dylib") target_link_libraries(ssam "${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(ssam "${CMAKE_CURRENT_SOURCE_DIR}/lib/macosx/libSDLmain.a")
if(BUILD_DEDICATED_SERVER) if(BUILD_DEDICATED_SERVER)
target_link_libraries(SeriousSamDedicated "${COCOA_FRAMEWORK}") target_link_libraries(SeriousSamDedicated "${COCOA_FRAMEWORK}")
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/libSDL-1.2.0.dylib")
@ -633,12 +649,14 @@ if(MACOSX)
endif() endif()
if(LINUX) if(LINUX)
set_target_properties(SeriousSam PROPERTIES LINK_FLAGS "-Wl,-rpath,$ORIGIN") set_target_properties(ssam PROPERTIES LINK_FLAGS "-Wl,-rpath,$ORIGIN")
target_link_libraries(SeriousSam "m") target_link_libraries(ssam "m")
target_link_libraries(SeriousSam "dl") target_link_libraries(ssam "dl")
target_link_libraries(SeriousSam "pthread") if(PANDORA)
target_link_libraries(SeriousSam ${SDL_LIBRARY}) target_link_libraries(ssam "rt")
endif()
target_link_libraries(ssam "pthread")
target_link_libraries(ssam ${SDL_LIBRARY})
if(BUILD_DEDICATED_SERVER) if(BUILD_DEDICATED_SERVER)
set_target_properties(SeriousSamDedicated PROPERTIES LINK_FLAGS "-Wl,-rpath,$ORIGIN") set_target_properties(SeriousSamDedicated PROPERTIES LINK_FLAGS "-Wl,-rpath,$ORIGIN")
target_link_libraries(SeriousSamDedicated "m") target_link_libraries(SeriousSamDedicated "m")