Changes for qt5 (Windows build, boost compatibility).

This commit is contained in:
lotodore
2013-08-29 17:26:08 +02:00
parent d694a27498
commit 2db9ea1a93
6 changed files with 12 additions and 2 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ on your Linux system.
3. Within /opt/mingw, run
make gcc
make qt
make qt5
make boost
make curl
make libgsasl
+2
View File
@@ -35,7 +35,9 @@
#include <vector>
#include <string>
#ifndef Q_MOC_RUN
#include <boost/thread.hpp>
#endif
enum ConfigState { NONEXISTING, OLD, OK };
enum ConfigType { CONFIG_TYPE_INT, CONFIG_TYPE_STRING, CONFIG_TYPE_INT_LIST, CONFIG_TYPE_STRING_LIST };
+2 -1
View File
@@ -35,8 +35,9 @@
#include <list>
#include <string>
#ifndef Q_MOC_RUN
#include <third_party/boost/timers.hpp>
#endif
typedef std::list<unsigned> PlayerIdList;
+3
View File
@@ -40,7 +40,10 @@
#include "game_defs.h"
#include <string>
#ifndef Q_MOC_RUN
#include <boost/shared_ptr.hpp>
#endif
#include <QtGui>
#include <QtCore>
+2
View File
@@ -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"
/**