Browse Source
or not
Signed-off-by: crueter <crueter@eden-emu.dev>
pull/485/head
crueter
6 months ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
4 changed files with
23 additions and
22 deletions
-
CMakeLists.txt
-
cpmfile.json
-
externals/CMakeLists.txt
-
externals/cpmfile.json
|
|
|
@ -460,21 +460,6 @@ if (YUZU_USE_CPM) |
|
|
|
find_package(VulkanHeaders 1.3.274 REQUIRED) |
|
|
|
endif() |
|
|
|
|
|
|
|
# VMA |
|
|
|
AddJsonPackage(vulkan-memory-allocator) |
|
|
|
|
|
|
|
if (VulkanMemoryAllocator_ADDED) |
|
|
|
if (CXX_CLANG) |
|
|
|
target_compile_options(VulkanMemoryAllocator INTERFACE |
|
|
|
-Wno-unused-variable |
|
|
|
) |
|
|
|
elseif(MSVC) |
|
|
|
target_compile_options(VulkanMemoryAllocator INTERFACE |
|
|
|
/wd4189 |
|
|
|
) |
|
|
|
endif() |
|
|
|
endif() |
|
|
|
|
|
|
|
# SPIRV Tools |
|
|
|
AddJsonPackage(spirv-tools) |
|
|
|
|
|
|
|
@ -634,6 +619,7 @@ add_subdirectory(externals) |
|
|
|
|
|
|
|
# pass targets from externals |
|
|
|
find_package(libusb) |
|
|
|
find_package(VulkanMemoryAllocator) |
|
|
|
|
|
|
|
if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) |
|
|
|
find_package(xbyak) |
|
|
|
|
|
|
|
@ -99,13 +99,6 @@ |
|
|
|
"git_host": "git.crueter.xyz", |
|
|
|
"hash": "5924629755cb1605c4aa4eee20ef7957a9dd8d61e4df548be656d98054f2730c4109693c1bd35811f401f4705d2ccff9fc849be32b0d8480bc3f73541a5e0964" |
|
|
|
}, |
|
|
|
"vulkan-memory-allocator": { |
|
|
|
"package": "VulkanMemoryAllocator", |
|
|
|
"repo": "GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator", |
|
|
|
"sha": "1076b348ab", |
|
|
|
"hash": "a46b44e4286d08cffda058e856c47f44c7fed3da55fe9555976eb3907fdcc20ead0b1860b0c38319cda01dbf9b1aa5d4b4038c7f1f8fbd97283d837fa9af9772", |
|
|
|
"find_args": "CONFIG" |
|
|
|
}, |
|
|
|
"spirv-tools": { |
|
|
|
"package": "SPIRV-Tools", |
|
|
|
"repo": "KhronosGroup/SPIRV-Tools", |
|
|
|
|
|
|
|
@ -59,6 +59,21 @@ if (ENABLE_LIBUSB) |
|
|
|
add_subdirectory(libusb) |
|
|
|
endif() |
|
|
|
|
|
|
|
# VMA |
|
|
|
AddJsonPackage(vulkan-memory-allocator) |
|
|
|
|
|
|
|
if (VulkanMemoryAllocator_ADDED) |
|
|
|
if (CXX_CLANG) |
|
|
|
target_compile_options(VulkanMemoryAllocator INTERFACE |
|
|
|
-Wno-unused-variable |
|
|
|
) |
|
|
|
elseif(MSVC) |
|
|
|
target_compile_options(VulkanMemoryAllocator INTERFACE |
|
|
|
/wd4189 |
|
|
|
) |
|
|
|
endif() |
|
|
|
endif() |
|
|
|
|
|
|
|
# Sirit |
|
|
|
AddJsonPackage(sirit) |
|
|
|
|
|
|
|
|
|
|
|
@ -1,4 +1,11 @@ |
|
|
|
{ |
|
|
|
"vulkan-memory-allocator": { |
|
|
|
"package": "VulkanMemoryAllocator", |
|
|
|
"repo": "GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator", |
|
|
|
"sha": "1076b348ab", |
|
|
|
"hash": "a46b44e4286d08cffda058e856c47f44c7fed3da55fe9555976eb3907fdcc20ead0b1860b0c38319cda01dbf9b1aa5d4b4038c7f1f8fbd97283d837fa9af9772", |
|
|
|
"find_args": "CONFIG" |
|
|
|
}, |
|
|
|
"sirit": { |
|
|
|
"repo": "eden-emulator/sirit", |
|
|
|
"sha": "db1f1e8ab5", |
|
|
|
|
