diff options
| -rw-r--r-- | dep/acelite/ace/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp | 1 | ||||
| -rw-r--r-- | src/server/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/server/authserver/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/server/shared/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/server/worldserver/CMakeLists.txt | 12 |
6 files changed, 17 insertions, 17 deletions
diff --git a/dep/acelite/ace/CMakeLists.txt b/dep/acelite/ace/CMakeLists.txt index 1f9ffa622a0..7cd34112830 100644 --- a/dep/acelite/ace/CMakeLists.txt +++ b/dep/acelite/ace/CMakeLists.txt @@ -10,7 +10,6 @@ # NOTE: Do not use glob here, it would include files we don't want set(ace_STAT_SRCS - PrecompiledHeaders/WinAcePCH.cpp ACE.cpp ACE_crc32.cpp ACE_crc_ccitt.cpp diff --git a/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp b/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp index 139597f9cb0..bd7cb3d4ef3 100644 --- a/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp +++ b/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp @@ -1,2 +1,3 @@ +#include "WinAcePCH.h" diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index 02fca56340f..646b89b6f80 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -17,7 +17,7 @@ if(CMAKE_COMPILER_IS_GNUCXX AND NOT MINGW) endif() if( SERVERS ) - set(sources_Debugging + set(sources_windows_Debugging ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging/WheatyExceptionReport.cpp ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging/WheatyExceptionReport.h ) diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index 6d756434a20..c8d8115a687 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -29,16 +29,14 @@ set(authserver_SRCS ) if( WIN32 ) + set(authserver_SRCS + ${authserver_SRCS} + ${sources_Debugging} + ) if ( MSVC ) set(authserver_SRCS ${authserver_SRCS} - ${sources_Debugging} - authserver.rc - ) - else ( ) - set(authserver_SRCS - ${authserver_SRCS} - ${sources_Debugging} + authserver.rc ) endif () endif() diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index 447819b0431..4fc318f57eb 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -16,7 +16,6 @@ file(GLOB_RECURSE sources_Configuration Configuration/*.cpp Configuration/*.h) file(GLOB_RECURSE sources_Cryptography Cryptography/*.cpp Cryptography/*.h) file(GLOB_RECURSE sources_Database Database/*.cpp Database/*.h) file(GLOB_RECURSE sources_DataStores DataStores/*.cpp DataStores/*.h) -file(GLOB_RECURSE sources_Debugging Debugging/*.cpp Debugging/*.h) file(GLOB_RECURSE sources_Dynamic Dynamic/*.cpp Dynamic/*.h) file(GLOB_RECURSE sources_Logging Logging/*.cpp Logging/*.h) file(GLOB_RECURSE sources_Packets Packets/*.cpp Packets/*.h) @@ -25,6 +24,11 @@ file(GLOB_RECURSE sources_Utilities Utilities/*.cpp Utilities/*.h) file(GLOB sources_localdir *.cpp *.h) +# Manually set sources for Debugging directory as we don't want to include WheatyExceptionReport in shared project +# It needs to be included both in authserver and worldserver for the static global variable to be properly initialized +# and to handle crash logs on windows +set(sources_Debugging Debugging/Errors.cpp Debugging/Errors.h) + # # Build shared sourcelist # diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 17c9d596568..e48197aeb2c 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -29,18 +29,16 @@ set(worldserver_SRCS ) if( WIN32 ) + set(worldserver_SRCS + ${worldserver_SRCS} + ${sources_windows_Debugging} + ) if ( MSVC ) set(worldserver_SRCS ${worldserver_SRCS} - ${sources_Debugging} worldserver.rc ) - else ( ) - set(worldserver_SRCS - ${worldserver_SRCS} - ${sources_Debugging} - ) - endif () + endif() endif() include_directories( |