Fixed compilation with mingwin
This commit is contained in:
@@ -88,7 +88,7 @@ enum {
|
||||
#if (defined WIN32) && (!defined LINUX)
|
||||
#include <windows.h>
|
||||
#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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user