swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-20 10:02:55 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'testing' into clang-profile-build

Browse Source
This commit is contained in:
DarthArgus
2016-12-03 05:57:38 +00:00
parent 8036ae2472 5d8b7fe160
commit 0ab695f7aa
133 changed files with 181 additions and 3133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/ConnectionServer/src/CMakeLists.txt
+2 -2
View File
@@ -49,7 +49,7 @@ include_directories(
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMath/include/public
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMathArchive/include/public
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public
@@ -85,7 +85,7 @@ target_link_libraries(ConnectionServer
sharedGame
sharedLog
sharedMath
sharedMemoryManager
sharedMessageDispatch
sharedNetwork
sharedNetworkMessages
engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp
+1 -1
View File
@@ -45,7 +45,7 @@
#include "sharedLog/Log.h"
#include "sharedLog/LogManager.h"
#include "sharedLog/SetupSharedLog.h"
#include "sharedMemoryManager/MemoryManager.h"
#include "sharedNetwork/NetworkSetupData.h"
#include "sharedNetwork/Service.h"
#include "sharedNetwork/UdpSock.h"
engine/server/application/ConnectionServer/src/shared/FirstConnectionServer.h
+1 -1
View File
@@ -11,7 +11,7 @@
// ======================================================================
#include "sharedFoundation/FirstSharedFoundation.h"
#include "sharedMemoryManager/FirstSharedMemoryManager.h"
#include "sharedDebug/FirstSharedDebug.h"
#include "ConnectionServer.h"
#include "sharedFoundation/NetworkIdArchive.h"