Changes for qt5 (Windows build, boost compatibility).
This commit is contained in:
@@ -12,7 +12,7 @@ on your Linux system.
|
|||||||
|
|
||||||
3. Within /opt/mingw, run
|
3. Within /opt/mingw, run
|
||||||
make gcc
|
make gcc
|
||||||
make qt
|
make qt5
|
||||||
make boost
|
make boost
|
||||||
make curl
|
make curl
|
||||||
make libgsasl
|
make libgsasl
|
||||||
|
|||||||
@@ -35,7 +35,9 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
#ifndef Q_MOC_RUN
|
||||||
#include <boost/thread.hpp>
|
#include <boost/thread.hpp>
|
||||||
|
#endif
|
||||||
|
|
||||||
enum ConfigState { NONEXISTING, OLD, OK };
|
enum ConfigState { NONEXISTING, OLD, OK };
|
||||||
enum ConfigType { CONFIG_TYPE_INT, CONFIG_TYPE_STRING, CONFIG_TYPE_INT_LIST, CONFIG_TYPE_STRING_LIST };
|
enum ConfigType { CONFIG_TYPE_INT, CONFIG_TYPE_STRING, CONFIG_TYPE_INT_LIST, CONFIG_TYPE_STRING_LIST };
|
||||||
|
|||||||
+2
-1
@@ -35,8 +35,9 @@
|
|||||||
|
|
||||||
#include <list>
|
#include <list>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#ifndef Q_MOC_RUN
|
||||||
#include <third_party/boost/timers.hpp>
|
#include <third_party/boost/timers.hpp>
|
||||||
|
#endif
|
||||||
|
|
||||||
typedef std::list<unsigned> PlayerIdList;
|
typedef std::list<unsigned> PlayerIdList;
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,10 @@
|
|||||||
#include "game_defs.h"
|
#include "game_defs.h"
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
#ifndef Q_MOC_RUN
|
||||||
#include <boost/shared_ptr.hpp>
|
#include <boost/shared_ptr.hpp>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <QtGui>
|
#include <QtGui>
|
||||||
#include <QtCore>
|
#include <QtCore>
|
||||||
|
|||||||
@@ -35,7 +35,9 @@
|
|||||||
|
|
||||||
#include <QtGui>
|
#include <QtGui>
|
||||||
#include <QtCore>
|
#include <QtCore>
|
||||||
|
#ifndef Q_MOC_RUN
|
||||||
#include <third_party/boost/timers.hpp>
|
#include <third_party/boost/timers.hpp>
|
||||||
|
#endif
|
||||||
#if QT_VERSION >= 0x050000
|
#if QT_VERSION >= 0x050000
|
||||||
#include <QtWidgets>
|
#include <QtWidgets>
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -37,7 +37,9 @@
|
|||||||
#if QT_VERSION >= 0x050000
|
#if QT_VERSION >= 0x050000
|
||||||
#include <QtWidgets>
|
#include <QtWidgets>
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef Q_MOC_RUN
|
||||||
#include <third_party/boost/timers.hpp>
|
#include <third_party/boost/timers.hpp>
|
||||||
|
#endif
|
||||||
#include "game_defs.h"
|
#include "game_defs.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user