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

Fix up Flags around Edit and Continue

Browse source 
- remove /SAFESEH:NO
- apply /INCREMENTAL /ZI (debug only)
- remove sprinkling of /INCREMENTAL /ZI
This commit is contained in:
ShelbyZ 2017-10-21 22:09:03 -07:00
parent b0e7c74dd9
commit e50fd76062
4 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/compiler.cmake
View file

@ -8,11 +8,11 @@ else()
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")
# edit and continue # edit and continue
if(CMAKE_BUILD_TYPE STREQUAL "Debug") if(CMAKE_BUILD_TYPE STREQUAL "Debug")
message(STATUS "Disabling /SAFESEH") message(STATUS "Enabling Edit and Continue..")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL /ZI")
endif() endif()
endif() endif()

5
src/servers/Server_Lobby/CMakeLists.txt
View file

@ -20,11 +20,6 @@ set_target_properties(server_lobby PROPERTIES
RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/" RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
) )
if(MSVC)
message(STATUS "Enabling Edit and Continue..")
set_property(TARGET server_lobby APPEND_STRING PROPERTY COMPILE_FLAGS " /INCREMENTAL /ZI")
endif()
if (UNIX) if (UNIX)
target_link_libraries(server_lobby Common xivdat pthread mysqlclient dl z) target_link_libraries(server_lobby Common xivdat pthread mysqlclient dl z)
else() else()

5
src/servers/Server_REST/CMakeLists.txt
View file

@ -19,11 +19,6 @@ set_target_properties(server_rest PROPERTIES
RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/" RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
) )
if(MSVC)
message(STATUS "Enabling Edit and Continue..")
set_property(TARGET server_rest APPEND_STRING PROPERTY COMPILE_FLAGS " /INCREMENTAL /ZI")
endif()
if (UNIX) if (UNIX)
target_link_libraries (server_rest Common xivdat pthread mysqlclient dl z) target_link_libraries (server_rest Common xivdat pthread mysqlclient dl z)
else() else()

5
src/servers/Server_Zone/CMakeLists.txt
View file

@ -35,11 +35,6 @@ set_target_properties(server_zone PROPERTIES
RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/" RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
) )
if(MSVC)
message(STATUS "Enabling Edit and Continue..")
set_property(TARGET server_zone APPEND_STRING PROPERTY COMPILE_FLAGS " /INCREMENTAL /ZI")
endif()
if (UNIX) if (UNIX)
target_link_libraries ( server_zone Common xivdat pthread mysqlclient dl z ) target_link_libraries ( server_zone Common xivdat pthread mysqlclient dl z )
else() else()