mirror of https://github.com/PCSX2/pcsx2.git
deps: Update to Qt 6.6.0 and SDL2 2.28.4
Also bumps the minimum macOS version to 11.0. Minimum for building is 6.5.3, because there's no 6.6 flatpak runtime yet.
This commit is contained in:
parent
ac0138a7e1
commit
e5cb313d92
|
@ -4,22 +4,22 @@ set -e
|
||||||
|
|
||||||
INSTALLDIR="$HOME/deps"
|
INSTALLDIR="$HOME/deps"
|
||||||
NPROCS="$(getconf _NPROCESSORS_ONLN)"
|
NPROCS="$(getconf _NPROCESSORS_ONLN)"
|
||||||
SDL=SDL2-2.28.2
|
SDL=SDL2-2.28.4
|
||||||
QT=6.5.2
|
QT=6.6.0
|
||||||
LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075
|
LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075
|
||||||
|
|
||||||
mkdir -p deps-build
|
mkdir -p deps-build
|
||||||
cd deps-build
|
cd deps-build
|
||||||
|
|
||||||
cat > SHASUMS <<EOF
|
cat > SHASUMS <<EOF
|
||||||
64b1102fa22093515b02ef33dd8739dee1ba57e9dbba6a092942b8bbed1a1c5e $SDL.tar.gz
|
888b8c39f36ae2035d023d1b14ab0191eb1d26403c3cf4d4d5ede30e66a4942c $SDL.tar.gz
|
||||||
fd6f417fe9e3a071cf1424a5152d926a34c4a3c5070745470be6cf12a404ed79 $LIBBACKTRACE.zip
|
fd6f417fe9e3a071cf1424a5152d926a34c4a3c5070745470be6cf12a404ed79 $LIBBACKTRACE.zip
|
||||||
3db4c729b4d80a9d8fda8dd77128406353baff4755ca619177eda4cddae71269 qtbase-everywhere-src-$QT.tar.xz
|
039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e qtbase-everywhere-src-$QT.tar.xz
|
||||||
aae0c08924c6a5e47f9d57e031673d611ffff7aab2bee2e1cc460471ecac6743 qtimageformats-everywhere-src-$QT.tar.xz
|
e1542cb50176e237809895c6549598c08587c63703d100be54ac2d806834e384 qtimageformats-everywhere-src-$QT.tar.xz
|
||||||
48b4cc1093af2e0ab3bea30f60651bddd877a2335d16e7207879a2e9e81963a3 qtsvg-everywhere-src-$QT.tar.xz
|
33da25fef51102f564624a7ea3e57cb4a0a31b7b44783d1af5749ac36d3c72de qtsvg-everywhere-src-$QT.tar.xz
|
||||||
551ffb22751d8fd4d88e9ebd55b9131f4ca55341ee497fdbbba4da8d10d94341 qttools-everywhere-src-$QT.tar.xz
|
4e9feebc142bbb6e453e1dc3277e09ec45c8ef081b5ee2a029e6684b5905ba99 qttools-everywhere-src-$QT.tar.xz
|
||||||
337c45637e757e754c2f0ea65c20de3e6e53a841dda1253db15baa622515beeb qttranslations-everywhere-src-$QT.tar.xz
|
a0d89a236f64b810eb0fe4ae1e90db22b0e86263521b35f89e69f1392815078c qttranslations-everywhere-src-$QT.tar.xz
|
||||||
3020be86fb7fd0abb8509906ca6583cadcaee168159abceaeb5b3e9d42563c9a qtwayland-everywhere-src-$QT.tar.xz
|
30c3d82d85d050c83370710a26d12c802199c51eba5c2726e9d6243edd03b7e8 qtwayland-everywhere-src-$QT.tar.xz
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
curl -L \
|
curl -L \
|
||||||
|
|
|
@ -28,8 +28,8 @@
|
||||||
"sources": [
|
"sources": [
|
||||||
{
|
{
|
||||||
"type": "archive",
|
"type": "archive",
|
||||||
"url": "https://libsdl.org/release/SDL2-2.28.2.tar.gz",
|
"url": "https://libsdl.org/release/SDL2-2.28.4.tar.gz",
|
||||||
"sha256": "64b1102fa22093515b02ef33dd8739dee1ba57e9dbba6a092942b8bbed1a1c5e"
|
"sha256": "888b8c39f36ae2035d023d1b14ab0191eb1d26403c3cf4d4d5ede30e66a4942c"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"cleanup": [
|
"cleanup": [
|
||||||
|
|
|
@ -2,15 +2,15 @@
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
export MACOSX_DEPLOYMENT_TARGET=10.14
|
export MACOSX_DEPLOYMENT_TARGET=11.0
|
||||||
|
|
||||||
INSTALLDIR="$HOME/deps"
|
INSTALLDIR="$HOME/deps"
|
||||||
NPROCS="$(getconf _NPROCESSORS_ONLN)"
|
NPROCS="$(getconf _NPROCESSORS_ONLN)"
|
||||||
SDL=SDL2-2.28.2
|
SDL=SDL2-2.28.4
|
||||||
PNG=1.6.37
|
PNG=1.6.37
|
||||||
JPG=9e
|
JPG=9e
|
||||||
FFMPEG=6.0
|
FFMPEG=6.0
|
||||||
QT=6.4.3 # Currently stuck on Qt 6.4 due to 6.5 requiring macOS 11.0.
|
QT=6.6.0
|
||||||
|
|
||||||
mkdir deps-build
|
mkdir deps-build
|
||||||
cd deps-build
|
cd deps-build
|
||||||
|
@ -21,15 +21,15 @@ export CFLAGS="-I$INSTALLDIR/include -Os $CFLAGS"
|
||||||
export CXXFLAGS="-I$INSTALLDIR/include -Os $CXXFLAGS"
|
export CXXFLAGS="-I$INSTALLDIR/include -Os $CXXFLAGS"
|
||||||
|
|
||||||
cat > SHASUMS <<EOF
|
cat > SHASUMS <<EOF
|
||||||
64b1102fa22093515b02ef33dd8739dee1ba57e9dbba6a092942b8bbed1a1c5e $SDL.tar.gz
|
888b8c39f36ae2035d023d1b14ab0191eb1d26403c3cf4d4d5ede30e66a4942c $SDL.tar.gz
|
||||||
505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca libpng-$PNG.tar.xz
|
505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca libpng-$PNG.tar.xz
|
||||||
4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d jpegsrc.v$JPG.tar.gz
|
4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d jpegsrc.v$JPG.tar.gz
|
||||||
57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082 ffmpeg-$FFMPEG.tar.xz
|
57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082 ffmpeg-$FFMPEG.tar.xz
|
||||||
5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60 qtbase-everywhere-src-$QT.tar.xz
|
039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e qtbase-everywhere-src-$QT.tar.xz
|
||||||
0aff58062e74b84617c5da8325d8cdad5368d8f4d2a11ceafcd58329fe99b798 qtimageformats-everywhere-src-$QT.tar.xz
|
e1542cb50176e237809895c6549598c08587c63703d100be54ac2d806834e384 qtimageformats-everywhere-src-$QT.tar.xz
|
||||||
88315f886cf81898705e487cedba6e6160724359d23c518c92c333c098879a4a qtsvg-everywhere-src-$QT.tar.xz
|
33da25fef51102f564624a7ea3e57cb4a0a31b7b44783d1af5749ac36d3c72de qtsvg-everywhere-src-$QT.tar.xz
|
||||||
867df829cd5cd3ae8efe62e825503123542764b13c96953511e567df70c5a091 qttools-everywhere-src-$QT.tar.xz
|
4e9feebc142bbb6e453e1dc3277e09ec45c8ef081b5ee2a029e6684b5905ba99 qttools-everywhere-src-$QT.tar.xz
|
||||||
79e56b7800d49649a8a8010818538c367a829e0b7a09d5f60bd3aecf5abe972c qttranslations-everywhere-src-$QT.tar.xz
|
a0d89a236f64b810eb0fe4ae1e90db22b0e86263521b35f89e69f1392815078c qttranslations-everywhere-src-$QT.tar.xz
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
curl -L \
|
curl -L \
|
||||||
|
@ -103,90 +103,6 @@ cd ..
|
||||||
echo "Installing Qt Base..."
|
echo "Installing Qt Base..."
|
||||||
tar xf "qtbase-everywhere-src-$QT.tar.xz"
|
tar xf "qtbase-everywhere-src-$QT.tar.xz"
|
||||||
cd "qtbase-everywhere-src-$QT"
|
cd "qtbase-everywhere-src-$QT"
|
||||||
# Qt's panel:shouldEnableURL: implementation does a whole bunch of things that activate macOS's sandbox permissions dialog
|
|
||||||
# Since this is called on every file being displayed in the open/save panel, that spams users with permissions dialogs
|
|
||||||
# Simple solution: Hopefully no one needs any filters that aren't simple file extension filters, remove all other handling
|
|
||||||
patch -u src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm <<EOF
|
|
||||||
--- src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
|
|
||||||
+++ src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
|
|
||||||
@@ -133,7 +133,5 @@
|
|
||||||
NSURL *url = [NSURL fileURLWithPath:filepath isDirectory:info.isDir()];
|
|
||||||
- bool selectable = (m_options->acceptMode() == QFileDialogOptions::AcceptSave)
|
|
||||||
- || [self panel:m_panel shouldEnableURL:url];
|
|
||||||
|
|
||||||
m_panel.directoryURL = [NSURL fileURLWithPath:m_currentDirectory];
|
|
||||||
- m_panel.nameFieldStringValue = selectable ? info.fileName().toNSString() : @"";
|
|
||||||
+ m_panel.nameFieldStringValue = info.fileName().toNSString();
|
|
||||||
|
|
||||||
@@ -203,61 +201,2 @@
|
|
||||||
return hidden;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-- (BOOL)panel:(id)sender shouldEnableURL:(NSURL *)url
|
|
||||||
-{
|
|
||||||
- Q_UNUSED(sender);
|
|
||||||
-
|
|
||||||
- NSString *filename = url.path;
|
|
||||||
- if (!filename.length)
|
|
||||||
- return NO;
|
|
||||||
-
|
|
||||||
- // Always accept directories regardless of their names (unless it is a bundle):
|
|
||||||
- NSFileManager *fm = NSFileManager.defaultManager;
|
|
||||||
- NSDictionary *fileAttrs = [fm attributesOfItemAtPath:filename error:nil];
|
|
||||||
- if (!fileAttrs)
|
|
||||||
- return NO; // Error accessing the file means 'no'.
|
|
||||||
- NSString *fileType = fileAttrs.fileType;
|
|
||||||
- bool isDir = [fileType isEqualToString:NSFileTypeDirectory];
|
|
||||||
- if (isDir) {
|
|
||||||
- if (!m_panel.treatsFilePackagesAsDirectories) {
|
|
||||||
- if ([NSWorkspace.sharedWorkspace isFilePackageAtPath:filename] == NO)
|
|
||||||
- return YES;
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- // Treat symbolic links and aliases to directories like directories
|
|
||||||
- QFileInfo fileInfo(QString::fromNSString(filename));
|
|
||||||
- if (fileInfo.isSymLink() && QFileInfo(fileInfo.symLinkTarget()).isDir())
|
|
||||||
- return YES;
|
|
||||||
-
|
|
||||||
- QString qtFileName = fileInfo.fileName();
|
|
||||||
- // No filter means accept everything
|
|
||||||
- bool nameMatches = m_selectedNameFilter->isEmpty();
|
|
||||||
- // Check if the current file name filter accepts the file:
|
|
||||||
- for (int i = 0; !nameMatches && i < m_selectedNameFilter->size(); ++i) {
|
|
||||||
- if (QDir::match(m_selectedNameFilter->at(i), qtFileName))
|
|
||||||
- nameMatches = true;
|
|
||||||
- }
|
|
||||||
- if (!nameMatches)
|
|
||||||
- return NO;
|
|
||||||
-
|
|
||||||
- QDir::Filters filter = m_options->filter();
|
|
||||||
- if ((!(filter & (QDir::Dirs | QDir::AllDirs)) && isDir)
|
|
||||||
- || (!(filter & QDir::Files) && [fileType isEqualToString:NSFileTypeRegular])
|
|
||||||
- || ((filter & QDir::NoSymLinks) && [fileType isEqualToString:NSFileTypeSymbolicLink]))
|
|
||||||
- return NO;
|
|
||||||
-
|
|
||||||
- bool filterPermissions = ((filter & QDir::PermissionMask)
|
|
||||||
- && (filter & QDir::PermissionMask) != QDir::PermissionMask);
|
|
||||||
- if (filterPermissions) {
|
|
||||||
- if ((!(filter & QDir::Readable) && [fm isReadableFileAtPath:filename])
|
|
||||||
- || (!(filter & QDir::Writable) && [fm isWritableFileAtPath:filename])
|
|
||||||
- || (!(filter & QDir::Executable) && [fm isExecutableFileAtPath:filename]))
|
|
||||||
- return NO;
|
|
||||||
- }
|
|
||||||
- if (!(filter & QDir::Hidden)
|
|
||||||
- && (qtFileName.startsWith(u'.') || [self isHiddenFileAtURL:url]))
|
|
||||||
- return NO;
|
|
||||||
-
|
|
||||||
- return YES;
|
|
||||||
}
|
|
||||||
@@ -406,5 +345,2 @@
|
|
||||||
{
|
|
||||||
- if (m_options->acceptMode() != QFileDialogOptions::AcceptSave)
|
|
||||||
- return nil; // panel:shouldEnableURL: does the file filtering for NSOpenPanel
|
|
||||||
-
|
|
||||||
QStringList fileTypes;
|
|
||||||
EOF
|
|
||||||
cmake -B build -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release -DFEATURE_optimize_size=ON -DFEATURE_dbus=OFF -DFEATURE_framework=OFF -DFEATURE_icu=OFF -DFEATURE_opengl=OFF -DFEATURE_printsupport=OFF -DFEATURE_sql=OFF -DFEATURE_gssapi=OFF
|
cmake -B build -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release -DFEATURE_optimize_size=ON -DFEATURE_dbus=OFF -DFEATURE_framework=OFF -DFEATURE_icu=OFF -DFEATURE_opengl=OFF -DFEATURE_printsupport=OFF -DFEATURE_sql=OFF -DFEATURE_gssapi=OFF
|
||||||
make -C build "-j$NPROCS"
|
make -C build "-j$NPROCS"
|
||||||
make -C build install
|
make -C build install
|
||||||
|
|
|
@ -37,18 +37,16 @@ echo INSTALLDIR=%INSTALLDIR%
|
||||||
|
|
||||||
cd "%BUILDDIR%"
|
cd "%BUILDDIR%"
|
||||||
|
|
||||||
set QT=6.5.2
|
set QT=6.6.0
|
||||||
set QTMINOR=6.5
|
set QTMINOR=6.6
|
||||||
set SDL=SDL2-2.28.2
|
set SDL=SDL2-2.28.4
|
||||||
|
|
||||||
call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 22383a6b242bac072f949d2b3854cf04c6856cae7a87eaa78c60dd733b71e41e || goto error
|
call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" b53b9b42e731a33552d0a533316a88009b423c16a8a3a418df9ffe498c37da3d || goto error
|
||||||
call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" f770a087e350d688441880d08ad2791465e5e3b9a0f8fc2cfbeb5dd305a11d50 || goto error
|
call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 0b9dafd9a42deeb55fd4b74a6caaa6871a03d0051ddb54ea4ea448f28cb90ecc || goto error
|
||||||
call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 9757899b00eea4e6b65f81f922c0215c70969661567398d91da6639a50a788e7 || goto error
|
call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" ae31eadd81da19e1bba0d72e16d29fdce0b98e991c4dcbf6351acf09967fd175 || goto error
|
||||||
call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" 0546a6aa19f5e0188d1ba4a0e0a1423d22b7dc55ce8a614cc4aa65bfac506f74 || goto error
|
call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" 88b4b1a8224465cb04feed2a37823e95e959164cf824e9969648335614a4c855 || goto error
|
||||||
call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" 3148f4f263bf9930d89107eb44bc452481a5f8c6178459e26ecbf3c8dca3b5c7 || goto error
|
call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" 051787f12e2457425f35f31e642163f0d481cdd687b4b164ca41ddb84d5ea3a6 || goto error
|
||||||
call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 8b99046b54c40106d4e310be63b41331b717cfd8b42da4b4fc1c9169604be7fc || goto error
|
call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 5d04b33336d3d49512eedfa85b378f0805dc4d8770365db318234b125deef9dc || goto error
|
||||||
|
|
||||||
call :downloadfile "4b119f48f5cb5e1499f91a0791150231c47430d4.diff" "https://github.com/qt/qtbase/commit/4b119f48f5cb5e1499f91a0791150231c47430d4.diff" d86bd2bd4ee2aff5f5e97da027aa926178dca250d163427eb21503bb357730a5 || goto error
|
|
||||||
|
|
||||||
if %DEBUG%==1 (
|
if %DEBUG%==1 (
|
||||||
echo Building debug and release libraries...
|
echo Building debug and release libraries...
|
||||||
|
@ -80,7 +78,6 @@ echo Building Qt base...
|
||||||
rmdir /S /Q "qtbase-everywhere-src-%QT%"
|
rmdir /S /Q "qtbase-everywhere-src-%QT%"
|
||||||
%SEVENZIP% x "qtbase-everywhere-src-%QT%.zip" || goto error
|
%SEVENZIP% x "qtbase-everywhere-src-%QT%.zip" || goto error
|
||||||
cd "qtbase-everywhere-src-%QT%" || goto error
|
cd "qtbase-everywhere-src-%QT%" || goto error
|
||||||
"C:\Program Files\Git\usr\bin\patch" -p1 < ../4b119f48f5cb5e1499f91a0791150231c47430d4.diff || goto error
|
|
||||||
cmake -B build -DFEATURE_sql=OFF -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DINPUT_gui=yes -DINPUT_widgets=yes -DINPUT_ssl=yes -DINPUT_openssl=no -DINPUT_schannel=yes %QTBUILDSPEC% || goto error
|
cmake -B build -DFEATURE_sql=OFF -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DINPUT_gui=yes -DINPUT_widgets=yes -DINPUT_ssl=yes -DINPUT_openssl=no -DINPUT_schannel=yes %QTBUILDSPEC% || goto error
|
||||||
cmake --build build --parallel || goto error
|
cmake --build build --parallel || goto error
|
||||||
ninja -C build install || goto error
|
ninja -C build install || goto error
|
||||||
|
|
|
@ -22,7 +22,7 @@ Installers and binaries for both stable and development builds are available fro
|
||||||
|
|
||||||
| Operating System | CPU | GPU | RAM |
|
| Operating System | CPU | GPU | RAM |
|
||||||
| ------------------------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---- |
|
| ------------------------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---- |
|
||||||
| - Windows 10 Version 1809 or later (64-bit) <br/> - Ubuntu 22.04/Debian or newer, Arch Linux, or other distro (64-bit) <br/> - macOS 10.14 | - Supports SSE4.1 <br/> - [PassMark Thread Performance](https://www.cpubenchmark.net/CPU_mega_page.html) rating near or greater than 1500<br/> - Two physical cores, with hyperthreading | - Direct3D 11 (Feature Level 11.0) support <br/> - OpenGL 3.3 support <br/> - Vulkan 1.1 support <br/> - Metal support <br/> - [PassMark G3D Mark](https://www.videocardbenchmark.net/high_end_gpus.html) rating around 3000 (Geforce GTX 750, Radeon RX 560, Intel Arc A380) <br/> - 2 GB Video Memory | 4 GB |
|
| - Windows 10 Version 1809 or later (64-bit) <br/> - Ubuntu 22.04/Debian or newer, Arch Linux, or other distro (64-bit) <br/> - macOS 11.0 | - Supports SSE4.1 <br/> - [PassMark Thread Performance](https://www.cpubenchmark.net/CPU_mega_page.html) rating near or greater than 1500<br/> - Two physical cores, with hyperthreading | - Direct3D 11 (Feature Level 11.0) support <br/> - OpenGL 3.3 support <br/> - Vulkan 1.1 support <br/> - Metal support <br/> - [PassMark G3D Mark](https://www.videocardbenchmark.net/high_end_gpus.html) rating around 3000 (Geforce GTX 750, Radeon RX 560, Intel Arc A380) <br/> - 2 GB Video Memory | 4 GB |
|
||||||
|
|
||||||
### Recommended
|
### Recommended
|
||||||
|
|
||||||
|
|
|
@ -263,7 +263,7 @@ if(NOT CMAKE_GENERATOR MATCHES "Xcode")
|
||||||
# Assume Xcode builds aren't being used for distribution
|
# Assume Xcode builds aren't being used for distribution
|
||||||
# Helpful because Xcode builds don't build multiple metallibs for different macOS versions
|
# Helpful because Xcode builds don't build multiple metallibs for different macOS versions
|
||||||
# Also helpful because Xcode's interactive shader debugger requires apps be built for the latest macOS
|
# Also helpful because Xcode's interactive shader debugger requires apps be built for the latest macOS
|
||||||
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.14)
|
set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# CMake defaults the suffix for modules to .so on macOS but wx tells us that the
|
# CMake defaults the suffix for modules to .so on macOS but wx tells us that the
|
||||||
|
|
|
@ -95,7 +95,7 @@ endif(WIN32)
|
||||||
find_package(Threads REQUIRED)
|
find_package(Threads REQUIRED)
|
||||||
|
|
||||||
# Also need SDL2.
|
# Also need SDL2.
|
||||||
find_package(SDL2 2.28.2 REQUIRED)
|
find_package(SDL2 2.28.4 REQUIRED)
|
||||||
|
|
||||||
set(ACTUALLY_ENABLE_TESTS ${ENABLE_TESTS})
|
set(ACTUALLY_ENABLE_TESTS ${ENABLE_TESTS})
|
||||||
if(ENABLE_TESTS)
|
if(ENABLE_TESTS)
|
||||||
|
@ -156,20 +156,12 @@ disable_compiler_warnings_for_target(cubeb)
|
||||||
disable_compiler_warnings_for_target(speex)
|
disable_compiler_warnings_for_target(speex)
|
||||||
|
|
||||||
# Find the Qt components that we need.
|
# Find the Qt components that we need.
|
||||||
find_package(Qt6 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets Network LinguistTools REQUIRED)
|
find_package(Qt6 6.5.3 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets Network LinguistTools REQUIRED)
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL)
|
add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET AND "${CMAKE_OSX_DEPLOYMENT_TARGET}" VERSION_LESS 10.15)
|
|
||||||
get_target_property(QT_FEATURES Qt6::Core QT_ENABLED_PUBLIC_FEATURES)
|
|
||||||
if (cxx17_filesystem IN_LIST QT_FEATURES)
|
|
||||||
message("Qt compiled with std::filesystem support, requires macOS 10.15")
|
|
||||||
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Demangler for the debugger
|
# Demangler for the debugger
|
||||||
add_subdirectory(3rdparty/demangler EXCLUDE_FROM_ALL)
|
add_subdirectory(3rdparty/demangler EXCLUDE_FROM_ALL)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue