Fixed compilation with mingwin

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

View File

@@ -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;

View File

@@ -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