mirror of
https://github.com/stenzek/duckstation.git
synced 2026-02-11 00:44:32 +00:00
Deps: Build Qt Declarative/ShaderTools
Needed for Linguist now.
This commit is contained in:
@@ -84,7 +84,9 @@ if [[ "$SKIP_DOWNLOAD" != true && ! -f "libbacktrace-$LIBBACKTRACE.tar.gz" ]]; t
|
||||
-o "zlib-ng-$ZLIBNG.tar.gz" "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/$ZLIBNG.tar.gz" \
|
||||
-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtdeclarative-everywhere-src-$QT.tar.xz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtshadertools-everywhere-src-$QT.tar.xz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
|
||||
@@ -108,7 +110,9 @@ $LIBZIP_GZ_HASH libzip-$LIBZIP.tar.gz
|
||||
$ZLIBNG_GZ_HASH zlib-ng-$ZLIBNG.tar.gz
|
||||
$ZSTD_GZ_HASH zstd-$ZSTD.tar.gz
|
||||
$QTBASE_XZ_HASH qtbase-everywhere-src-$QT.tar.xz
|
||||
$QTDECLARATIVE_XZ_HASH qtdeclarative-everywhere-src-$QT.tar.xz
|
||||
$QTIMAGEFORMATS_XZ_HASH qtimageformats-everywhere-src-$QT.tar.xz
|
||||
$QTSHADERTOOLS_XZ_HASH qtshadertools-everywhere-src-$QT.tar.xz
|
||||
$QTSVG_XZ_HASH qtsvg-everywhere-src-$QT.tar.xz
|
||||
$QTTOOLS_XZ_HASH qttools-everywhere-src-$QT.tar.xz
|
||||
$QTTRANSLATIONS_XZ_HASH qttranslations-everywhere-src-$QT.tar.xz
|
||||
@@ -321,6 +325,28 @@ cmake --build . --parallel
|
||||
ninja install
|
||||
cd ../../
|
||||
|
||||
echo "Building Qt Shader Tools..."
|
||||
rm -fr "qtshadertools-everywhere-src-$QT"
|
||||
tar xf "qtshadertools-everywhere-src-$QT.tar.xz"
|
||||
cd "qtshadertools-everywhere-src-$QT"
|
||||
mkdir build
|
||||
cd build
|
||||
"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DQT_GENERATE_SBOM=OFF
|
||||
cmake --build . --parallel
|
||||
ninja install
|
||||
cd ../../
|
||||
|
||||
echo "Building Qt Declarative..."
|
||||
rm -fr "qtdeclarative-everywhere-src-$QT"
|
||||
tar xf "qtdeclarative-everywhere-src-$QT.tar.xz"
|
||||
cd "qtdeclarative-everywhere-src-$QT"
|
||||
mkdir build
|
||||
cd build
|
||||
"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DQT_GENERATE_SBOM=OFF -DFEATURE_wayland_server=OFF
|
||||
cmake --build . --parallel
|
||||
ninja install
|
||||
cd ../../
|
||||
|
||||
echo "Installing Qt Tools..."
|
||||
rm -fr "qttools-everywhere-src-$QT"
|
||||
tar xf "qttools-everywhere-src-$QT.tar.xz"
|
||||
|
||||
@@ -53,7 +53,9 @@ if [[ "$SKIP_DOWNLOAD" != true && ! -f "libbacktrace-$LIBBACKTRACE.tar.gz" ]]; t
|
||||
-o "zlib-ng-$ZLIBNG.tar.gz" "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/$ZLIBNG.tar.gz" \
|
||||
-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtdeclarative-everywhere-src-$QT.tar.xz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtshadertools-everywhere-src-$QT.tar.xz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
|
||||
@@ -77,7 +79,9 @@ $LIBZIP_GZ_HASH libzip-$LIBZIP.tar.gz
|
||||
$ZLIBNG_GZ_HASH zlib-ng-$ZLIBNG.tar.gz
|
||||
$ZSTD_GZ_HASH zstd-$ZSTD.tar.gz
|
||||
$QTBASE_XZ_HASH qtbase-everywhere-src-$QT.tar.xz
|
||||
$QTDECLARATIVE_XZ_HASH qtdeclarative-everywhere-src-$QT.tar.xz
|
||||
$QTIMAGEFORMATS_XZ_HASH qtimageformats-everywhere-src-$QT.tar.xz
|
||||
$QTSHADERTOOLS_XZ_HASH qtshadertools-everywhere-src-$QT.tar.xz
|
||||
$QTSVG_XZ_HASH qtsvg-everywhere-src-$QT.tar.xz
|
||||
$QTTOOLS_XZ_HASH qttools-everywhere-src-$QT.tar.xz
|
||||
$QTTRANSLATIONS_XZ_HASH qttranslations-everywhere-src-$QT.tar.xz
|
||||
@@ -256,6 +260,28 @@ cmake --build . --parallel
|
||||
ninja install
|
||||
cd ../../
|
||||
|
||||
echo "Building Qt Shader Tools..."
|
||||
rm -fr "qtshadertools-everywhere-src-$QT"
|
||||
tar xf "qtshadertools-everywhere-src-$QT.tar.xz"
|
||||
cd "qtshadertools-everywhere-src-$QT"
|
||||
mkdir build
|
||||
cd build
|
||||
"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DQT_GENERATE_SBOM=OFF
|
||||
cmake --build . --parallel
|
||||
ninja install
|
||||
cd ../../
|
||||
|
||||
echo "Building Qt Declarative..."
|
||||
rm -fr "qtdeclarative-everywhere-src-$QT"
|
||||
tar xf "qtdeclarative-everywhere-src-$QT.tar.xz"
|
||||
cd "qtdeclarative-everywhere-src-$QT"
|
||||
mkdir build
|
||||
cd build
|
||||
"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DQT_GENERATE_SBOM=OFF
|
||||
cmake --build . --parallel
|
||||
ninja install
|
||||
cd ../../
|
||||
|
||||
echo "Installing Qt Tools..."
|
||||
rm -fr "qttools-everywhere-src-$QT"
|
||||
tar xf "qttools-everywhere-src-$QT.tar.xz"
|
||||
|
||||
@@ -75,7 +75,9 @@ $ZSTD_GZ_HASH zstd-$ZSTD.tar.gz
|
||||
$FFMPEG_XZ_HASH ffmpeg-$FFMPEG_VERSION.tar.xz
|
||||
f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e v$MOLTENVK.tar.gz
|
||||
$QTBASE_XZ_HASH qtbase-everywhere-src-$QT.tar.xz
|
||||
$QTDECLARATIVE_XZ_HASH qtdeclarative-everywhere-src-$QT.tar.xz
|
||||
$QTIMAGEFORMATS_XZ_HASH qtimageformats-everywhere-src-$QT.tar.xz
|
||||
$QTSHADERTOOLS_XZ_HASH qtshadertools-everywhere-src-$QT.tar.xz
|
||||
$QTSVG_XZ_HASH qtsvg-everywhere-src-$QT.tar.xz
|
||||
$QTTOOLS_XZ_HASH qttools-everywhere-src-$QT.tar.xz
|
||||
$QTTRANSLATIONS_XZ_HASH qttranslations-everywhere-src-$QT.tar.xz
|
||||
@@ -98,7 +100,9 @@ curl -L \
|
||||
-O "https://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.xz" \
|
||||
-O "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v$MOLTENVK.tar.gz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtdeclarative-everywhere-src-$QT.tar.xz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtshadertools-everywhere-src-$QT.tar.xz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
|
||||
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
|
||||
@@ -318,6 +322,28 @@ make "-j$NPROCS"
|
||||
make install
|
||||
cd ../..
|
||||
|
||||
echo "Installing Qt Shader Tools..."
|
||||
rm -fr "qtshadertools-everywhere-src-$QT"
|
||||
tar xf "qtshadertools-everywhere-src-$QT.tar.xz"
|
||||
cd "qtshadertools-everywhere-src-$QT"
|
||||
mkdir build
|
||||
cd build
|
||||
"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "${CMAKE_COMMON_QT[@]}"
|
||||
make "-j$NPROCS"
|
||||
make install
|
||||
cd ../..
|
||||
|
||||
echo "Installing Qt Declarative..."
|
||||
rm -fr "qtdeclarative-everywhere-src-$QT"
|
||||
tar xf "qtdeclarative-everywhere-src-$QT.tar.xz"
|
||||
cd "qtdeclarative-everywhere-src-$QT"
|
||||
mkdir build
|
||||
cd build
|
||||
"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "${CMAKE_COMMON_QT[@]}"
|
||||
make "-j$NPROCS"
|
||||
make install
|
||||
cd ../..
|
||||
|
||||
echo "Installing Qt Tools..."
|
||||
rm -fr "qttools-everywhere-src-$QT"
|
||||
tar xf "qttools-everywhere-src-$QT.tar.xz"
|
||||
|
||||
@@ -59,7 +59,9 @@ call :downloadfile "libpng-%LIBPNG%.tar.gz" "https://download.sourceforge.net/li
|
||||
call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "%LIBJPEGTURBO_GZ_HASH%" || goto error
|
||||
call :downloadfile "SDL3-%SDL3%.zip" "https://github.com/libsdl-org/SDL/releases/download/release-%SDL3%/SDL3-%SDL3%.zip" "%SDL3_ZIP_HASH%" || goto error
|
||||
call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" "%QTBASE_ZIP_HASH%" || goto error
|
||||
call :downloadfile "qtdeclarative-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtdeclarative-everywhere-src-%QT%.zip" "%QTDECLARATIVE_ZIP_HASH%" || goto error
|
||||
call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" "%QTIMAGEFORMATS_ZIP_HASH%" || goto error
|
||||
call :downloadfile "qtshadertools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtshadertools-everywhere-src-%QT%.zip" "%QTSHADERTOOLS_ZIP_HASH%" || goto error
|
||||
call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" "%QTSVG_ZIP_HASH%" || goto error
|
||||
call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" "%QTTOOLS_ZIP_HASH%" || goto error
|
||||
call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" "%QTTRANSLATIONS_ZIP_HASH%" || goto error
|
||||
@@ -170,6 +172,7 @@ echo Building SDL...
|
||||
rmdir /S /Q "SDL3-%SDL3%"
|
||||
%SEVENZIP% x "SDL3-%SDL3%.zip" || goto error
|
||||
cd "SDL3-%SDL3%" || goto error
|
||||
%PATCH% -p1 < "%SCRIPTDIR%\sdl3-wgi-roinitialize.patch" || goto error
|
||||
cmake -B build %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release %FORCEPDB% -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -DSDL_TESTS=OFF -G Ninja || goto error
|
||||
cmake --build build --parallel || goto error
|
||||
ninja -C build install || goto error
|
||||
@@ -217,6 +220,28 @@ cmake --build . --parallel || goto error
|
||||
ninja install || goto error
|
||||
cd ..\.. || goto error
|
||||
|
||||
echo Building Qt Shader Tools...
|
||||
rmdir /S /Q "qtshadertools-everywhere-src-%QT%"
|
||||
%SEVENZIP% x "qtshadertools-everywhere-src-%QT%.zip" || goto error
|
||||
cd "qtshadertools-everywhere-src-%QT%" || goto error
|
||||
mkdir build || goto error
|
||||
cd build || goto error
|
||||
call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DQT_GENERATE_SBOM=OFF || goto error
|
||||
cmake --build . --parallel || goto error
|
||||
ninja install || goto error
|
||||
cd ..\.. || goto error
|
||||
|
||||
echo Building Qt Declarative...
|
||||
rmdir /S /Q "qtdeclarative-everywhere-src-%QT%"
|
||||
%SEVENZIP% x "qtdeclarative-everywhere-src-%QT%.zip" || goto error
|
||||
cd "qtdeclarative-everywhere-src-%QT%" || goto error
|
||||
mkdir build || goto error
|
||||
cd build || goto error
|
||||
call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DQT_GENERATE_SBOM=OFF || goto error
|
||||
cmake --build . --parallel || goto error
|
||||
ninja install || goto error
|
||||
cd ..\.. || goto error
|
||||
|
||||
echo Building Qt Tools...
|
||||
rmdir /S /Q "qtimageformats-everywhere-src-%QT%"
|
||||
%SEVENZIP% x "qttools-everywhere-src-%QT%.zip" || goto error
|
||||
|
||||
@@ -57,7 +57,9 @@ call :downloadfile "libpng-%LIBPNG%.tar.gz" "https://download.sourceforge.net/li
|
||||
call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "%LIBJPEGTURBO_GZ_HASH%" || goto error
|
||||
call :downloadfile "SDL3-%SDL3%.zip" "https://github.com/libsdl-org/SDL/releases/download/release-%SDL3%/SDL3-%SDL3%.zip" "%SDL3_ZIP_HASH%" || goto error
|
||||
call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" "%QTBASE_ZIP_HASH%" || goto error
|
||||
call :downloadfile "qtdeclarative-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtdeclarative-everywhere-src-%QT%.zip" "%QTDECLARATIVE_ZIP_HASH%" || goto error
|
||||
call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" "%QTIMAGEFORMATS_ZIP_HASH%" || goto error
|
||||
call :downloadfile "qtshadertools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtshadertools-everywhere-src-%QT%.zip" "%QTSHADERTOOLS_ZIP_HASH%" || goto error
|
||||
call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" "%QTSVG_ZIP_HASH%" || goto error
|
||||
call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" "%QTTOOLS_ZIP_HASH%" || goto error
|
||||
call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" "%QTTRANSLATIONS_ZIP_HASH%" || goto error
|
||||
@@ -167,6 +169,7 @@ echo Building SDL...
|
||||
rmdir /S /Q "SDL3-%SDL3%"
|
||||
%SEVENZIP% x "SDL3-%SDL3%.zip" || goto error
|
||||
cd "SDL3-%SDL3%" || goto error
|
||||
%PATCH% -p1 < "%SCRIPTDIR%\sdl3-wgi-roinitialize.patch" || goto error
|
||||
cmake -B build -DCMAKE_BUILD_TYPE=Release %FORCEPDB% -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -DSDL_TESTS=OFF -G Ninja || goto error
|
||||
cmake --build build --parallel || goto error
|
||||
ninja -C build install || goto error
|
||||
@@ -217,6 +220,28 @@ cmake --build . --parallel || goto error
|
||||
ninja install || goto error
|
||||
cd ..\.. || goto error
|
||||
|
||||
echo Building Qt Shader Tools...
|
||||
rmdir /S /Q "qtshadertools-everywhere-src-%QT%"
|
||||
%SEVENZIP% x "qtshadertools-everywhere-src-%QT%.zip" || goto error
|
||||
cd "qtshadertools-everywhere-src-%QT%" || goto error
|
||||
mkdir build || goto error
|
||||
cd build || goto error
|
||||
call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DQT_GENERATE_SBOM=OFF || goto error
|
||||
cmake --build . --parallel || goto error
|
||||
ninja install || goto error
|
||||
cd ..\.. || goto error
|
||||
|
||||
echo Building Qt Declarative...
|
||||
rmdir /S /Q "qtdeclarative-everywhere-src-%QT%"
|
||||
%SEVENZIP% x "qtdeclarative-everywhere-src-%QT%.zip" || goto error
|
||||
cd "qtdeclarative-everywhere-src-%QT%" || goto error
|
||||
mkdir build || goto error
|
||||
cd build || goto error
|
||||
call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DQT_GENERATE_SBOM=OFF || goto error
|
||||
cmake --build . --parallel || goto error
|
||||
ninja install || goto error
|
||||
cd ..\.. || goto error
|
||||
|
||||
echo Building Qt Tools...
|
||||
rmdir /S /Q "qtimageformats-everywhere-src-%QT%"
|
||||
%SEVENZIP% x "qttools-everywhere-src-%QT%.zip" || goto error
|
||||
|
||||
44
scripts/deps/sdl3-wgi-roinitialize.patch
Normal file
44
scripts/deps/sdl3-wgi-roinitialize.patch
Normal file
@@ -0,0 +1,44 @@
|
||||
From 54c2f2c3f781db2e5593d44aa108f7043fc19baa Mon Sep 17 00:00:00 2001
|
||||
From: Sam Lantinga <slouken@libsdl.org>
|
||||
Date: Wed, 8 Oct 2025 13:15:48 -0700
|
||||
Subject: [PATCH] Only call WIN_RoUninitialize() if WIN_RoInitialize()
|
||||
succeeded
|
||||
|
||||
Fixes https://github.com/libsdl-org/SDL/issues/14178
|
||||
|
||||
(cherry picked from commit 7914bdb7ea14ee5109d50df857c8dfc69a28a62d)
|
||||
---
|
||||
src/joystick/windows/SDL_windows_gaming_input.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/joystick/windows/SDL_windows_gaming_input.c b/src/joystick/windows/SDL_windows_gaming_input.c
|
||||
index 11ee2243b7683..5f9435e34a570 100644
|
||||
--- a/src/joystick/windows/SDL_windows_gaming_input.c
|
||||
+++ b/src/joystick/windows/SDL_windows_gaming_input.c
|
||||
@@ -69,6 +69,7 @@ typedef PCWSTR(WINAPI *WindowsGetStringRawBuffer_t)(HSTRING string, UINT32 *leng
|
||||
|
||||
static struct
|
||||
{
|
||||
+ bool ro_initialized;
|
||||
CoIncrementMTAUsage_t CoIncrementMTAUsage;
|
||||
RoGetActivationFactory_t RoGetActivationFactory;
|
||||
WindowsCreateStringReference_t WindowsCreateStringReference;
|
||||
@@ -592,6 +593,7 @@ static bool WGI_JoystickInit(void)
|
||||
if (FAILED(WIN_RoInitialize())) {
|
||||
return SDL_SetError("RoInitialize() failed");
|
||||
}
|
||||
+ wgi.ro_initialized = true;
|
||||
|
||||
#define RESOLVE(x) wgi.x = (x##_t)WIN_LoadComBaseFunction(#x); if (!wgi.x) return WIN_SetError("GetProcAddress failed for " #x);
|
||||
RESOLVE(CoIncrementMTAUsage);
|
||||
@@ -1002,7 +1004,9 @@ static void WGI_JoystickQuit(void)
|
||||
__x_ABI_CWindows_CGaming_CInput_CIRawGameControllerStatics_Release(wgi.controller_statics);
|
||||
}
|
||||
|
||||
- WIN_RoUninitialize();
|
||||
+ if (wgi.ro_initialized) {
|
||||
+ WIN_RoUninitialize();
|
||||
+ }
|
||||
|
||||
SDL_zero(wgi);
|
||||
}
|
||||
@@ -40,8 +40,12 @@ QT=6.10.0
|
||||
QTMINOR=6.10
|
||||
QTBASE_XZ_HASH=ead4623bcb54a32257c5b3e3a5aec6d16ec96f4cda58d2e003f5a0c16f72046d
|
||||
QTBASE_ZIP_HASH=d3b5379edcace266273d789249b6d68ae9495ec1b0b562ba6d039034cd315d8e
|
||||
QTDECLARATIVE_XZ_HASH=6efd35520902395d865bc12e89f8442c3c228d0374f13af9a1888b844f56f6b0
|
||||
QTDECLARATIVE_ZIP_HASH=4cddb45c058a4a917e7ed311ceb3af22f21d59d0d7fdfb8cd7cae0cbb1bf5dbd
|
||||
QTIMAGEFORMATS_XZ_HASH=64450a52507c540de53616ed5e516df0e0905a99d3035ddfaa690f2b3f7c0cea
|
||||
QTIMAGEFORMATS_ZIP_HASH=ac2fe34a9f1c1451b6785474e9b1b64eb59edef6553be3d630240f16a730456d
|
||||
QTSHADERTOOLS_XZ_HASH=87ba478c3fd827862fc79f6d78d369dfec162c901b7f66ed988b3e1d6ffdfbf6
|
||||
QTSHADERTOOLS_ZIP_HASH=8ce0e488be563db01bf16d09626a723392ae6feb618c17405e0504ca55409a74
|
||||
QTSVG_XZ_HASH=5ed2c0e04d5e73ff75c2a2ed92db5dc1788ba70f704fc2b71bc21644beda2533
|
||||
QTSVG_ZIP_HASH=c12f8bfb617e4a03da104be36f6966ba7f64bee331f0095da1a649a1149796d2
|
||||
QTTOOLS_XZ_HASH=d86d5098cf3e3e599f37e18df477e65908fc8f036e10ea731b3469ec4fdbd02a
|
||||
|
||||
Reference in New Issue
Block a user