From 4c9c8a7a4d9b97fec6041a562638fbea521533ed Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 14 Apr 2023 17:08:18 +0800 Subject: Some small fixes with Windows/DX usage (#2797) * Correct case of windows.h includes * Use Slang::SharedLibrary to load directx dlls * s/max/std::max/ * Factor common OS code in calcHasApi * Add DXIL test for compute/simple * s/false/FALSE for calls to WinAPI functions * Factor common OS code in gfxGetAdapters * 2 missing headers d3d12sdklayers for ID3DDebug climits for UINT_MAX * Define out unused function on Linux * Only try to load Vulkan and CUDA on Windows or Linux * simplify D3DUtil::getDxgiModule * Remove WIN32_LEAN_AND_MEAN &co from source files Add a global define * Set WIN32_LEAN_AND_MEAN &friends in headers Restore previous state also * regenerate vs projects --- source/compiler-core/windows/slang-win-visual-studio-util.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'source/compiler-core/windows/slang-win-visual-studio-util.cpp') 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 -# undef WIN32_LEAN_AND_MEAN -# undef NOMINMAX - +# include # include #pragma comment(lib, "advapi32") #pragma comment(lib, "Shell32") -- cgit v1.2.3