Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-04-10 05:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix spirv-tools

Browse source
This commit is contained in:
lizzie 2026-02-22 23:03:43 +00:00
parent d5d7587f5b
commit 63ba079494
3 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.ci/ios/build.sh
View file

@ -22,6 +22,7 @@ cmake -G Xcode -B build \
-DENABLE_CUBEB=OFF \ -DENABLE_CUBEB=OFF \
-DYUZU_ROOM=OFF \ -DYUZU_ROOM=OFF \
-DYUZU_ROOM_STANDALONE=OFF \ -DYUZU_ROOM_STANDALONE=OFF \
-DYUZU_STATIC_ROOM=OFF \
-DYUZU_CMD=OFF \ -DYUZU_CMD=OFF \
-DUSE_DISCORD_PRESENCE=OFF \ -DUSE_DISCORD_PRESENCE=OFF \
-DYUZU_USE_EXTERNAL_FFMPEG=ON \ -DYUZU_USE_EXTERNAL_FFMPEG=ON \

22
.patch/spirv-tools/0003-ios-fix.patch
View file

@ -1,21 +1,33 @@
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 7ab2319..0d6b382 100644 index 7ab2319..333e325 100644
--- a/source/CMakeLists.txt --- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt +++ b/source/CMakeLists.txt
@@ -151,9 +151,6 @@ add_custom_command(OUTPUT ${SPIRV_TOOLS_BUILD_VERSION_INC} @@ -151,9 +151,11 @@ add_custom_command(OUTPUT ${SPIRV_TOOLS_BUILD_VERSION_INC}
COMMENT "Update build-version.inc in the SPIRV-Tools build directory (if necessary).") COMMENT "Update build-version.inc in the SPIRV-Tools build directory (if necessary).")
# Convenience target for standalone generation of the build-version.inc file. # Convenience target for standalone generation of the build-version.inc file.
# This is not required for any dependence chain. # This is not required for any dependence chain.
-add_custom_target(spirv-tools-build-version -add_custom_target(spirv-tools-build-version
- DEPENDS ${SPIRV_TOOLS_BUILD_VERSION_INC}) - DEPENDS ${SPIRV_TOOLS_BUILD_VERSION_INC})
-set_property(TARGET spirv-tools-build-version PROPERTY FOLDER "SPIRV-Tools build") -set_property(TARGET spirv-tools-build-version PROPERTY FOLDER "SPIRV-Tools build")
+if (NOT IOS)
+ add_custom_target(spirv-tools-build-version
+ DEPENDS ${SPIRV_TOOLS_BUILD_VERSION_INC})
+ set_property(TARGET spirv-tools-build-version PROPERTY FOLDER "SPIRV-Tools build")
+endif()
list(APPEND PCH_DEPENDS list(APPEND PCH_DEPENDS
${CORE_TABLES_HEADER_INC_FILE} ${CORE_TABLES_HEADER_INC_FILE}
@@ -339,7 +336,7 @@ function(spirv_tools_default_target_options target) @@ -338,8 +340,11 @@ function(spirv_tools_default_target_options target)
)
set_property(TARGET ${target} PROPERTY FOLDER "SPIRV-Tools libraries") set_property(TARGET ${target} PROPERTY FOLDER "SPIRV-Tools libraries")
spvtools_check_symbol_exports(${target}) spvtools_check_symbol_exports(${target})
add_dependencies(${target} - add_dependencies(${target}
- spirv-tools-build-version core_tables extinst_tables) - spirv-tools-build-version core_tables extinst_tables)
+ core_tables extinst_tables) + if (IOS)
+ add_dependencies(${target} core_tables extinst_tables)
+ else ()
+ add_dependencies(${target} spirv-tools-build-version core_tables extinst_tables)
+ endif()
endfunction() endfunction()
if (SPIRV_TOOLS_BUILD_SHARED)

2
CMakeLists.txt
View file

@ -212,7 +212,7 @@ option(YUZU_LEGACY "Apply patches that improve compatibility with older GPUs (e.
option(NIGHTLY_BUILD "Use Nightly qualifiers in the update checker and build metadata" OFF) option(NIGHTLY_BUILD "Use Nightly qualifiers in the update checker and build metadata" OFF)
cmake_dependent_option(YUZU_ROOM "Enable dedicated room functionality" ON "NOT ANDROID" OFF) cmake_dependent_option(YUZU_ROOM "Enable dedicated room functionality" ON "NOT ANDROID AND NOT IOS" OFF)
cmake_dependent_option(YUZU_ROOM_STANDALONE "Enable standalone room executable" ON "YUZU_ROOM" OFF) cmake_dependent_option(YUZU_ROOM_STANDALONE "Enable standalone room executable" ON "YUZU_ROOM" OFF)
cmake_dependent_option(YUZU_CMD "Compile the eden-cli executable" ON "NOT ANDROID" OFF) cmake_dependent_option(YUZU_CMD "Compile the eden-cli executable" ON "NOT ANDROID" OFF)