Browse Source
[cmake, dist] fix eden app name and VUL
Signed-off-by: crueter <crueter@eden-emu.dev>
pull/201/head
crueter
7 months ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
3 changed files with
8 additions and
1 deletions
-
dist/org.eden_emu.eden.desktop
-
externals/CMakeLists.txt
-
src/video_core/CMakeLists.txt
|
|
@ -7,7 +7,7 @@ |
|
|
[Desktop Entry] |
|
|
[Desktop Entry] |
|
|
Version=1.0 |
|
|
Version=1.0 |
|
|
Type=Application |
|
|
Type=Application |
|
|
Name=eden |
|
|
|
|
|
|
|
|
Name=Eden |
|
|
GenericName=Switch Emulator |
|
|
GenericName=Switch Emulator |
|
|
Comment=Nintendo Switch video game console emulator |
|
|
Comment=Nintendo Switch video game console emulator |
|
|
Icon=org.eden_emu.eden |
|
|
Icon=org.eden_emu.eden |
|
|
|
|
|
@ -330,6 +330,9 @@ CPMAddPackage( |
|
|
CUSTOM_CACHE_KEY "df2e" |
|
|
CUSTOM_CACHE_KEY "df2e" |
|
|
) |
|
|
) |
|
|
|
|
|
|
|
|
|
|
|
set(VulkanUtilityLibraries_SOURCE_DIR "${VulkanUtilityLibraries_SOURCE_DIR}" PARENT_SCOPE) |
|
|
|
|
|
set(VulkanUtilityLibraries_ADDED "${VulkanUtilityLibraries_ADDED}" PARENT_SCOPE) |
|
|
|
|
|
|
|
|
# SPIRV-Tools |
|
|
# SPIRV-Tools |
|
|
if (YUZU_USE_EXTERNAL_VULKAN_SPIRV_TOOLS) |
|
|
if (YUZU_USE_EXTERNAL_VULKAN_SPIRV_TOOLS) |
|
|
CPMAddPackage( |
|
|
CPMAddPackage( |
|
|
|
|
|
@ -333,6 +333,10 @@ if (VulkanMemoryAllocator_ADDED) |
|
|
target_include_directories(video_core PUBLIC ${VulkanMemoryAllocator_SOURCE_DIR}/include) |
|
|
target_include_directories(video_core PUBLIC ${VulkanMemoryAllocator_SOURCE_DIR}/include) |
|
|
endif() |
|
|
endif() |
|
|
|
|
|
|
|
|
|
|
|
if (VulkanUtilityLibraries_ADDED) |
|
|
|
|
|
target_include_directories(video_core PUBLIC ${VulkanUtilityLibraries_SOURCE_DIR}/include) |
|
|
|
|
|
endif() |
|
|
|
|
|
|
|
|
target_link_libraries(video_core PRIVATE sirit Vulkan::Headers) |
|
|
target_link_libraries(video_core PRIVATE sirit Vulkan::Headers) |
|
|
|
|
|
|
|
|
if (ENABLE_NSIGHT_AFTERMATH) |
|
|
if (ENABLE_NSIGHT_AFTERMATH) |
|
|
|
