Fixing compilability under VS 2012

ohhmm · Aug 1, 2013 · 6e9cce1 · 6e9cce1
1 parent cd4afc3
commit 6e9cce1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -294,6 +294,9 @@ else (UNIX)
 		endif()
 	endif()
 
+    if (NOT (MSVC_VERSION LESS 1700))
+        add_definitions(/D_ALLOW_KEYWORD_MACROS)
+    endif()
 endif()
 
 if (GAME_DEVICE_SUPPORT)

diff --git a/src/lib/common/common.h b/src/lib/common/common.h
@@ -142,10 +142,12 @@
 // we don't want to use NULL since it's old and nasty, so replace any
 // usages with nullptr (warning: this could break many things).
 // if not c++0x yet, future proof code by allowing use of nullptr
-#ifdef nullptr
-#define NULL nullptr
-#else
-#define nullptr NULL
+#if !(defined(_MSC_VER) && _MSC_VER >= 1700)
+# ifdef nullptr
+#  define NULL nullptr
+# else
+#  define nullptr NULL
+# endif
 #endif
 
 // make assert available since we use it a lot

diff --git a/src/lib/platform/CMSWindowsScreen.cpp b/src/lib/platform/CMSWindowsScreen.cpp
@@ -37,7 +37,6 @@
 #include "CArch.h"
 #include "CArchMiscWindows.h"
 #include <string.h>
-#include <pbt.h>
 
 //
 // add backwards compatible multihead support (and suppress bogus warning).