From 0f103c6c56ccae86e6d472b5e2646c847f90f144 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Sat, 8 Oct 2022 07:48:52 +0200 Subject: [PATCH] early-access version 3007 --- CMakeLists.txt | 6 +++--- README.md | 2 +- externals/ffmpeg/CMakeLists.txt | 2 +- externals/libusb/CMakeLists.txt | 2 +- src/yuzu/configuration/configure_graphics.cpp | 7 ++++--- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 20dd1383f..957df54f5 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,7 +252,7 @@ if(ENABLE_QT) endif() # Check for headers - Include(FindPkgConfig REQUIRED) + find_package(PkgConfig REQUIRED) pkg_check_modules(QT_DEP_GLU QUIET glu>=9.0.0) if (NOT QT_DEP_GLU_FOUND) message(FATAL_ERROR "Qt bundled pacakge dependency `glu` not found. \ @@ -386,7 +386,7 @@ endif() # Ensure libusb is properly configured (based on dolphin libusb include) if(NOT APPLE AND NOT YUZU_USE_BUNDLED_LIBUSB) - include(FindPkgConfig) + find_package(PkgConfig) if (PKG_CONFIG_FOUND AND NOT CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD") pkg_check_modules(LIBUSB QUIET libusb-1.0>=1.0.24) else() @@ -410,7 +410,7 @@ set(FFmpeg_COMPONENTS swscale) if (UNIX AND NOT APPLE) - Include(FindPkgConfig REQUIRED) + find_package(PkgConfig REQUIRED) pkg_check_modules(LIBVA libva) endif() if (NOT YUZU_USE_BUNDLED_FFMPEG) diff --git a/README.md b/README.md index e0f66b03f..4e30bb7c6 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 3004. +This is the source code for early-access 3007. ## Legal Notice diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt index 20ad716ea..0baac8e17 100755 --- a/externals/ffmpeg/CMakeLists.txt +++ b/externals/ffmpeg/CMakeLists.txt @@ -43,7 +43,7 @@ if (NOT WIN32) CACHE PATH "Paths to FFmpeg libraries" FORCE) endforeach() - Include(FindPkgConfig REQUIRED) + find_package(PkgConfig REQUIRED) pkg_check_modules(LIBVA libva) pkg_check_modules(CUDA cuda) pkg_check_modules(FFNVCODEC ffnvcodec) diff --git a/externals/libusb/CMakeLists.txt b/externals/libusb/CMakeLists.txt index 055b89295..3cb1b3687 100755 --- a/externals/libusb/CMakeLists.txt +++ b/externals/libusb/CMakeLists.txt @@ -108,7 +108,7 @@ if (MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux") OR APPLE) target_include_directories(usb INTERFACE "${LIBUSB_INCLUDE_DIRS}") if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - Include(FindPkgConfig) + find_package(PkgConfig) pkg_check_modules(LIBUDEV REQUIRED libudev) if (LIBUDEV_FOUND) diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index 87e5d0f48..bd69d04a6 100755 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp @@ -57,9 +57,10 @@ ConfigureGraphics::ConfigureGraphics(const Core::System& system_, QWidget* paren UpdateBackgroundColorButton(new_bg_color); }); - ui->api->setEnabled(!UISettings::values.has_broken_vulkan); - ui->api_widget->setEnabled(!UISettings::values.has_broken_vulkan || - Settings::IsConfiguringGlobal()); + ui->api->setEnabled(!UISettings::values.has_broken_vulkan && ui->api->isEnabled()); + ui->api_widget->setEnabled( + (!UISettings::values.has_broken_vulkan || Settings::IsConfiguringGlobal()) && + ui->api_widget->isEnabled()); ui->bg_label->setVisible(Settings::IsConfiguringGlobal()); ui->bg_combobox->setVisible(!Settings::IsConfiguringGlobal()); }