[Bf-blender-cvs] [897a21e6a34] master: Glog: Restore some custom config for MSVC2015

Sergey Sharybin noreply at git.blender.org
Thu Mar 22 17:48:51 CET 2018


Commit: 897a21e6a34513e70af2dc452fa704643f91e796
Author: Sergey Sharybin
Date:   Thu Mar 22 17:48:36 2018 +0100
Branches: master
https://developer.blender.org/rB897a21e6a34513e70af2dc452fa704643f91e796

Glog: Restore some custom config for MSVC2015

===================================================================

M	extern/glog/src/windows/config.h

===================================================================

diff --git a/extern/glog/src/windows/config.h b/extern/glog/src/windows/config.h
index 2d23fb08159..1cc2533daa5 100644
--- a/extern/glog/src/windows/config.h
+++ b/extern/glog/src/windows/config.h
@@ -1,5 +1,8 @@
 /* src/config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* define if you have google gflags library */
+#define HAVE_LIB_GFLAGS 1
+
 /* Namespace for Google classes */
 #define GOOGLE_NAMESPACE google
 
@@ -9,6 +12,10 @@
 /* Puts following code inside the Google namespace */
 #define _START_GOOGLE_NAMESPACE_ namespace google {
 
+#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER >= 1900))
+#  define HAVE_SNPRINTF
+#endif
+
 /* Always the empty-string on non-windows systems. On windows, should be
    "__declspec(dllexport)". This way, when we compile the dll, we export our
    functions/classes. It's safe to define this here because config.h is only



More information about the Bf-blender-cvs mailing list