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

Moved lib importation (wsock, threads, etc) to syslib

Browse source
This commit is contained in:
OM 2023-06-17 02:09:50 +02:00
parent 7830a02068
commit 6a6d472658
2 changed files with 15 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

24
CMakeLists.txt
View file

@ -85,19 +85,9 @@ target_link_libraries(omohaaded PRIVATE qcommon qcommon_standalone)
target_include_directories(omohaaded PUBLIC "code/qcommon" "code/script" "code/gamespy" "code/server")
set_target_properties(omohaaded PROPERTIES OUTPUT_NAME "omohaaded${TARGET_BASE_SUFFIX}${TARGET_ARCH_SUFFIX}${TARGET_CONFIG_SUFFIX}")
if(WIN32)
target_link_libraries(omohaaded PRIVATE wsock32 ws2_32)
target_link_libraries(omohaaded PRIVATE winmm)
if (MSVC)
if (MSVC)
target_link_options(omohaaded PRIVATE "/MANIFEST:NO")
INSTALL(FILES $<TARGET_PDB_FILE:omohaaded> DESTINATION "./" OPTIONAL)
endif()
elseif(UNIX)
find_package(Threads)
target_link_libraries(omohaaded PRIVATE ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(omohaaded PRIVATE m)
target_link_libraries(omohaaded PRIVATE stdc++)
endif()
INSTALL(TARGETS omohaaded DESTINATION "./")
@ -138,21 +128,9 @@ if (WITH_CLIENT)
endif()
endif()
if(WIN32)
if (MSVC)
target_link_options(openmohaa PRIVATE "/MANIFEST:NO")
endif()
target_link_libraries(openmohaa PRIVATE wsock32 ws2_32)
target_link_libraries(openmohaa PRIVATE winmm)
INSTALL(FILES $<TARGET_PDB_FILE:openmohaa> DESTINATION "./" OPTIONAL)
elseif(UNIX)
find_package(Threads)
target_link_libraries(openmohaa PRIVATE m rt)
target_link_libraries(openmohaa PRIVATE stdc++)
target_link_libraries(openmohaa PRIVATE ${CMAKE_THREAD_LIBS_INIT})
endif()
INSTALL(TARGETS openmohaa DESTINATION "./")

10
code/sys/CMakeLists.txt
View file

@ -39,3 +39,13 @@ target_compile_definitions(syslib INTERFACE TARGET_GAME_TYPE=${TARGET_GAME_TYPE}
target_compile_features(syslib INTERFACE cxx_nullptr)
target_compile_features(syslib INTERFACE c_variadic_macros)
target_link_libraries(syslib INTERFACE qcommon)
if(WIN32)
target_link_libraries(syslib INTERFACE wsock32 ws2_32)
target_link_libraries(syslib INTERFACE winmm)
elseif(UNIX)
find_package(Threads)
target_link_libraries(syslib INTERFACE ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(syslib INTERFACE m rt)
target_link_libraries(syslib INTERFACE stdc++)
endif()