From ac58ba87c551c8149df59cac77564f926b827e87 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Wed, 30 Nov 2022 04:22:22 +0100 Subject: [PATCH] early-access version 3168 --- CMakeLists.txt | 2 +- README.md | 2 +- externals/CMakeLists.txt | 1 - src/audio_core/CMakeLists.txt | 6 +++++- src/input_common/CMakeLists.txt | 6 +++++- src/yuzu/CMakeLists.txt | 6 +++++- 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8af47571f..9ce90ddd3 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2018 yuzu Emulator Project # SPDX-License-Identifier: GPL-2.0-or-later -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.22) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules") diff --git a/README.md b/README.md index 1101a2b3a..f1cbf9277 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 3167. +This is the source code for early-access 3168. ## Legal Notice diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 11110a755..7d0a007a9 100755 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -72,7 +72,6 @@ if (YUZU_USE_EXTERNAL_SDL2) endif() add_subdirectory(SDL EXCLUDE_FROM_ALL) - add_library(SDL2 ALIAS SDL2-static) endif() # ENet diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt index e4ab6795f..61d0333a0 100755 --- a/src/audio_core/CMakeLists.txt +++ b/src/audio_core/CMakeLists.txt @@ -226,6 +226,10 @@ if(ENABLE_CUBEB) target_compile_definitions(audio_core PRIVATE -DHAVE_CUBEB=1) endif() if(ENABLE_SDL2) - target_link_libraries(audio_core PRIVATE SDL2) + if (YUZU_USE_EXTERNAL_SDL2) + target_link_libraries(audio_core PRIVATE SDL2-static) + else() + target_link_libraries(audio_core PRIVATE SDL2) + endif() target_compile_definitions(audio_core PRIVATE HAVE_SDL2) endif() diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt index 5b57a89c9..9e3616da0 100755 --- a/src/input_common/CMakeLists.txt +++ b/src/input_common/CMakeLists.txt @@ -55,7 +55,11 @@ if (ENABLE_SDL2) drivers/sdl_driver.cpp drivers/sdl_driver.h ) - target_link_libraries(input_common PRIVATE SDL2) + if (YUZU_USE_EXTERNAL_SDL2) + target_link_libraries(input_common PRIVATE SDL2-static) + else() + target_link_libraries(input_common PRIVATE SDL2) + endif() target_compile_definitions(input_common PRIVATE HAVE_SDL2) endif() diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index a29493437..7a3778863 100755 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -390,7 +390,11 @@ if (YUZU_USE_BUNDLED_QT AND QT_VERSION VERSION_LESS 6) endif() if (ENABLE_SDL2) - target_link_libraries(yuzu PRIVATE SDL2) + if (YUZU_USE_EXTERNAL_SDL2) + target_link_libraries(yuzu PRIVATE SDL2-static) + else() + target_link_libraries(yuzu PRIVATE SDL2) + endif() target_compile_definitions(yuzu PRIVATE HAVE_SDL2) endif()