patches: update patches
This commit is contained in:
parent
630511f1f4
commit
ce9f1a91f7
|
@ -1,4 +1,4 @@
|
||||||
From 432376920da73e5bb1dc3462c9e92c88607f7d75 Mon Sep 17 00:00:00 2001
|
From 275b6282c3c9bd14cbaa7fe13c0be0c342a80c55 Mon Sep 17 00:00:00 2001
|
||||||
From: liushuyu <liushuyu011@gmail.com>
|
From: liushuyu <liushuyu011@gmail.com>
|
||||||
Date: Mon, 15 Aug 2022 23:32:31 -0600
|
Date: Mon, 15 Aug 2022 23:32:31 -0600
|
||||||
Subject: [PATCH] build: bypass extra dependency checks
|
Subject: [PATCH] build: bypass extra dependency checks
|
||||||
|
@ -10,10 +10,10 @@ Subject: [PATCH] build: bypass extra dependency checks
|
||||||
3 files changed, 7 insertions(+), 7 deletions(-)
|
3 files changed, 7 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
|
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
|
||||||
index 1f7cd598e..649b23ae9 100644
|
index 9eebc7d65..a66f4373b 100644
|
||||||
--- a/externals/CMakeLists.txt
|
--- a/externals/CMakeLists.txt
|
||||||
+++ b/externals/CMakeLists.txt
|
+++ b/externals/CMakeLists.txt
|
||||||
@@ -128,7 +128,7 @@ endif()
|
@@ -139,7 +139,7 @@ endif()
|
||||||
|
|
||||||
# FFMpeg
|
# FFMpeg
|
||||||
if (YUZU_USE_BUNDLED_FFMPEG)
|
if (YUZU_USE_BUNDLED_FFMPEG)
|
||||||
|
@ -23,10 +23,10 @@ index 1f7cd598e..649b23ae9 100644
|
||||||
set(FFmpeg_LDFLAGS "${FFmpeg_LDFLAGS}" PARENT_SCOPE)
|
set(FFmpeg_LDFLAGS "${FFmpeg_LDFLAGS}" PARENT_SCOPE)
|
||||||
set(FFmpeg_LIBRARIES "${FFmpeg_LIBRARIES}" PARENT_SCOPE)
|
set(FFmpeg_LIBRARIES "${FFmpeg_LIBRARIES}" PARENT_SCOPE)
|
||||||
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
|
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
|
||||||
index 9b13ccbab..c4a5c25f6 100644
|
index cf9266d54..bef40788c 100644
|
||||||
--- a/src/video_core/CMakeLists.txt
|
--- a/src/video_core/CMakeLists.txt
|
||||||
+++ b/src/video_core/CMakeLists.txt
|
+++ b/src/video_core/CMakeLists.txt
|
||||||
@@ -284,9 +284,9 @@ create_target_directory_groups(video_core)
|
@@ -290,9 +290,9 @@ create_target_directory_groups(video_core)
|
||||||
target_link_libraries(video_core PUBLIC common core)
|
target_link_libraries(video_core PUBLIC common core)
|
||||||
target_link_libraries(video_core PUBLIC glad shader_recompiler stb bc_decoder)
|
target_link_libraries(video_core PUBLIC glad shader_recompiler stb bc_decoder)
|
||||||
|
|
||||||
|
@ -40,10 +40,10 @@ index 9b13ccbab..c4a5c25f6 100644
|
||||||
target_include_directories(video_core PRIVATE ${FFmpeg_INCLUDE_DIR})
|
target_include_directories(video_core PRIVATE ${FFmpeg_INCLUDE_DIR})
|
||||||
target_link_libraries(video_core PRIVATE ${FFmpeg_LIBRARIES})
|
target_link_libraries(video_core PRIVATE ${FFmpeg_LIBRARIES})
|
||||||
diff --git a/src/video_core/host_shaders/CMakeLists.txt b/src/video_core/host_shaders/CMakeLists.txt
|
diff --git a/src/video_core/host_shaders/CMakeLists.txt b/src/video_core/host_shaders/CMakeLists.txt
|
||||||
index c4d459077..6354674db 100644
|
index 6b912027f..a65022962 100644
|
||||||
--- a/src/video_core/host_shaders/CMakeLists.txt
|
--- a/src/video_core/host_shaders/CMakeLists.txt
|
||||||
+++ b/src/video_core/host_shaders/CMakeLists.txt
|
+++ b/src/video_core/host_shaders/CMakeLists.txt
|
||||||
@@ -65,9 +65,9 @@ set(SHADER_FILES
|
@@ -68,9 +68,9 @@ set(SHADER_FILES
|
||||||
)
|
)
|
||||||
|
|
||||||
find_program(GLSLANGVALIDATOR "glslangValidator")
|
find_program(GLSLANGVALIDATOR "glslangValidator")
|
||||||
|
@ -55,7 +55,7 @@ index c4d459077..6354674db 100644
|
||||||
+#endif()
|
+#endif()
|
||||||
|
|
||||||
set(GLSL_FLAGS "")
|
set(GLSL_FLAGS "")
|
||||||
set(QUIET_FLAG "--quiet")
|
set(SPIR_V_VERSION "spirv1.3")
|
||||||
--
|
--
|
||||||
2.41.0
|
2.42.0
|
||||||
|
|
||||||
|
|
Reference in New Issue