From 7a062b61a80cfb2ef1a7560bc219e9cc63a1e779 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 30 Oct 2012 21:08:33 -0300
Subject: [PATCH] Add support for VC++11 (2012)

---
 CMakeLists.txt                                        | 7 +++++++
 src/allegro/CMakeLists.txt                            | 5 +++--
 src/allegro/include/allegro/platform/almsvc.h         | 4 ++++
 src/allegro/include/allegro/platform/alplatf.h.cmake  | 2 ++
 src/allegro/include/allegro/platform/alunixac.h.cmake | 1 -
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7fbfcc04a..f65fd2ff5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,6 +123,13 @@ if(ENABLE_MEMLEAK)
   add_definitions(-DMEMLEAK)
 endif()
 
+# Fix to compile gtest with VC11 (2012)
+if(NOT USE_SHARED_GTEST)
+  if (MSVC_VERSION EQUAL 1700)
+    add_definitions(-D_VARIADIC_MAX=10)
+  endif()
+endif()
+
 ######################################################################
 # Platform specific stuff
 
diff --git a/src/allegro/CMakeLists.txt b/src/allegro/CMakeLists.txt
index 1b4e70435..432dda15b 100644
--- a/src/allegro/CMakeLists.txt
+++ b/src/allegro/CMakeLists.txt
@@ -44,7 +44,7 @@ set(FRAMEWORK_INSTALL_PREFIX "/Library/Frameworks" CACHE STRING
 
 #-----------------------------------------------------------------------------#
 #
-# Unix platform checks
+# Platform checks
 #
 
 include(CheckIncludeFiles)
@@ -71,7 +71,6 @@ if(UNIX)
     check_include_files(linux/soundcard.h ALLEGRO_HAVE_LINUX_SOUNDCARD_H)
     check_include_files(machine/soundcard.h ALLEGRO_HAVE_MACHINE_SOUNDCARD_H)
     check_include_files(soundcard.h ALLEGRO_HAVE_SOUNDCARD_H)
-    check_include_files(stdint.h ALLEGRO_HAVE_STDINT_H)
     check_include_files(sys/io.h ALLEGRO_HAVE_SYS_IO_H)
     check_include_files(sys/stat.h ALLEGRO_HAVE_SYS_STAT_H)
     check_include_files(sys/time.h ALLEGRO_HAVE_SYS_TIME_H)
@@ -148,6 +147,8 @@ if(UNIX)
     # XXX size_t
 endif(UNIX)
 
+check_include_files(stdint.h ALLEGRO_HAVE_STDINT_H)
+
 #-----------------------------------------------------------------------------#
 #
 # Compiler and platform setup
diff --git a/src/allegro/include/allegro/platform/almsvc.h b/src/allegro/include/allegro/platform/almsvc.h
index a98bf4aef..5ad5dc553 100644
--- a/src/allegro/include/allegro/platform/almsvc.h
+++ b/src/allegro/include/allegro/platform/almsvc.h
@@ -77,9 +77,13 @@
 
 #define INLINE       __inline
 
+#if _MSC_VER < 1700
 #define LONG_LONG    __int64
 #define int64_t      signed __int64
 #define uint64_t     unsigned __int64
+#else
+#define LONG_LONG    long long
+#endif
 
 #define AL_CONST     const
 
diff --git a/src/allegro/include/allegro/platform/alplatf.h.cmake b/src/allegro/include/allegro/platform/alplatf.h.cmake
index 23c082203..98695e157 100644
--- a/src/allegro/include/allegro/platform/alplatf.h.cmake
+++ b/src/allegro/include/allegro/platform/alplatf.h.cmake
@@ -12,6 +12,8 @@
 #cmakedefine ALLEGRO_UNIX
 #cmakedefine ALLEGRO_WATCOM
 
+#cmakedefine ALLEGRO_HAVE_STDINT_H
+
 /* These are always defined now. */
 #define ALLEGRO_NO_ASM
 #define ALLEGRO_USE_C
diff --git a/src/allegro/include/allegro/platform/alunixac.h.cmake b/src/allegro/include/allegro/platform/alunixac.h.cmake
index 5adb3aa7f..8b311353e 100644
--- a/src/allegro/include/allegro/platform/alunixac.h.cmake
+++ b/src/allegro/include/allegro/platform/alunixac.h.cmake
@@ -21,7 +21,6 @@
 #cmakedefine ALLEGRO_HAVE_LINUX_SOUNDCARD_H
 #cmakedefine ALLEGRO_HAVE_MACHINE_SOUNDCARD_H
 #cmakedefine ALLEGRO_HAVE_SOUNDCARD_H
-#cmakedefine ALLEGRO_HAVE_STDINT_H
 #cmakedefine ALLEGRO_HAVE_SV_PROCFS_H
 #cmakedefine ALLEGRO_HAVE_SYS_IO_H
 #cmakedefine ALLEGRO_HAVE_SYS_SOUNDCARD_H