included winsock2 precautionary in every cpp-file; compiles with Visu…

…al Studio 2010 Express

source/glest_map_editor/mainWindow.cpp

@@ -21,10 +21,10 @@
 #include <QCloseEvent>
 #include <QMessageBox>
 
-#include "ui_mainWindow.h"
-#include "ui_help.h"
-#include "ui_info.h"
-#include "ui_advanced.h"
+//Qt needs this, otherwise glestlib will load winsock.h and break everything
+#ifdef WIN32
+    #include <winsock2.h>
+#endif
 
 #include "mainWindow.hpp"
 
@@ -34,6 +34,12 @@
 #include "renderer.hpp"
 #include "mapManipulator.hpp"
 
+#include "ui_mainWindow.h"
+#include "ui_help.h"
+#include "ui_info.h"
+#include "ui_advanced.h"
+
+
 #include "platform_common.h"
 #include "config.h"
 //#include "platform_util.h"

source/glest_map_editor/mapManipulator.cpp

@@ -20,6 +20,10 @@
 #include <QMessageBox>
 #include <QDebug>
 
+#ifdef WIN32
+    #include <winsock2.h>
+#endif
+
 #include "mapManipulator.hpp"
 
 #include "mainWindow.hpp"

source/glest_map_editor/newMap.cpp

@@ -9,12 +9,17 @@
 //  License, or (at your option) any later version
 // ==============================================================
 
-#include "ui_newMap.h"
+//Qt needs this, otherwise glestlib will load winsock.h and break everything
+#ifdef WIN32
+    #include <winsock2.h>
+#endif
 
 #include "newMap.hpp"
 
 #include "mapManipulator.hpp"
 
+#include "ui_newMap.h"
+
 #include <iostream>
 
 namespace MapEditor {

source/glest_map_editor/player.cpp

@@ -11,6 +11,10 @@
 
 #include <QPainter>
 
+#ifdef WIN32
+    #include <winsock2.h>
+#endif
+
 #include "player.hpp"
 
 #include "tile.hpp"

source/glest_map_editor/renderer.cpp

@@ -14,6 +14,11 @@
 #include <QGraphicsItemGroup>
 #include <QAction>
 
+//Qt needs this, otherwise glestlib will load winsock.h and break everything
+#ifdef WIN32
+    #include <winsock2.h>
+#endif
+
 #include "renderer.hpp"
 
 //good idea?

source/glest_map_editor/selection.cpp

@@ -11,6 +11,10 @@
 
 #include <QPainter>
 
+#ifdef WIN32
+    #include <winsock2.h>
+#endif
+
 #include "selection.hpp"
 
 #include "tile.hpp"

source/glest_map_editor/switchSurfaces.cpp

@@ -9,12 +9,16 @@
 //  License, or (at your option) any later version
 // ==============================================================
 
-#include "ui_switchSurfaces.h"
+//Qt needs this, otherwise glestlib will load winsock.h and break everything
+#ifdef WIN32
+    #include <winsock2.h>
+#endif
 
 #include "switchSurfaces.hpp"
-
 #include "mapManipulator.hpp"
 
+#include "ui_switchSurfaces.h"
+
 #include <iostream>
 
 namespace MapEditor {

source/glest_map_editor/tile.cpp

@@ -23,6 +23,11 @@
 #include <QGraphicsItemGroup>
 #include <QGraphicsSceneMouseEvent>
 
+//Qt needs this, otherwise glestlib will load winsock.h and break everything
+#ifdef WIN32
+    #include <winsock2.h>
+#endif
+
 #include "tile.hpp"
 
 #include "renderer.hpp"

source/glest_map_editor/viewer.cpp

@@ -13,6 +13,11 @@
 #include <QMouseEvent>
 #include <QLabel>
 
+//Qt needs this, otherwise glestlib will load winsock.h and break everything
+#ifdef WIN32
+    #include <winsock2.h>
+#endif
+
 #include "viewer.hpp"
 
 #include "mainWindow.hpp"