Changes for qt5 (Windows build, boost compatibility).

2013-08-29 17:26:08 +02:00
parent d694a27498
commit 2db9ea1a93
6 changed files with 12 additions and 2 deletions
@@ -40,7 +40,10 @@
 #include "game_defs.h"

 #include <string>
+
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif

 #include <QtGui>
 #include <QtCore>
@@ -35,7 +35,9 @@

 #include <QtGui>
 #include <QtCore>
+#ifndef Q_MOC_RUN
 #include <third_party/boost/timers.hpp>
+#endif
 #if QT_VERSION >= 0x050000
 	#include <QtWidgets>
 #endif
@@ -37,7 +37,9 @@
 #if QT_VERSION >= 0x050000
 	#include <QtWidgets>
 #endif
+#ifndef Q_MOC_RUN
 #include <third_party/boost/timers.hpp>
+#endif
 #include "game_defs.h"

 /**