AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ANGLE build with Microsoft Visual Studio "14" CTP

Browse Source 
This version has a few new C99 support added, including snprintf.

Change-Id: I5776456fd94254a64f08791f59bc775cb24c9b7f
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
This commit is contained in:
Thiago Macieira 2014-06-18 16:32:53 -07:00
parent c896c6b79b
commit 4cb03924c1
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/angle/src/common/angleutils.h vendored
View File

@ -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

28
src/angle/patches/0019-Fix-ANGLE-build-with-Microsoft-Visual-Studio-14-CTP.patch Normal file
View File

@ -0,0 +1,28 @@
From 6a3ced5ce411cdcc27308996db496a9d0ca0496f Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
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