mingw: fix nvmath

OpenXRay · May 26, 2018 · 24c180d · 24c180d
1 parent a2cba9f
commit 24c180d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Externals/NVTT/src/nvmath/nvmath.h b/Externals/NVTT/src/nvmath/nvmath.h
@@ -115,9 +115,9 @@ inline bool isZero(const float f, const float epsilon = NV_EPSILON)
 
 inline bool isFinite(const float f)
 {
-#if NV_OS_WIN32
+#if NV_OS_WIN32 && !NV_CC_GNUC
 	return _finite(f) != 0;
-#elif NV_OS_DARWIN
+#elif NV_OS_DARWIN || NV_CC_GNUC
 	return isfinite(f);
 #elif NV_OS_LINUX
 	return finitef(f);
@@ -130,9 +130,9 @@ inline bool isFinite(const float f)
 
 inline bool isNan(const float f)
 {
-#if NV_OS_WIN32
+#if NV_OS_WIN32 && !NV_CC_GNUC
 	return _isnan(f) != 0;
-#elif NV_OS_DARWIN
+#elif NV_OS_DARWIN || NV_CC_GNUC
 	return isnan(f);
 #elif NV_OS_LINUX
 	return isnanf(f);

diff --git a/src/Common/PlatformWindows.inl b/src/Common/PlatformWindows.inl
@@ -23,7 +23,11 @@
 #define NOHELP
 #define NOPROFILER
 #define NOMCX
+
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
+
 #define DOSWIN32
 #define _WIN32_DCOM