mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-25 05:57:45 +00:00
Code Activity

Hopefully last CI fix attempt

Browse source
This commit is contained in:
mordred 2018-10-26 14:45:10 +02:00
parent d26db1d96c
commit b27ac74313
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmake/compiler.cmake
View file

@ -5,6 +5,7 @@ if(UNIX)
else() else()
add_definitions(-D_WIN32_WINNT=0x601) add_definitions(-D_WIN32_WINNT=0x601)
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_definitions(-DNOMINMAX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHc") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHc")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")

6
src/servers/sapphire_api/CMakeLists.txt
View file

@ -18,5 +18,7 @@ set_target_properties(sapphire_api PROPERTIES
VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/" VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
) )
target_link_libraries (sapphire_api common stdc++fs) target_link_libraries( sapphire_api common )
if( UNIX )
target_link_libraries( sapphire_api stdc++fs )
endif()

8
src/servers/sapphire_lobby/CMakeLists.txt
View file

@ -19,10 +19,14 @@ set_target_properties( sapphire_lobby
RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/" RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/" VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
) )
target_link_libraries( sapphire_lobby target_link_libraries( sapphire_lobby
PRIVATE PRIVATE
common common )
if( UNIX )
target_link_libraries( sapphire_lobby
PRIVATE
stdc++fs ) stdc++fs )
endif()
#cotire( sapphire_lobby ) #cotire( sapphire_lobby )

3
src/servers/sapphire_zone/CMakeLists.txt
View file

@ -35,11 +35,12 @@ set_target_properties(sapphire_zone PROPERTIES
VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/" VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
) )
target_link_libraries( sapphire_zone PUBLIC common stdc++fs )
target_link_libraries( sapphire_zone PUBLIC common )
target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" ) target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" )
if (UNIX) if (UNIX)
# cotire( sapphire_zone ) # cotire( sapphire_zone )
target_link_libraries( sapphire_zone PUBLIC stdc++fs )
endif() endif()