diff options
Diffstat (limited to 'source/compiler-core')
| -rw-r--r-- | source/compiler-core/slang-dxc-compiler.cpp | 8 | ||||
| -rw-r--r-- | source/compiler-core/slang-fxc-compiler.cpp | 6 | ||||
| -rw-r--r-- | source/compiler-core/windows/slang-win-visual-studio-util.cpp | 7 |
3 files changed, 4 insertions, 17 deletions
diff --git a/source/compiler-core/slang-dxc-compiler.cpp b/source/compiler-core/slang-dxc-compiler.cpp index a275143f8..832c5809c 100644 --- a/source/compiler-core/slang-dxc-compiler.cpp +++ b/source/compiler-core/slang-dxc-compiler.cpp @@ -34,13 +34,9 @@ #if SLANG_ENABLE_DXIL_SUPPORT # ifdef _WIN32 -# define WIN32_LEAN_AND_MEAN -# define NOMINMAX -# include <Windows.h> -# include <Unknwn.h> +# include <windows.h> +# include <unknwn.h> # include "../../external/dxc/dxcapi.h" -# undef WIN32_LEAN_AND_MEAN -# undef NOMINMAX # else # include "../../external/dxc/dxcapi.h" diff --git a/source/compiler-core/slang-fxc-compiler.cpp b/source/compiler-core/slang-fxc-compiler.cpp index de6f5d2bc..9d547e673 100644 --- a/source/compiler-core/slang-fxc-compiler.cpp +++ b/source/compiler-core/slang-fxc-compiler.cpp @@ -26,11 +26,7 @@ // Enable calling through to `fxc` or `dxc` to // generate code on Windows. #ifdef _WIN32 -# define WIN32_LEAN_AND_MEAN -# define NOMINMAX -# include <Windows.h> -# undef WIN32_LEAN_AND_MEAN -# undef NOMINMAX +# include <windows.h> # include <d3dcompiler.h> # ifndef SLANG_ENABLE_DXBC_SUPPORT diff --git a/source/compiler-core/windows/slang-win-visual-studio-util.cpp b/source/compiler-core/windows/slang-win-visual-studio-util.cpp index d4c72e100..cb784b426 100644 --- a/source/compiler-core/windows/slang-win-visual-studio-util.cpp +++ b/source/compiler-core/windows/slang-win-visual-studio-util.cpp @@ -10,12 +10,7 @@ #include "../slang-visual-studio-compiler-util.h" #ifdef _WIN32 -# define WIN32_LEAN_AND_MEAN -# define NOMINMAX -# include <Windows.h> -# undef WIN32_LEAN_AND_MEAN -# undef NOMINMAX - +# include <windows.h> # include <Shlobj.h> #pragma comment(lib, "advapi32") #pragma comment(lib, "Shell32") |
