CCF_100/suyu-mirror
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu synced 2025-08-30 16:06:30 -05:00
Code Issues Releases Wiki Activity

Revert "Merge branch 'master' into 'dev'"

Browse Source 
This reverts merge request !17
This commit is contained in:
Crimson Hawk
2024-03-06 05:26:38 +00:00
parent fdadc50fff
commit cdbdf63ebe
2887 changed files with 18295 additions and 18366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
externals/CMakeLists.txt vendored
View File

@@ -63,11 +63,11 @@ if (ENABLE_LIBUSB AND NOT TARGET libusb::usb)
endif()
# SDL2
if (suyu_USE_EXTERNAL_SDL2)
if (YUZU_USE_EXTERNAL_SDL2)
if (NOT WIN32)
# suyu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers
# Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers
# Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095)
# suyu-cmd also needs: Video (depends on Loadso/Dlopen)
# Yuzu-cmd also needs: Video (depends on Loadso/Dlopen)
# CPUinfo also required for SDL Audio, at least until 2.28.0 (see https://github.com/libsdl-org/SDL/issues/7809)
set(SDL_UNUSED_SUBSYSTEMS
File Filesystem
@@ -142,7 +142,7 @@ if (NOT TARGET Opus::opus)
endif()
# FFMpeg
if (suyu_USE_BUNDLED_FFMPEG)
if (YUZU_USE_BUNDLED_FFMPEG)
add_subdirectory(ffmpeg)
set(FFmpeg_PATH "${FFmpeg_PATH}" PARENT_SCOPE)
set(FFmpeg_LDFLAGS "${FFmpeg_LDFLAGS}" PARENT_SCOPE)
@@ -151,12 +151,12 @@ if (suyu_USE_BUNDLED_FFMPEG)
endif()
# Vulkan-Headers
if (suyu_USE_EXTERNAL_VULKAN_HEADERS)
if (YUZU_USE_EXTERNAL_VULKAN_HEADERS)
add_subdirectory(Vulkan-Headers)
endif()
# Vulkan-Utility-Libraries
if (suyu_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES)
if (YUZU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES)
add_subdirectory(Vulkan-Utility-Libraries)
endif()
@@ -210,7 +210,7 @@ endif()
# Breakpad
# https://github.com/microsoft/vcpkg/blob/master/ports/breakpad/CMakeLists.txt
if (suyu_CRASH_DUMPS AND NOT TARGET libbreakpad_client)
if (YUZU_CRASH_DUMPS AND NOT TARGET libbreakpad_client)
set(BREAKPAD_WIN32_DEFINES
NOMINMAX
UNICODE