* Fixed compilation for Clang + Windows combo.

clems71 · Feb 11, 2021 · dca22fd · dca22fd
1 parent c779a67
commit dca22fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/3rdparty/nvtt/nvcore/nvcore.h b/3rdparty/nvtt/nvcore/nvcore.h
@@ -1,4 +1,4 @@
-// This code is in the public domain -- Ignacio Castaño <castano@gmail.com>
+// This code is in the public domain -- Ignacio Casta�o <castano@gmail.com>
 
 #ifndef NV_CORE_H
 #define NV_CORE_H
@@ -357,7 +357,7 @@ NV_COMPILER_CHECK(sizeof(uint32) == 4);
 #       include "defsgnuclinux.h"
 #   elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_OPENBSD
 #       include "defsgnucdarwin.h"
-#   elif NV_OS_MINGW
+#   elif NV_OS_MINGW || (NV_CC_CLANG && NV_OS_WIN32)
 #       include "defsgnucwin32.h"
 #   elif NV_OS_CYGWIN
 #       error "GCC: Cygwin not supported"

diff --git a/3rdparty/nvtt/nvcore/posh.h b/3rdparty/nvtt/nvcore/posh.h
@@ -258,9 +258,11 @@ HP-UX C/C++ Compiler:
 #endif
 
 #if defined _MSC_VER
+#if !defined __clang__
 #  define POSH_COMPILER_STRING "Microsoft Visual C++"
 #  define POSH_COMPILER_MSVC 1
 #endif
+#endif
 
 #if defined __SUNPRO_C
 #  define POSH_COMPILER_STRING "Sun Pro"