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 --- premake5.lua | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'premake5.lua') diff --git a/premake5.lua b/premake5.lua index 0998a338f..d7344ef92 100644 --- a/premake5.lua +++ b/premake5.lua @@ -393,6 +393,12 @@ workspace "slang" -- allow libraries to be listed in any order (do not require dependency order) linkgroups "On" + filter {} + -- For including windows.h in a way that minimized namespace pollution. + -- Although we define these here, we still set them manually in any header + -- files which may be included by another project + defines { "WIN32_LEAN_AND_MEAN", "VC_EXTRALEAN", "NOMINMAX" } + function dump(o) if type(o) == 'table' then local s = '{ ' -- cgit v1.2.3