From dca22fd6e9012a0a5cc4aeec62cd7cce1f0c5003 Mon Sep 17 00:00:00 2001
From: Vladislav Dmitrievich Turbanov <vladislav@turbanov.ru>
Date: Thu, 11 Feb 2021 22:11:06 +0300
Subject: [PATCH 1/2] * Fixed compilation for Clang + Windows combo.

---
 3rdparty/nvtt/nvcore/nvcore.h | 4 ++--
 3rdparty/nvtt/nvcore/posh.h   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/3rdparty/nvtt/nvcore/nvcore.h b/3rdparty/nvtt/nvcore/nvcore.h
index e2458e2..43954a6 100644
--- 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
index acf8bc9..d951174 100644
--- a/3rdparty/nvtt/nvcore/posh.h
+++ b/3rdparty/nvtt/nvcore/posh.h
@@ -258,9 +258,11 @@ LLVM:
 #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" 

From af59d238da1b9277923147ec1a94748c3484c996 Mon Sep 17 00:00:00 2001
From: Vladislav Dmitrievich Turbanov <vturbanov@gmail.com>
Date: Fri, 12 Feb 2021 11:05:56 +0300
Subject: [PATCH 2/2] Fixed encoding error

Co-authored-by: Leon Brands <lajbrands@outlook.com>
---
 3rdparty/nvtt/nvcore/nvcore.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty/nvtt/nvcore/nvcore.h b/3rdparty/nvtt/nvcore/nvcore.h
index 43954a6..5bd5d7b 100644
--- 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