diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 3845524b3..ae8212bbb 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -5,6 +5,12 @@ add_subdirectory(cpuinfo) set(SDL_SHARED OFF CACHE BOOL "" FORCE) add_subdirectory(SDL2) +add_library(Vulkan-Headers INTERFACE) +add_library(Vulkan::Headers ALIAS Vulkan-Headers) +target_include_directories(Vulkan-Headers INTERFACE + "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers/include" +) + set(SPIRV_SKIP_TESTS ON CACHE BOOL "" FORCE) set(SPIRV_SKIP_EXECUTABLES ON CACHE BOOL "" FORCE) set(SKIP_SPIRV_TOOLS_INSTALL ON CACHE BOOL "" FORCE) diff --git a/README.md b/README.md index a9f805eaf..f1b3564bf 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,6 @@ the Vulkan/SPIR-V validation rules. - Visual Studio 2022 or Build Tools 2022 with the **Desktop development with C++** workload and **C++ Clang tools for Windows** component - Qt 6 for MSVC 2022 64-bit, including Concurrent, Network, and Widgets -- Vulkan SDK 1.3 or newer The Microsoft C++ compiler (`cl.exe`) is not supported; use `clang-cl`. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d8ac8fe4a..95485eaa1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -180,12 +180,11 @@ if (KYTY_CLANG_CL) set_source_files_properties(${kyty_emulator_src} PROPERTIES COMPILE_FLAGS "-Wno-pragma-pack -Wno-deprecated-declarations -D_TIMESPEC_DEFINED") endif() -set(kyty_emulator_link_libraries common spirv-tools-opt spirv-tools SDL2-static xxhash FFmpeg::ffmpeg fmt::fmt nlohmann_json::nlohmann_json LibAtrac9) +set(kyty_emulator_link_libraries common Vulkan::Headers spirv-tools-opt spirv-tools SDL2-static xxhash FFmpeg::ffmpeg fmt::fmt nlohmann_json::nlohmann_json LibAtrac9) set(inc_headers ${CMAKE_CURRENT_SOURCE_DIR} ${KYTY_THIRD_PARTY_DIR}/SDL2/include - ${KYTY_THIRD_PARTY_DIR}/Vulkan-Headers/include ${KYTY_THIRD_PARTY_DIR}/VulkanMemoryAllocator/include ${KYTY_THIRD_PARTY_DIR}/SPIRV-Tools/include ${KYTY_THIRD_PARTY_DIR}/fmt/include