Disable vulkan in Windows build when HAVE_VULKAN is off and other cmake build fixes. (#11118)

* Make WolfSSL build support multi-config generator.
Fix a build error in Windows when using QT's moc.
Disable vulkan in Windows build when HAVE_VULKAN is off.

* add WIN32_LEAN_AND_MEAN definition to VS project.
add HAVE_VULKAN definition to VS project.
Define NTSTATUS in main.cpp.
This commit is contained in:
陈俊嘉 2021-11-13 23:11:49 +08:00 committed by GitHub
parent 8b3ed7b599
commit 05881ffa62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 27 additions and 26 deletions

View file

@ -41,7 +41,7 @@
#include "display_sleep_control.h"
#if defined(_WIN32) || defined(HAVE_VULKAN)
#if defined(HAVE_VULKAN)
#include "Emu/RSX/VK/VulkanAPI.h"
#endif
@ -718,7 +718,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
if (!add_only)
{
// Log some extra info in case of boot
#if defined(_WIN32) || defined(HAVE_VULKAN)
#if defined(HAVE_VULKAN)
if (g_cfg.video.renderer == video_renderer::vulkan)
{
sys_log.notice("Vulkan SDK Revision: %d", VK_HEADER_VERSION);