early-access version 3007
This commit is contained in:
parent
2edca0455c
commit
0f103c6c56
5 changed files with 10 additions and 9 deletions
|
@ -252,7 +252,7 @@ if(ENABLE_QT)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Check for headers
|
# Check for headers
|
||||||
Include(FindPkgConfig REQUIRED)
|
find_package(PkgConfig REQUIRED)
|
||||||
pkg_check_modules(QT_DEP_GLU QUIET glu>=9.0.0)
|
pkg_check_modules(QT_DEP_GLU QUIET glu>=9.0.0)
|
||||||
if (NOT QT_DEP_GLU_FOUND)
|
if (NOT QT_DEP_GLU_FOUND)
|
||||||
message(FATAL_ERROR "Qt bundled pacakge dependency `glu` not 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)
|
# Ensure libusb is properly configured (based on dolphin libusb include)
|
||||||
if(NOT APPLE AND NOT YUZU_USE_BUNDLED_LIBUSB)
|
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")
|
if (PKG_CONFIG_FOUND AND NOT CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD")
|
||||||
pkg_check_modules(LIBUSB QUIET libusb-1.0>=1.0.24)
|
pkg_check_modules(LIBUSB QUIET libusb-1.0>=1.0.24)
|
||||||
else()
|
else()
|
||||||
|
@ -410,7 +410,7 @@ set(FFmpeg_COMPONENTS
|
||||||
swscale)
|
swscale)
|
||||||
|
|
||||||
if (UNIX AND NOT APPLE)
|
if (UNIX AND NOT APPLE)
|
||||||
Include(FindPkgConfig REQUIRED)
|
find_package(PkgConfig REQUIRED)
|
||||||
pkg_check_modules(LIBVA libva)
|
pkg_check_modules(LIBVA libva)
|
||||||
endif()
|
endif()
|
||||||
if (NOT YUZU_USE_BUNDLED_FFMPEG)
|
if (NOT YUZU_USE_BUNDLED_FFMPEG)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
yuzu emulator early access
|
yuzu emulator early access
|
||||||
=============
|
=============
|
||||||
|
|
||||||
This is the source code for early-access 3004.
|
This is the source code for early-access 3007.
|
||||||
|
|
||||||
## Legal Notice
|
## Legal Notice
|
||||||
|
|
||||||
|
|
2
externals/ffmpeg/CMakeLists.txt
vendored
2
externals/ffmpeg/CMakeLists.txt
vendored
|
@ -43,7 +43,7 @@ if (NOT WIN32)
|
||||||
CACHE PATH "Paths to FFmpeg libraries" FORCE)
|
CACHE PATH "Paths to FFmpeg libraries" FORCE)
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
Include(FindPkgConfig REQUIRED)
|
find_package(PkgConfig REQUIRED)
|
||||||
pkg_check_modules(LIBVA libva)
|
pkg_check_modules(LIBVA libva)
|
||||||
pkg_check_modules(CUDA cuda)
|
pkg_check_modules(CUDA cuda)
|
||||||
pkg_check_modules(FFNVCODEC ffnvcodec)
|
pkg_check_modules(FFNVCODEC ffnvcodec)
|
||||||
|
|
2
externals/libusb/CMakeLists.txt
vendored
2
externals/libusb/CMakeLists.txt
vendored
|
@ -108,7 +108,7 @@ if (MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux") OR APPLE)
|
||||||
target_include_directories(usb INTERFACE "${LIBUSB_INCLUDE_DIRS}")
|
target_include_directories(usb INTERFACE "${LIBUSB_INCLUDE_DIRS}")
|
||||||
|
|
||||||
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||||
Include(FindPkgConfig)
|
find_package(PkgConfig)
|
||||||
pkg_check_modules(LIBUDEV REQUIRED libudev)
|
pkg_check_modules(LIBUDEV REQUIRED libudev)
|
||||||
|
|
||||||
if (LIBUDEV_FOUND)
|
if (LIBUDEV_FOUND)
|
||||||
|
|
|
@ -57,9 +57,10 @@ ConfigureGraphics::ConfigureGraphics(const Core::System& system_, QWidget* paren
|
||||||
UpdateBackgroundColorButton(new_bg_color);
|
UpdateBackgroundColorButton(new_bg_color);
|
||||||
});
|
});
|
||||||
|
|
||||||
ui->api->setEnabled(!UISettings::values.has_broken_vulkan);
|
ui->api->setEnabled(!UISettings::values.has_broken_vulkan && ui->api->isEnabled());
|
||||||
ui->api_widget->setEnabled(!UISettings::values.has_broken_vulkan ||
|
ui->api_widget->setEnabled(
|
||||||
Settings::IsConfiguringGlobal());
|
(!UISettings::values.has_broken_vulkan || Settings::IsConfiguringGlobal()) &&
|
||||||
|
ui->api_widget->isEnabled());
|
||||||
ui->bg_label->setVisible(Settings::IsConfiguringGlobal());
|
ui->bg_label->setVisible(Settings::IsConfiguringGlobal());
|
||||||
ui->bg_combobox->setVisible(!Settings::IsConfiguringGlobal());
|
ui->bg_combobox->setVisible(!Settings::IsConfiguringGlobal());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue