[Freeorion-programmers] SF.net SVN: freeorion: [2173] branches/networking-reimplementation/ FreeOrion

[<tz...@us...>]

Revision: 2173
          http://svn.sourceforge.net/freeorion/revision/?rev=2173&view=rev
Author:   tzlaine
Date:     2007-07-18 16:39:22 -0700 (Wed, 18 Jul 2007)

Log Message:
-----------
Made several changes required to get the new code to compile on Win32.

Modified Paths:
--------------
    branches/networking-reimplementation/FreeOrion/SConstruct
    branches/networking-reimplementation/FreeOrion/network/ClientNetworking.h
    branches/networking-reimplementation/FreeOrion/network/ServerNetworking.h
    branches/networking-reimplementation/FreeOrion/network/boost/system/config.hpp
    branches/networking-reimplementation/FreeOrion/server/SaveLoad.cpp
    branches/networking-reimplementation/FreeOrion/server/SaveLoad.h

Modified: branches/networking-reimplementation/FreeOrion/SConstruct
===================================================================
--- branches/networking-reimplementation/FreeOrion/SConstruct	2007-07-18 02:24:39 UTC (rev 2172)
+++ branches/networking-reimplementation/FreeOrion/SConstruct	2007-07-18 23:39:22 UTC (rev 2173)
@@ -533,7 +533,6 @@
         'comdlg32',
         'gdi32',
         'GiGi',
-        'GiGiNet',
         'GiGiSDL',
         'glu32',
         'jpeg',
@@ -573,7 +572,6 @@
 if str(Platform()) == 'win32':
     import shutil
     shutil.copy(os.path.join('..', 'lib', 'GiGi.dll'), '.')
-    shutil.copy(os.path.join('..', 'lib', 'GiGiNet.dll'), '.')
     shutil.copy(os.path.join('..', 'lib', 'GiGiSDL.dll'), '.')
 
 Export('env')

Modified: branches/networking-reimplementation/FreeOrion/network/ClientNetworking.h
===================================================================
--- branches/networking-reimplementation/FreeOrion/network/ClientNetworking.h	2007-07-18 02:24:39 UTC (rev 2172)
+++ branches/networking-reimplementation/FreeOrion/network/ClientNetworking.h	2007-07-18 23:39:22 UTC (rev 2173)
@@ -5,6 +5,18 @@
 #include "Message.h"
 #include "MessageQueue.h"
 
+#if defined(_MSC_VER)
+  // HACK! this keeps VC 7.x from barfing when it sees "typedef __int64 int64_t;"
+  // in boost/cstdint.h when compiling under windows
+#  if defined(int64_t)
+#    undef int64_t
+#  endif
+#elif defined(WIN32)
+  // HACK! this keeps gcc 3.x from barfing when it sees "typedef long long uint64_t;"
+  // in boost/cstdint.h when compiling under windows
+#  define BOOST_MSVC -1
+#endif
+
 #include <boost/array.hpp>
 #include <boost/asio.hpp>
 

Modified: branches/networking-reimplementation/FreeOrion/network/ServerNetworking.h
===================================================================
--- branches/networking-reimplementation/FreeOrion/network/ServerNetworking.h	2007-07-18 02:24:39 UTC (rev 2172)
+++ branches/networking-reimplementation/FreeOrion/network/ServerNetworking.h	2007-07-18 23:39:22 UTC (rev 2173)
@@ -4,6 +4,18 @@
 
 #include "Message.h"
 
+#if defined(_MSC_VER)
+  // HACK! this keeps VC 7.x from barfing when it sees "typedef __int64 int64_t;"
+  // in boost/cstdint.h when compiling under windows
+#  if defined(int64_t)
+#    undef int64_t
+#  endif
+#elif defined(WIN32)
+  // HACK! this keeps gcc 3.x from barfing when it sees "typedef long long uint64_t;"
+  // in boost/cstdint.h when compiling under windows
+#  define BOOST_MSVC -1
+#endif
+
 #include <boost/asio.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/function.hpp>

Modified: branches/networking-reimplementation/FreeOrion/network/boost/system/config.hpp
===================================================================
--- branches/networking-reimplementation/FreeOrion/network/boost/system/config.hpp	2007-07-18 02:24:39 UTC (rev 2172)
+++ branches/networking-reimplementation/FreeOrion/network/boost/system/config.hpp	2007-07-18 23:39:22 UTC (rev 2173)
@@ -53,7 +53,7 @@
 
 //  enable automatic library variant selection  ------------------------------// 
 
-#if !defined(BOOST_SYSTEM_SOURCE) && !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_SYSTEM_NO_LIB)
+#if 0//!defined(BOOST_SYSTEM_SOURCE) && !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_SYSTEM_NO_LIB)
 //
 // Set the name of our library, this will get undef'ed by auto_link.hpp
 // once it's done with it:

Modified: branches/networking-reimplementation/FreeOrion/server/SaveLoad.cpp
===================================================================
--- branches/networking-reimplementation/FreeOrion/server/SaveLoad.cpp	2007-07-18 02:24:39 UTC (rev 2172)
+++ branches/networking-reimplementation/FreeOrion/server/SaveLoad.cpp	2007-07-18 23:39:22 UTC (rev 2173)
@@ -1,5 +1,6 @@
 #include "SaveLoad.h"
 
+#include "ServerApp.h"
 #include "../Empire/Empire.h"
 #include "../Empire/EmpireManager.h"
 #include "../universe/Building.h"
@@ -9,6 +10,7 @@
 #include "../universe/ShipDesign.h"
 #include "../universe/System.h"
 #include "../util/OrderSet.h"
+#include "../util/Serialize.h"
 
 #include <boost/serialization/deque.hpp>
 #include <boost/serialization/list.hpp>

Modified: branches/networking-reimplementation/FreeOrion/server/SaveLoad.h
===================================================================
--- branches/networking-reimplementation/FreeOrion/server/SaveLoad.h	2007-07-18 02:24:39 UTC (rev 2172)
+++ branches/networking-reimplementation/FreeOrion/server/SaveLoad.h	2007-07-18 23:39:22 UTC (rev 2173)
@@ -2,10 +2,12 @@
 #ifndef _SaveLoad_h_
 #define _SaveLoad_h_
 
-#include "ServerApp.h"
-#include "../util/Serialize.h"
+#include <vector>
 
 
+class PlayerSaveGameData;
+class Universe;
+
 /** Saves the provided data to savefile \a filename. */
 void SaveGame(const std::string& filename, int current_turn, const std::vector<PlayerSaveGameData>& player_save_game_data, const Universe& universe);