From e1ca445b7847536a6ecf86c1232a5cf524dc9349 Mon Sep 17 00:00:00 2001 From: DanielSvoboda Date: Mon, 2 Sep 2024 13:25:12 -0300 Subject: [PATCH 1/4] Fix download Cheats/Patches on Linux --- .github/linux-appimage-qt.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/linux-appimage-qt.sh b/.github/linux-appimage-qt.sh index 203d214e..afa6a90e 100755 --- a/.github/linux-appimage-qt.sh +++ b/.github/linux-appimage-qt.sh @@ -24,6 +24,11 @@ chmod a+x linuxdeploy-plugin-checkrt-x86_64.sh ./linuxdeploy-x86_64.AppImage --appdir AppDir ./linuxdeploy-plugin-checkrt-x86_64.sh --appdir AppDir +# Copy SSL libraries +mkdir -p AppDir/usr/lib +cp /usr/lib/x86_64-linux-gnu/libssl.so* AppDir/usr/lib/ +cp /usr/lib/x86_64-linux-gnu/libcrypto.so* AppDir/usr/lib/ + cp -a "$GITHUB_WORKSPACE/build/translations" AppDir/usr/bin ./linuxdeploy-x86_64.AppImage --appdir AppDir -d "$GITHUB_WORKSPACE"/.github/shadps4.desktop -e "$GITHUB_WORKSPACE"/build/shadps4 -i "$GITHUB_WORKSPACE"/.github/shadps4.png --plugin qt --output appimage From 6944a1640708fc9a56f848347b694336ff65510d Mon Sep 17 00:00:00 2001 From: DanielSvoboda Date: Mon, 2 Sep 2024 15:30:40 -0300 Subject: [PATCH 2/4] Update linux-appimage-qt.sh --- .github/linux-appimage-qt.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/linux-appimage-qt.sh b/.github/linux-appimage-qt.sh index afa6a90e..203d214e 100755 --- a/.github/linux-appimage-qt.sh +++ b/.github/linux-appimage-qt.sh @@ -24,11 +24,6 @@ chmod a+x linuxdeploy-plugin-checkrt-x86_64.sh ./linuxdeploy-x86_64.AppImage --appdir AppDir ./linuxdeploy-plugin-checkrt-x86_64.sh --appdir AppDir -# Copy SSL libraries -mkdir -p AppDir/usr/lib -cp /usr/lib/x86_64-linux-gnu/libssl.so* AppDir/usr/lib/ -cp /usr/lib/x86_64-linux-gnu/libcrypto.so* AppDir/usr/lib/ - cp -a "$GITHUB_WORKSPACE/build/translations" AppDir/usr/bin ./linuxdeploy-x86_64.AppImage --appdir AppDir -d "$GITHUB_WORKSPACE"/.github/shadps4.desktop -e "$GITHUB_WORKSPACE"/build/shadps4 -i "$GITHUB_WORKSPACE"/.github/shadps4.png --plugin qt --output appimage From 9ccd60459d59e05fe7a05015459e6ea6206078ff Mon Sep 17 00:00:00 2001 From: DanielSvoboda Date: Mon, 2 Sep 2024 15:30:50 -0300 Subject: [PATCH 3/4] Update CMakeLists.txt --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c40f0a8..b12a6985 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -737,3 +737,8 @@ if (ENABLE_QT_GUI) set_source_files_properties(src/images/shadPS4.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) endif() + +if (ENABLE_QT_GUI) + find_package(OpenSSL REQUIRED) + target_link_libraries(shadps4 PRIVATE ${OPENSSL_LIBRARIES}) +endif() From f2c7fac20b643412cdab6e5de805f3a83e124340 Mon Sep 17 00:00:00 2001 From: DanielSvoboda Date: Mon, 2 Sep 2024 20:18:36 -0300 Subject: [PATCH 4/4] Update CMakeLists.txt --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b12a6985..092953b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -738,7 +738,9 @@ if (ENABLE_QT_GUI) MACOSX_PACKAGE_LOCATION Resources) endif() -if (ENABLE_QT_GUI) - find_package(OpenSSL REQUIRED) - target_link_libraries(shadps4 PRIVATE ${OPENSSL_LIBRARIES}) +if (UNIX AND NOT APPLE) + if (ENABLE_QT_GUI) + find_package(OpenSSL REQUIRED) + target_link_libraries(shadps4 PRIVATE ${OPENSSL_LIBRARIES}) + endif() endif()