From 1621e563da657ab6b833a20c9268bb98fd03e9a1 Mon Sep 17 00:00:00 2001 From: SoftCoder Date: Thu, 2 Jun 2016 14:01:39 -0700 Subject: [PATCH] - fix build --- data/glest_game | 2 +- source/glest_game/main/main.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/glest_game b/data/glest_game index c0c270c5..a1e6be21 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit c0c270c5e0ae3c419c9b451abe71d5ab5f29a63e +Subproject commit a1e6be21823b1c597129e3c81f4301177c32fba7 diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp index 34521b3c..7114b8ae 100644 --- a/source/glest_game/main/main.cpp +++ b/source/glest_game/main/main.cpp @@ -5947,11 +5947,6 @@ void EnableCrashingOnCrashes() { int glestMainSEHWrapper(int argc, char** argv) { -#ifdef WIN32 - //winSockManager = new SocketManager(); - SocketManager winSockManager; -#endif - #ifdef WIN32_STACK_TRACE //printf("Hooking up WIN32_STACK_TRACE...\n"); __try { @@ -6052,6 +6047,11 @@ int glestMainWrapper(int argc, char** argv) { //#endif #endif +#ifdef WIN32 + //winSockManager = new SocketManager(); + SocketManager winSockManager; +#endif + int result = glestMainSEHWrapper(argc, argv); return result; }