From: Marc Cannon <vyhdycokio@gmail.com>
Date: Thu, 24 Jan 2013 11:29:53 +0000 (-0500)
Subject: Patch Windows macros in arch_setup.h so we don't have to define a bunch of them on... 
X-Git-Url: http://git.cameron1729.xyz/?a=commitdiff_plain;h=ba77b7762c57c7955849e7fae88bad63b9dc8a5e;p=openitg.git

Patch Windows macros in arch_setup.h so we don't have to define a bunch of them on the command line
---

diff --git a/src/archutils/Win32/arch_setup.h b/src/archutils/Win32/arch_setup.h
index c270cf8a..fc146583 100644
--- a/src/archutils/Win32/arch_setup.h
+++ b/src/archutils/Win32/arch_setup.h
@@ -5,6 +5,13 @@
 #define SUPPORT_OPENGL
 #endif
 
+/* We're using different macros through the codebase. Declare them all here */
+#ifdef _WIN32
+#define WIN32
+#define WINDOWS
+#define _WINDOWS
+#endif
+
 #define SUPPORT_D3D
 
 /* Fix VC breakage. */
diff --git a/src/global.h b/src/global.h
index a167dd09..86b06edb 100644
--- a/src/global.h
+++ b/src/global.h
@@ -13,7 +13,7 @@
 #define __STDC_CONSTANT_MACROS // for INT64_C, etc
 
 /* Platform-specific fixes. */
-#if defined(WIN32)
+#if defined(_WIN32)
 #include "archutils/Win32/arch_setup.h"
 #elif defined(PBBUILD)
 #include "archutils/Darwin/arch_setup.h"