diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e73ef4b..7a1fd0e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,7 +43,7 @@ jobs: with: version: "6.6.*" cache: true - modules: 'qtwebengine qtwebview qtshadertools' + modules: 'qtwebengine qtwebview qtwebsockets qtshadertools' - name: Set reusable strings id: strings @@ -173,7 +173,7 @@ jobs: if: steps.cache-prefix-restore.outputs.cache-hit != 'true' run: | git clone https://github.com/frankosterfeld/qtkeychain.git - cmake -B ${{ steps.strings.outputs.build-output-dir }}-qtkeychain -DCMAKE_PREFIX_PATH=${{ steps.strings.outputs.prefix-dir }} -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S qtkeychain -DCMAKE_INSTALL_PREFIX=${{ steps.strings.outputs.prefix-dir }} -DBUILD_TESTING=OFF -DBUILD_WITH_QT6=ON + cmake -B ${{ steps.strings.outputs.build-output-dir }}-qtkeychain -DCMAKE_PREFIX_PATH=${{ steps.strings.outputs.prefix-dir }} -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S qtkeychain -DCMAKE_INSTALL_PREFIX=${{ steps.strings.outputs.prefix-dir }} -DBUILD_TESTING=OFF -DBUILD_WITH_QT6=ON -DQTKEYCHAIN_TARGET_NAME=keychain cmake --build ${{ steps.strings.outputs.build-output-dir }}-qtkeychain --config ${{ matrix.build_type }} --target install - name: Build unshield diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index ae3c9d7..d4afc8a 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -160,4 +160,11 @@ if (ENABLE_GAMEMODE) target_compile_definitions(astra PRIVATE ENABLE_GAMEMODE) endif () -install(TARGETS astra ${KF6_INSTALL_TARGETS_DEFAULT_ARGS}) \ No newline at end of file +install(TARGETS astra ${KF6_INSTALL_TARGETS_DEFAULT_ARGS}) + +qt_generate_deploy_app_script( + TARGET astra + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR +) +install(SCRIPT ${deploy_script}) \ No newline at end of file diff --git a/scripts/windows-setup.ps1 b/scripts/windows-setup.ps1 index d7e86f3..52a36e6 100644 --- a/scripts/windows-setup.ps1 +++ b/scripts/windows-setup.ps1 @@ -123,7 +123,7 @@ CheckCompileResult "qcoro" # Build QtKeychain Clone "qtkeychain" "https://github.com/frankosterfeld/qtkeychain.git" -Configure "qtkeychain" "-DBUILD_TESTING=OFF -DBUILD_WITH_QT6=ON" +Configure "qtkeychain" "-DBUILD_TESTING=OFF -DBUILD_WITH_QT6=ON -DQTKEYCHAIN_TARGET_NAME=keychain" cmake --build "$BuildDir-qtkeychain" --config Debug --target install --parallel $NumCores CheckCompileResult "qtkeychain"