62 lines
2.2 KiB
Diff
62 lines
2.2 KiB
Diff
|
From 369a6f8678864a768af9e6a9026a37db0f17d9d4 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
|
||
|
|
|
||
|
|
---
|
||
|
|
externals/CMakeLists.txt | 2 +-
|
||
|
|
src/video_core/CMakeLists.txt | 6 +++---
|
||
|
|
src/video_core/host_shaders/CMakeLists.txt | 6 +++---
|
||
|
|
3 files changed, 7 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
|
||
|
|
index 6d04ace1d..85a7bfa54 100644
|
||
|
|
--- a/externals/CMakeLists.txt
|
||
|
|
+++ b/externals/CMakeLists.txt
|
||
|
|
@@ -133,7 +133,7 @@ endif()
|
||
|
|
|
||
|
|
# FFMpeg
|
||
|
|
if (YUZU_USE_BUNDLED_FFMPEG)
|
||
|
|
- add_subdirectory(ffmpeg)
|
||
|
|
+ #add_subdirectory(ffmpeg)
|
||
|
|
set(FFmpeg_PATH "${FFmpeg_PATH}" PARENT_SCOPE)
|
||
|
|
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
|
||
|
|
--- a/src/video_core/CMakeLists.txt
|
||
|
|
+++ b/src/video_core/CMakeLists.txt
|
||
|
|
@@ -233,9 +233,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)
|
||
|
|
|
||
|
|
-if (YUZU_USE_BUNDLED_FFMPEG AND NOT WIN32)
|
||
|
|
- add_dependencies(video_core ffmpeg-build)
|
||
|
|
-endif()
|
||
|
|
+#if (YUZU_USE_BUNDLED_FFMPEG AND NOT WIN32)
|
||
|
|
+# add_dependencies(video_core ffmpeg-build)
|
||
|
|
+#endif()
|
||
|
|
|
||
|
|
target_include_directories(video_core PRIVATE ${FFmpeg_INCLUDE_DIR})
|
||
|
|
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
|
||
|
|
index 2149ab93e..96889f00b 100644
|
||
|
|
--- a/src/video_core/host_shaders/CMakeLists.txt
|
||
|
|
+++ b/src/video_core/host_shaders/CMakeLists.txt
|
||
|
|
@@ -44,9 +44,9 @@ set(SHADER_FILES
|
||
|
|
)
|
||
|
|
|
||
|
|
find_program(GLSLANGVALIDATOR "glslangValidator")
|
||
|
|
-if ("${GLSLANGVALIDATOR}" STREQUAL "GLSLANGVALIDATOR-NOTFOUND")
|
||
|
|
- message(FATAL_ERROR "Required program `glslangValidator` not found.")
|
||
|
|
-endif()
|
||
|
|
+#if ("${GLSLANGVALIDATOR}" STREQUAL "GLSLANGVALIDATOR-NOTFOUND")
|
||
|
|
+# message(FATAL_ERROR "Required program `glslangValidator` not found.")
|
||
|
|
+#endif()
|
||
|
|
|
||
|
|
set(GLSL_FLAGS "")
|
||
|
|
set(QUIET_FLAG "--quiet")
|
||
|
|
--
|
||
|
|
2.37.2
|
||
|
|
|