Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 13:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Reduced C++ standard requirement down to C++11

Browse source 
Requires pthreads in *NIX (because of gamespy)
Using CMake 3.12 instead (required because of *add_compile_definitions* command)
This commit is contained in:
L 2023-02-07 20:50:38 +01:00
parent f91d5f9fe9
commit bf02aee57d
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
CMakeLists.txt
View file

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.12)
project(omohaaded)
include(TargetArch.cmake)
@ -88,7 +88,8 @@ add_library(fgame SHARED ${SOURCES_GAME_LIB})
target_compile_definitions(fgame PRIVATE GAME_DLL ARCHIVE_SUPPORTED TARGET_GAME_TYPE=${TARGET_GAME_TYPE})
target_include_directories(fgame PUBLIC "code/qcommon" "code/script" "code/game")
target_include_directories(fgame PRIVATE "code/parser")
target_compile_features(fgame PUBLIC cxx_std_17)
set_target_properties(fgame PROPERTIES CXX_STANDARD 11)
target_compile_features(fgame PUBLIC cxx_std_11)
set_target_properties(fgame PROPERTIES PREFIX "${TARGET_PLATFORM_PREFIX}")
set_target_properties(fgame PROPERTIES OUTPUT_NAME "game${TARGET_ARCH_SUFFIX}${TARGET_CONFIG_SUFFIX}")
@ -178,7 +179,8 @@ set(SOURCES_SERVER_APP ${SOURCES_APP} ${SOURCES_SERVER})
add_executable(omohaaded ${SOURCES_SERVER_APP} ${SOURCES_PLATFORM_SPECIFIC} "code/null/null_client.c" "code/null/null_input.c" "code/null/null_snddma.c")
target_compile_definitions(omohaaded PRIVATE NO_SCRIPTENGINE DEDICATED TARGET_GAME_TYPE=${TARGET_GAME_TYPE})
target_compile_features(omohaaded PUBLIC cxx_std_17)
target_compile_features(omohaaded PUBLIC cxx_std_11)
set_target_properties(omohaaded PROPERTIES CXX_STANDARD 11)
# Gamespy dependency
add_dependencies(omohaaded gcd)
target_link_libraries(omohaaded PRIVATE gcd)
@ -192,7 +194,8 @@ if(WIN32)
target_link_libraries(omohaaded PRIVATE wsock32 ws2_32)
target_link_libraries(omohaaded PRIVATE winmm)
elseif(UNIX)
target_link_libraries(omohaaded PRIVATE ${CMAKE_DL_LIBS})
find_package(Threads)
target_link_libraries(omohaaded PRIVATE ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
endif()
INSTALL(TARGETS omohaaded DESTINATION "./")

2
code/gamespy/gcd.cmake
View file

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.12)
project(gcd)