Merge pull request #586 from WhiteCloud0123/main

main -> develop

.github/workflows/release.yml

@@ -111,13 +111,13 @@ jobs:
  run: |
  git clone --depth=1 --shallow-submodules --recurse-submodules https://github.com/Fris0uman/CDDA-Soundpacks '${{ github.workspace }}/CDDA-Soundpacks'
  mv '${{ github.workspace }}/CDDA-Soundpacks/sound/CC-Sounds' '${{ github.workspace }}/data/sound'
- - name: Install dependencies (windows msvc) (0/3)
+ - name: Install dependencies (windows msvc) (0/4)
  if: runner.os == 'Windows'
  uses: lukka/get-cmake@latest
- - name: Install dependencies (windows msvc) (1/3)
+ - name: Install dependencies (windows msvc) (1/4)
  if: runner.os == 'Windows'
  uses: microsoft/[email protected]
- - name: Install dependencies (windows msvc) (2/3)
+ - name: Install dependencies (windows msvc) (2/4)
  if: runner.os == 'Windows'
  uses: lukka/run-vcpkg@v11
  id: runvcpkg
@@ -128,10 +128,18 @@ jobs:
  # field in vcpkg.json. Caching happens as a post-action which runs at the end of
  # the whole workflow, after vcpkg install happens during msbuild run.
  vcpkgGitCommitId: "66444e13a86da7087ee24c342f91801cc6eb9877"
- - name: Install dependencies (windows msvc) (3/3)
+ - name: Install dependencies (windows msvc) (3/4)
  if: runner.os == 'Windows'
  run: |
  vcpkg integrate install --vcpkg-root '${{ runner.workspace }}\b\vcpkg'
+ - name: Install dependencies (windows msvc) (4/4)
+ if: runner.os == 'Windows'
+ uses: msys2/setup-msys2@v2
+ with:
+ msystem: mingw64
+ install: >-
+ gettext
+ make
  - name: Install dependencies (windows mxe)
  if: matrix.mxe != 'none'
  run: |
@@ -168,7 +176,7 @@ jobs:
  EOL
  - name: Compile translations (windows)
  if: runner.os == 'Windows'
- shell: bash
+ shell: msys2 {0}
  run: |
  lang/compile_mo.sh all
  - name: Build CDDA (linux)