From: Rémi Verschelde <rverschelde@gmail.com>
Date: Fri, 18 Nov 2016 22:07:15 +0000 (+0100)
Subject: Fix mingw32 build by dropping re- and undefs of core types
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=3df5b67a683de08084f79b5910254f799fc3b4a8;p=lugaru.git

Fix mingw32 build by dropping re- and undefs of core types

That simplifies the code and it seems to solve build issues with jpeglib.
The mingw32 build still fails at the linking step (GL issue), but that's
better already.
---

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 5c32c25..b12cf8b 100644
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -21,29 +21,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 #ifdef WIN32
-#define UINT8 WIN32API_UINT8
-#define UINT16 WIN32API_UINT16
-#define boolean WIN32API_boolean
 #include <windows.h>
-#undef UINT8
-#undef UINT16
-#undef boolean
 #endif
 
-
-
 #include "Game.h"
-extern "C" {
-#include "zlib.h"
-#include "png.h"
-#ifdef WIN32
-#define INT32 INT32_jpeg
-#include "jpeglib.h"
-#undef INT32
-#else
-#include "jpeglib.h"
-#endif
-}
+
+#include <jpeglib.h>
+#include <png.h>
+#include <zlib.h>
 
 using namespace Game;