From 4cb03924c113c74b99e18c7347278600a011e917 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 18 Jun 2014 16:32:53 -0700 Subject: [PATCH] Fix ANGLE build with Microsoft Visual Studio "14" CTP This version has a few new C99 support added, including snprintf. Change-Id: I5776456fd94254a64f08791f59bc775cb24c9b7f Reviewed-by: Andrew Knight --- src/3rdparty/angle/src/common/angleutils.h | 2 +- ...-with-Microsoft-Visual-Studio-14-CTP.patch | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 src/angle/patches/0019-Fix-ANGLE-build-with-Microsoft-Visual-Studio-14-CTP.patch diff --git a/src/3rdparty/angle/src/common/angleutils.h b/src/3rdparty/angle/src/common/angleutils.h index 7723f0fb72..3d4246f55c 100644 --- a/src/3rdparty/angle/src/common/angleutils.h +++ b/src/3rdparty/angle/src/common/angleutils.h @@ -56,7 +56,7 @@ void SafeDeleteArray(T*& resource) resource = NULL; } -#if defined(_MSC_VER) +#if defined(_MSC_VER) && _MSC_VER < 1900 #define snprintf _snprintf #endif diff --git a/src/angle/patches/0019-Fix-ANGLE-build-with-Microsoft-Visual-Studio-14-CTP.patch b/src/angle/patches/0019-Fix-ANGLE-build-with-Microsoft-Visual-Studio-14-CTP.patch new file mode 100644 index 0000000000..b0939a1126 --- /dev/null +++ b/src/angle/patches/0019-Fix-ANGLE-build-with-Microsoft-Visual-Studio-14-CTP.patch @@ -0,0 +1,28 @@ +From 6a3ced5ce411cdcc27308996db496a9d0ca0496f Mon Sep 17 00:00:00 2001 +From: Thiago Macieira +Date: Wed, 18 Jun 2014 16:32:53 -0700 +Subject: [PATCH 19/19] Fix ANGLE build with Microsoft Visual Studio "14" CTP + +This version has a few new C99 support added, including snprintf. + +Change-Id: I5776456fd94254a64f08791f59bc775cb24c9b7f +--- + src/3rdparty/angle/src/common/angleutils.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/angle/src/common/angleutils.h b/src/3rdparty/angle/src/common/angleutils.h +index 7723f0f..3d4246f 100644 +--- a/src/3rdparty/angle/src/common/angleutils.h ++++ b/src/3rdparty/angle/src/common/angleutils.h +@@ -56,7 +56,7 @@ void SafeDeleteArray(T*& resource) + resource = NULL; + } + +-#if defined(_MSC_VER) ++#if defined(_MSC_VER) && _MSC_VER < 1900 + #define snprintf _snprintf + #endif + +-- +1.8.4.5 +