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

Merge branch 'testing' into clang-profile-build

Browse Source
This commit is contained in:
DarthArgus
2016-10-18 01:35:14 +00:00
parent 11949ae5bb 40272ff290
commit db57b04d74
15 changed files with 414 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/PlanetServer/src/CMakeLists.txt
+3
View File
@@ -72,6 +72,7 @@ include_directories(
${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/platform/projects
${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/platform/utils
${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/udplibrary
${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/webAPI
)
add_executable(PlanetServer
@@ -104,5 +105,7 @@ target_link_libraries(PlanetServer
localizationArchive
unicode
unicodeArchive
webAPI
${CURL_LIBRARIES}
${CMAKE_DL_LIBS}
)
engine/server/application/PlanetServer/src/linux/main.cpp
+8
View File
@@ -14,6 +14,10 @@
#include "sharedThread/SetupSharedThread.h"
#include "sharedUtility/SetupSharedUtility.h"
#ifndef STELLA_INTERNAL
#include "webAPIHeartbeat.h"
#endif
// ======================================================================
void dumpPid(const char * argv)
@@ -27,6 +31,10 @@ void dumpPid(const char * argv)
int main(int argc, char ** argv)
{
#ifndef STELLA_INTERNAL
StellaBellum::webAPIHeartbeat();
#endif
// dumpPid(argv[0]);
SetupSharedThread::install();