in theory this should work

This commit is contained in:
DarthArgus
2016-10-17 19:27:28 -05:00
parent 826e75014a
commit 220a0ed7c9
4 changed files with 7 additions and 6 deletions
@@ -85,7 +85,6 @@ include_directories(
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedThread/include/public
${SWG_EXTERNALS_SOURCE_DIR}/ours/library/archive/include
${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/udplibrary
${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/webAPI
)
add_library(sharedNetwork STATIC
@@ -98,7 +97,6 @@ target_link_libraries(sharedNetwork
sharedLog
sharedMessageDispatch
udplibrary
webAPI
)
if(WIN32)
@@ -15,9 +15,6 @@
#include "sharedDebug/FirstSharedDebug.h"
#include "sharedMemoryManager/FirstSharedMemoryManager.h"
#include "webAPI/webAPIHeartbeat.h"
webAPIHeartbeat wb = new webAPIHeartbeat();
#include <string>
//-----------------------------------------------------------------------
@@ -98,7 +98,8 @@ include_directories(
${SWG_EXTERNALS_SOURCE_DIR}/ours/library/singleton/include
${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicode/include
${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicodeArchive/include/public
${JNI_INCLUDE_DIRS}
${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/webAPI
${JNI_INCLUDE_DIRS}
)
add_executable(SwgGameServer
@@ -149,5 +150,7 @@ target_link_libraries(SwgGameServer
unicode
unicodeArchive
Base
webAPI
${CURL_LIBRARIES}
${CMAKE_DL_LIBS}
)
@@ -32,11 +32,14 @@
#include "swgSharedNetworkMessages/SetupSwgSharedNetworkMessages.h"
#include "swgServerNetworkMessages/SetupSwgServerNetworkMessages.h"
#include "webAPIHeartbeat.h"
// ======================================================================
int main(int argc, char ** argv)
{
auto wb = StellaBellum::webAPIHeartbeat();
SetupSharedThread::install();
SetupSharedDebug::install(1024);