[d3d8 Rebase] MSVC build fixes

AlpyneDreams · AlpyneDreams · commit 7d45fb6f1a62 · 2023-02-23T06:14:46.000-08:00
diff --git a/src/d3d8/meson.build b/src/d3d8/meson.build
@@ -11,7 +11,7 @@ d3d8_dll = shared_library('d3d8'+dll_ext, d3d8_src, d3d8_res,
   dependencies        : [ d3d9_dep, util_dep ],
   include_directories : dxvk_include_path,
   install             : true,
-  objects             : not dxvk_msvc ? 'd3d8'+def_spec_ext : [],
+  objects             : not dxvk_is_msvc ? 'd3d8'+def_spec_ext : [],
   vs_module_defs      : 'd3d8'+def_spec_ext,
   override_options    : ['cpp_std='+dxvk_cpp_std])
 
diff --git a/src/vulkan/vulkan_util.h b/src/vulkan/vulkan_util.h
@@ -4,6 +4,11 @@
 
 #include "vulkan_loader.h"
 
+#if defined(_MSC_VER)
+// Unary minus on unsigned type
+#pragma warning( disable : 4146 )
+#endif
+
 namespace dxvk::vk {
 
   inline VkImageSubresourceRange makeSubresourceRange(
