mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-28 20:27:46 +00:00
Code Activity

Merge 347f87590e into e15c46500c

Browse source
This commit is contained in:
Shelby Hagman 2018-03-07 07:27:24 +00:00 • committed by GitHub
commit 2160e6b1a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/compiler.cmake
View file

@ -21,10 +21,6 @@ else()
# incremental linking # incremental linking
message(STATUS "Enabling Incremental Linking..") message(STATUS "Enabling Incremental Linking..")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL")
# enable building with multiple processes
message(STATUS "Enabling Build with Multiple Processes..")
add_definitions(/MP)
endif() endif()
endif() endif()

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

@ -67,4 +67,4 @@ target_link_libraries( sapphire_zone ${Boost_LIBRARIES} )
target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" ) target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" )
target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Script" ) target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Script" )
target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external" ) target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external" )
cotire( sapphire_zone ) #cotire( sapphire_zone )

2
src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
View file

@ -65,7 +65,7 @@ foreach(_scriptDir ${children})
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ScriptLoader.cpp.in" "${_scriptDir}/ScriptLoader.cpp") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ScriptLoader.cpp.in" "${_scriptDir}/ScriptLoader.cpp")
cotire("script_${_name}") #cotire("script_${_name}")
if(MSVC) if(MSVC)
add_custom_command(TARGET "script_${_name}" POST_BUILD add_custom_command(TARGET "script_${_name}" POST_BUILD