diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5a820ca..31a2ed3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,6 +45,7 @@ jobs: SDL2:p SDL2_net:p qt6:p + 7zip:p - name: Run build script run: msys2 -c 'export SIMPLE64_AUTOUPDATE=1; ./build.sh zip' diff --git a/.gitignore b/.gitignore index 804d745..d041077 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ simple64/ discord/ vosk/ +7z/ *zip *.dylib .DS_Store diff --git a/build.sh b/build.sh index b48d397..27cef86 100755 --- a/build.sh +++ b/build.sh @@ -103,6 +103,15 @@ if [[ ! -d "${base_dir}/vosk" ]]; then fi if [[ ${UNAME} == *"MINGW64"* ]]; then + if [[ ! -d "${base_dir}/7z" ]]; then + echo "Downloading 7-zip" + mkdir -p "${base_dir}/7z" + cd "${base_dir}/7z" + wget -q https://www.7-zip.org/a/7z2301-extra.7z + 7z x 7z2301-extra.7z + rm 7z2301-extra.7z + fi + cd "${install_dir}" windeployqt-qt6.exe --no-translations simple64-gui.exe my_os=win64 @@ -135,7 +144,7 @@ if [[ ${UNAME} == *"MINGW64"* ]]; then cp -v "${MSYSTEM_PREFIX}/bin/libhidapi-0.dll" "${install_dir}" cp -v "${MSYSTEM_PREFIX}/bin/libcrypto-3-x64.dll" "${install_dir}" # used by Qt at runtime cp -v "${MSYSTEM_PREFIX}/bin/libssl-3-x64.dll" "${install_dir}" # used by Qt at runtime - cp -v "${base_dir}/7za.exe" "${install_dir}" + cp -v "${base_dir}/7z/x64/7za.exe" "${install_dir}" cp -v "${base_dir}/discord/lib/x86_64/discord_game_sdk.dll" "${install_dir}" cp -v "${base_dir}/vosk/libvosk.dll" "${install_dir}/vosk.dll" else diff --git a/clean.sh b/clean.sh index df3d8f1..ea967e9 100755 --- a/clean.sh +++ b/clean.sh @@ -12,3 +12,4 @@ rm -rf parallel-rsp/build rm -rf parallel-rdp-standalone/build rm -rf discord rm -rf vosk +rm -rf 7z