[Bf-blender-cvs] [5974216] master: Just another attempt to make MSVC happy

Sergey Sharybin noreply at git.blender.org
Wed Dec 31 15:04:40 CET 2014


Commit: 59742167ce926c8898f80e00888e94c4766a9b32
Author: Sergey Sharybin
Date:   Wed Dec 31 19:03:48 2014 +0500
Branches: master
https://developer.blender.org/rB59742167ce926c8898f80e00888e94c4766a9b32

Just another attempt to make MSVC happy

No idea why standalone libmv remo was all fine with the code..

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

M	extern/libmv/third_party/gflags/config.h
M	extern/libmv/third_party/gflags/gflags/gflags.h
M	extern/libmv/third_party/gflags/gflags/gflags_declare.h

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

diff --git a/extern/libmv/third_party/gflags/config.h b/extern/libmv/third_party/gflags/config.h
index 986329b..8585108 100644
--- a/extern/libmv/third_party/gflags/config.h
+++ b/extern/libmv/third_party/gflags/config.h
@@ -29,9 +29,7 @@
 /* #undef HAVE_FNMATCH_H */
 
 // Define if you have the <shlwapi.h> header file (Windows 2000/XP).
-#ifdef WIN32
-#  define HAVE_SHLWAPI_H
-#endif
+#undef HAVE_SHLWAPI_H
 
 // Define if you have the strtoll function.
 #define HAVE_STRTOLL
diff --git a/extern/libmv/third_party/gflags/gflags/gflags.h b/extern/libmv/third_party/gflags/gflags/gflags.h
index a4f0940..797a54c 100644
--- a/extern/libmv/third_party/gflags/gflags/gflags.h
+++ b/extern/libmv/third_party/gflags/gflags/gflags.h
@@ -86,7 +86,7 @@
 
 // We always want to export variables defined in user code
 #ifndef GFLAGS_DLL_DEFINE_FLAG
-#  ifdef _MSC_VER
+#  if 0 && defined(_MSC_VER)
 #    define GFLAGS_DLL_DEFINE_FLAG __declspec(dllexport)
 #  else
 #    define GFLAGS_DLL_DEFINE_FLAG
diff --git a/extern/libmv/third_party/gflags/gflags/gflags_declare.h b/extern/libmv/third_party/gflags/gflags/gflags_declare.h
index c390d303..335c389 100644
--- a/extern/libmv/third_party/gflags/gflags/gflags_declare.h
+++ b/extern/libmv/third_party/gflags/gflags/gflags_declare.h
@@ -42,7 +42,7 @@
 
 // We always want to import the symbols of the gflags library
 #ifndef GFLAGS_DLL_DECL
-#  if 1 && defined(_MSC_VER)
+#  if 0 && defined(_MSC_VER)
 #    define GFLAGS_DLL_DECL __declspec(dllimport)
 #  else
 #    define GFLAGS_DLL_DECL
@@ -51,7 +51,7 @@
 
 // We always want to import variables declared in user code
 #ifndef GFLAGS_DLL_DECLARE_FLAG
-#  ifdef _MSC_VER
+#  if 0 && defined(_MSC_VER)
 #    define GFLAGS_DLL_DECLARE_FLAG __declspec(dllimport)
 #  else
 #    define GFLAGS_DLL_DECLARE_FLAG




More information about the Bf-blender-cvs mailing list