From a8492b7c5a7be6f57c3f95f1912fe9d109181350 Mon Sep 17 00:00:00 2001 From: "Xawotihs@gmail.com" Date: Fri, 1 Jun 2012 23:36:18 +0000 Subject: [PATCH] Fixed compilation with mingwin --- JGE/include/JTypes.h | 2 +- JGE/src/JResourceManager.cpp | 2 +- projects/mtg/include/config.h | 2 +- projects/mtg/wagic-qt.pro | 11 +++++++++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/JGE/include/JTypes.h b/JGE/include/JTypes.h index 42ce24b41..3d94be68d 100644 --- a/JGE/include/JTypes.h +++ b/JGE/include/JTypes.h @@ -88,7 +88,7 @@ enum { #if (defined WIN32) && (!defined LINUX) #include #endif -#if defined(LINUX) || defined(IOS) || defined (ANDROID) +#if defined(LINUX) && (!defined WIN32) || defined(IOS) || defined (ANDROID) typedef uint8_t byte; typedef uint32_t DWORD; typedef uint8_t BYTE; diff --git a/JGE/src/JResourceManager.cpp b/JGE/src/JResourceManager.cpp index bb6ab9dd1..a5d3c75cd 100644 --- a/JGE/src/JResourceManager.cpp +++ b/JGE/src/JResourceManager.cpp @@ -16,7 +16,7 @@ #include "../include/JLBFont.h" #include "tinyxml/tinyxml.h" -#if defined (_DEBUG) && defined (WIN32) +#if defined (_DEBUG) && defined (WIN32) && (!defined LINUX) #include "crtdbg.h" #define NEW new(_NORMAL_BLOCK, __FILE__, __LINE__) #else diff --git a/projects/mtg/include/config.h b/projects/mtg/include/config.h index a9c7bcb24..fe33e92ca 100644 --- a/projects/mtg/include/config.h +++ b/projects/mtg/include/config.h @@ -11,7 +11,7 @@ #include "limits.h" -#if defined (_DEBUG) && defined (WIN32) +#if defined (_DEBUG) && defined (WIN32) && (!defined LINUX) #include "crtdbg.h" #define NEW new(_NORMAL_BLOCK, __FILE__, __LINE__) #else diff --git a/projects/mtg/wagic-qt.pro b/projects/mtg/wagic-qt.pro index d23b377e9..39d50d341 100644 --- a/projects/mtg/wagic-qt.pro +++ b/projects/mtg/wagic-qt.pro @@ -15,7 +15,6 @@ TEMPLATE = app #!macx:CONFIG += precompile_header unix|macx:QMAKE_CXXFLAGS += -Wno-unused-parameter unix|macx:!maemo5:!symbian:QMAKE_CXXFLAGS += -Werror -windows:DEFINES += WIN32 windows:DEFINES += _CRT_SECURE_NO_WARNINGS unix|macx:DEFINES += LINUX 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 windows:INCLUDEPATH += ../../JGE/Dependencies/include -windows:INCLUDEPATH += extra +windows{ + *-g++* { + DEFINES += LINUX + } + *-msvc* { + INCLUDEPATH += extra + DEFINES += WIN32 + } +} unix:!symbian:INCLUDEPATH += /usr/include/GL macx:INCLUDEPATH += /opt/include INCLUDEPATH += ../../JGE/include/qt