Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compilation with mingwin

Browse Source
This commit is contained in:
Xawotihs@gmail.com
2012-06-01 23:36:18 +00:00
parent 6dafc098cb
commit a8492b7c5a
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JGE/include/JTypes.h
+1 -1
View File
@@ -88,7 +88,7 @@ enum {
#if (defined WIN32) && (!defined LINUX) #if (defined WIN32) && (!defined LINUX)
#include <windows.h> #include <windows.h>
#endif #endif
#if defined(LINUX) || defined(IOS) || defined (ANDROID) #if defined(LINUX) && (!defined WIN32) || defined(IOS) || defined (ANDROID)
typedef uint8_t byte; typedef uint8_t byte;
typedef uint32_t DWORD; typedef uint32_t DWORD;
typedef uint8_t BYTE; typedef uint8_t BYTE;
JGE/src/JResourceManager.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
#include "../include/JLBFont.h" #include "../include/JLBFont.h"
#include "tinyxml/tinyxml.h" #include "tinyxml/tinyxml.h"
#if defined (_DEBUG) && defined (WIN32) #if defined (_DEBUG) && defined (WIN32) && (!defined LINUX)
#include "crtdbg.h" #include "crtdbg.h"
#define NEW new(_NORMAL_BLOCK, __FILE__, __LINE__) #define NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
#else #else
projects/mtg/include/config.h
+1 -1
View File
@@ -11,7 +11,7 @@
#include "limits.h" #include "limits.h"
#if defined (_DEBUG) && defined (WIN32) #if defined (_DEBUG) && defined (WIN32) && (!defined LINUX)
#include "crtdbg.h" #include "crtdbg.h"
#define NEW new(_NORMAL_BLOCK, __FILE__, __LINE__) #define NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
#else #else
projects/mtg/wagic-qt.pro
+9 -2
View File
@@ -15,7 +15,6 @@ TEMPLATE = app
#!macx:CONFIG += precompile_header #!macx:CONFIG += precompile_header
unix|macx:QMAKE_CXXFLAGS += -Wno-unused-parameter unix|macx:QMAKE_CXXFLAGS += -Wno-unused-parameter
unix|macx:!maemo5:!symbian:QMAKE_CXXFLAGS += -Werror unix|macx:!maemo5:!symbian:QMAKE_CXXFLAGS += -Werror
windows:DEFINES += WIN32
windows:DEFINES += _CRT_SECURE_NO_WARNINGS windows:DEFINES += _CRT_SECURE_NO_WARNINGS
unix|macx:DEFINES += LINUX unix|macx:DEFINES += LINUX
CONFIG(debug, debug|release):DEFINES += _DEBUG CONFIG(debug, debug|release):DEFINES += _DEBUG
@@ -26,7 +25,15 @@ android:INCLUDEPATH += $$ANDROID_NDK_ROOT/platforms/android-9/arch-arm/usr/inclu
maemo5:DEFINES += QT_WIDGET maemo5:DEFINES += QT_WIDGET
windows:INCLUDEPATH += ../../JGE/Dependencies/include windows:INCLUDEPATH += ../../JGE/Dependencies/include
windows:INCLUDEPATH += extra windows{
*-g++* {
DEFINES += LINUX
}
*-msvc* {
INCLUDEPATH += extra
DEFINES += WIN32
}
}
unix:!symbian:INCLUDEPATH += /usr/include/GL unix:!symbian:INCLUDEPATH += /usr/include/GL
macx:INCLUDEPATH += /opt/include macx:INCLUDEPATH += /opt/include
INCLUDEPATH += ../../JGE/include/qt INCLUDEPATH += ../../JGE/include/qt