patches: rebuild patches

This commit is contained in:
liushuyu 2022-11-20 03:46:29 -07:00
parent bd391d0930
commit 4c52b4e5a0
No known key found for this signature in database
GPG Key ID: 23D1CE4534419437

View File

@ -1,4 +1,4 @@
From 369a6f8678864a768af9e6a9026a37db0f17d9d4 Mon Sep 17 00:00:00 2001
From c379fce1746b73485ec5053c56aed670f652f4e5 Mon Sep 17 00:00:00 2001
From: liushuyu <liushuyu011@gmail.com>
Date: Mon, 15 Aug 2022 23:32:31 -0600
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(-)
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 6d04ace1d..85a7bfa54 100644
index 7f0a6d069..e9c583e22 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -133,7 +133,7 @@ endif()
@@ -131,7 +131,7 @@ endif()
# FFMpeg
if (YUZU_USE_BUNDLED_FFMPEG)
@ -23,12 +23,12 @@ index 6d04ace1d..85a7bfa54 100644
set(FFmpeg_LDFLAGS "${FFmpeg_LDFLAGS}" PARENT_SCOPE)
set(FFmpeg_LIBRARIES "${FFmpeg_LIBRARIES}" PARENT_SCOPE)
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index 5b3808351..a58b30298 100644
index d7f7d336c..8bd187523 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -233,9 +233,9 @@ create_target_directory_groups(video_core)
@@ -245,9 +245,9 @@ create_target_directory_groups(video_core)
target_link_libraries(video_core PUBLIC common core)
target_link_libraries(video_core PUBLIC glad shader_recompiler xbyak)
target_link_libraries(video_core PUBLIC glad shader_recompiler)
-if (YUZU_USE_BUNDLED_FFMPEG AND NOT WIN32)
- add_dependencies(video_core ffmpeg-build)
@ -57,5 +57,5 @@ index 2149ab93e..96889f00b 100644
set(GLSL_FLAGS "")
set(QUIET_FLAG "--quiet")
--
2.37.2
2.38.1