[Bf-blender-cvs] [bae9a9e9f85] temp-remove-mingw: MinGW: Remove from intern

Aaron Carlisle noreply at git.blender.org
Mon Apr 24 01:43:11 CEST 2017


Commit: bae9a9e9f8566bab93f4de928c6a548250313f8b
Author: Aaron Carlisle
Date:   Sun Apr 23 17:49:54 2017 -0400
Branches: temp-remove-mingw
https://developer.blender.org/rBbae9a9e9f8566bab93f4de928c6a548250313f8b

MinGW: Remove from intern

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

M	intern/cycles/util/util_optimization.h
M	intern/cycles/util/util_path.cpp
M	intern/cycles/util/util_simd.h
M	intern/dualcon/intern/Projections.h
M	intern/dualcon/intern/dualcon_c_api.cpp
M	intern/ghost/intern/GHOST_Context.cpp
M	intern/ghost/intern/GHOST_SystemPathsWin32.cpp
M	intern/ghost/intern/GHOST_SystemWin32.cpp
M	intern/ghost/intern/GHOST_SystemWin32.h
M	intern/ghost/intern/GHOST_TaskbarWin32.h
M	intern/libmv/libmv/numeric/numeric.h
M	intern/opencolorio/CMakeLists.txt

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

diff --git a/intern/cycles/util/util_optimization.h b/intern/cycles/util/util_optimization.h
index 6f70a474fe7..b79c45d437b 100644
--- a/intern/cycles/util/util_optimization.h
+++ b/intern/cycles/util/util_optimization.h
@@ -107,14 +107,6 @@
 #  include <x86intrin.h>
 #endif
 
-#else
-
-/* MinGW64 has conflicting declarations for these SSE headers in <windows.h>.
- * Since we can't avoid including <windows.h>, better only include that */
-#include "util/util_windows.h"
-
-#endif
-
 #endif
 
 #endif /* __UTIL_OPTIMIZATION_H__ */
diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp
index cd3067f7650..b0d46d39b50 100644
--- a/intern/cycles/util/util_path.cpp
+++ b/intern/cycles/util/util_path.cpp
@@ -50,10 +50,8 @@ OIIO_NAMESPACE_USING
 CCL_NAMESPACE_BEGIN
 
 #ifdef _WIN32
-#  if defined(_MSC_VER) || defined(__MINGW64__)
+#  if defined(_MSC_VER)
 typedef struct _stat64 path_stat_t;
-#  elif defined(__MINGW32__)
-typedef struct _stati64 path_stat_t;
 #  else
 typedef struct _stat path_stat_t;
 #  endif
@@ -568,10 +566,8 @@ static string path_make_compatible(const string& path)
 
 static int path_wstat(const wstring& path_wc, path_stat_t *st)
 {
-#if defined(_MSC_VER) || defined(__MINGW64__)
+#if defined(_MSC_VER)
 	return _wstat64(path_wc.c_str(), st);
-#elif defined(__MINGW32__)
-	return _wstati64(path_wc.c_str(), st);
 #else
 	return _wstat(path_wc.c_str(), st);
 #endif
diff --git a/intern/cycles/util/util_simd.h b/intern/cycles/util/util_simd.h
index 557809a5719..69dbc2ed86d 100644
--- a/intern/cycles/util/util_simd.h
+++ b/intern/cycles/util/util_simd.h
@@ -71,7 +71,7 @@ __forceinline operator          int      ( ) const { return std::numeric_limits<
 #define _lzcnt_u64 __lzcnt64
 #endif
 
-#if defined(_WIN32) && !defined(__MINGW32__) && !defined(__clang__)
+#if defined(_WIN32) && !defined(__clang__)
 
 __forceinline int __popcnt(int in) {
   return _mm_popcnt_u32(in);
diff --git a/intern/dualcon/intern/Projections.h b/intern/dualcon/intern/Projections.h
index 2d1eca55997..2d245a77d15 100644
--- a/intern/dualcon/intern/Projections.h
+++ b/intern/dualcon/intern/Projections.h
@@ -29,7 +29,7 @@
 #define CONTAINS_INDEX
 #define GRID_DIMENSION 20
 
-#if defined(_WIN32) && !defined(__MINGW32__) && !(_MSC_VER >= 1900)
+#if defined(_WIN32) && !(_MSC_VER >= 1900)
 #define isnan(n) _isnan(n)
 #define LONG __int64
 #define int64_t __int64
diff --git a/intern/dualcon/intern/dualcon_c_api.cpp b/intern/dualcon/intern/dualcon_c_api.cpp
index e55de2ed354..92f8b0cfd1a 100644
--- a/intern/dualcon/intern/dualcon_c_api.cpp
+++ b/intern/dualcon/intern/dualcon_c_api.cpp
@@ -28,7 +28,7 @@
 #include <cstdio>
 #include <float.h>
 
-#if defined(_WIN32) && !defined(__MINGW32__)
+#if defined(_WIN32)
 #define isnan(n) _isnan(n)
 #endif
 
diff --git a/intern/ghost/intern/GHOST_Context.cpp b/intern/ghost/intern/GHOST_Context.cpp
index f69f2181ef7..72db17c4f56 100644
--- a/intern/ghost/intern/GHOST_Context.cpp
+++ b/intern/ghost/intern/GHOST_Context.cpp
@@ -38,7 +38,7 @@
 #  include <tchar.h>
 #
 #  ifndef ERROR_PROFILE_DOES_NOT_MATCH_DEVICE
-#    define ERROR_PROFILE_DOES_NOT_MATCH_DEVICE 0x7E7 // Mingw64 headers may have had this
+#    define ERROR_PROFILE_DOES_NOT_MATCH_DEVICE 0x7E7
 #  endif
 #endif
 
diff --git a/intern/ghost/intern/GHOST_SystemPathsWin32.cpp b/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
index 7d0ce5158fe..8056bc76edb 100644
--- a/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
@@ -37,30 +37,6 @@
 #include <shlobj.h>
 #include "utfconv.h"
 
-#ifdef __MINGW32__
-
-#if !defined(SHARD_PIDL)
-#define SHARD_PIDL      0x00000001L
-#endif
-
-#if !defined(SHARD_PATHA)
-#define SHARD_PATHA     0x00000002L
-#endif
-
-#if !defined(SHARD_PATHW)
-#define SHARD_PATHW     0x00000003L
-#endif
-
-#if !defined(SHARD_PATH)
-#ifdef UNICODE
-#define SHARD_PATH  SHARD_PATHW
-#else
-#define SHARD_PATH  SHARD_PATHA
-#endif
-#endif
-
-#endif
-
 GHOST_SystemPathsWin32::GHOST_SystemPathsWin32()
 {
 }
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 240d7ccd2fe..ca7118de7b0 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -890,25 +890,15 @@ bool GHOST_SystemWin32::processNDOF(RAWINPUT const &raw)
 	// send motion. Mark as 'sent' so motion will always get dispatched.
 	eventSent = true;
 
-#if defined(_MSC_VER) || defined(FREE_WINDOWS64)
+#if defined(_MSC_VER)
 	// using Microsoft compiler & header files
 	// they invented the RawInput API, so this version is (probably) correct.
-	// MinGW64 also works fine with this
 	BYTE const *data = raw.data.hid.bRawData;
 	// struct RAWHID {
 	// DWORD dwSizeHid;
 	// DWORD dwCount;
 	// BYTE  bRawData[1];
 	// };
-#else
-	// MinGW's definition (below) doesn't agree, so we need a slight
-	// workaround until it's fixed
-	BYTE const *data = &raw.data.hid.bRawData;
-	// struct RAWHID {
-	// DWORD dwSizeHid;
-	// DWORD dwCount;
-	// BYTE bRawData; // <== isn't this s'posed to be a BYTE*?
-	// };
 #endif
 
 	BYTE packetType = data[0];
diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h
index d534a300b35..aa1021c3142 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.h
+++ b/intern/ghost/intern/GHOST_SystemWin32.h
@@ -37,10 +37,6 @@
 #error WIN32 only!
 #endif // WIN32
 
-#ifndef __MINGW64__
-#  undef _WIN32_WINNT
-#  define _WIN32_WINNT 0x501 // require Windows XP or newer
-#endif
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <ole2.h> // for drag-n-drop
diff --git a/intern/ghost/intern/GHOST_TaskbarWin32.h b/intern/ghost/intern/GHOST_TaskbarWin32.h
index 6fcff297237..9489644bc21 100644
--- a/intern/ghost/intern/GHOST_TaskbarWin32.h
+++ b/intern/ghost/intern/GHOST_TaskbarWin32.h
@@ -8,10 +8,6 @@
 #error WIN32 only!
 #endif // WIN32
 
-#ifndef __MINGW64__
-#  undef _WIN32_WINNT
-#  define _WIN32_WINNT 0x501 // require Windows XP or newer
-#endif
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <shlobj.h>
diff --git a/intern/libmv/libmv/numeric/numeric.h b/intern/libmv/libmv/numeric/numeric.h
index 1a23d653676..98e4cd97a46 100644
--- a/intern/libmv/libmv/numeric/numeric.h
+++ b/intern/libmv/libmv/numeric/numeric.h
@@ -33,17 +33,15 @@
 #include <Eigen/QR>
 #include <Eigen/SVD>
 
-#if !defined(__MINGW64__)
-#  if defined(_WIN32) || defined(__APPLE__) || \
-      defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(_WIN32) || defined(__APPLE__) || \
+    defined(__FreeBSD__) || defined(__NetBSD__)
 inline void sincos(double x, double *sinx, double *cosx) {
   *sinx = sin(x);
   *cosx = cos(x);
 }
 #  endif
-#endif  // !__MINGW64__
 
-#if (defined(WIN32) || defined(WIN64)) && !defined(__MINGW32__)
+#if (defined(WIN32) || defined(WIN64))
 inline long lround(double d) {
   return (long)(d>0 ? d+0.5 : ceil(d-0.5));
 }
diff --git a/intern/opencolorio/CMakeLists.txt b/intern/opencolorio/CMakeLists.txt
index 61a8d995f40..75e228933aa 100644
--- a/intern/opencolorio/CMakeLists.txt
+++ b/intern/opencolorio/CMakeLists.txt
@@ -59,7 +59,7 @@ if(WITH_OPENCOLORIO)
 		ocio_impl_glsl.cc
 	)
 
-	if(WIN32 AND NOT MINGW)
+	if(WIN32)
 		list(APPEND INC_SYS
 			${BOOST_INCLUDE_DIR}
 		)




More information about the Bf-blender-cvs mailing list