games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Fix MXE lib address and new compilation issues

Browse Source
This commit is contained in:
Andrii Danylchenko 2021-09-05 13:37:59 +03:00
parent ec7453ae85
commit 2f450f6592
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/github.yml vendored
View File

@ -27,12 +27,12 @@ jobs:
cxx: g++-9 cxx: g++-9
test: 0 test: 0
cmake_args: -G Ninja cmake_args: -G Ninja
- platform: mac # - platform: mac
os: macos-latest # os: macos-latest
test: 0 # test: 0
pack: 1 # pack: 1
extension: dmg # extension: dmg
cmake_args: -G Ninja # cmake_args: -G Ninja
- platform: mxe - platform: mxe
os: ubuntu-20.04 os: ubuntu-20.04
mxe: i686-w64-mingw32.shared mxe: i686-w64-mingw32.shared
@ -111,7 +111,8 @@ jobs:
if: ${{ matrix.pack == 1 }} if: ${{ matrix.pack == 1 }}
run: | run: |
cd '${{github.workspace}}/build' cd '${{github.workspace}}/build'
cpack -C Release ${{ matrix.cpack_args }} CPACK_PATH=`which -a cpack | grep -m1 -v -i chocolatey`
"$CPACK_PATH" -C Release ${{ matrix.cpack_args }}
- name: Additional logs - name: Additional logs
if: ${{ failure() && steps.cpack.outcome == 'failure' && matrix.platform == 'mxe' }} if: ${{ failure() && steps.cpack.outcome == 'failure' && matrix.platform == 'mxe' }}

1
CI/mac/before_install.sh
View File

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
brew update brew update
brew pin python@3.9
brew install smpeg2 libpng freetype qt5 ffmpeg ninja boost tbb luajit brew install smpeg2 libpng freetype qt5 ffmpeg ninja boost tbb luajit
brew install sdl2 sdl2_ttf sdl2_image sdl2_mixer brew install sdl2 sdl2_ttf sdl2_image sdl2_mixer

4
CI/mxe/before_install.sh
View File

@ -3,8 +3,8 @@
# Install nsis for installer creation # Install nsis for installer creation
sudo apt-get install -qq nsis ninja-build sudo apt-get install -qq nsis ninja-build
wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5.6_amd64.deb wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5.7_amd64.deb
sudo apt install ./libssl1.0.0_1.0.2n-1ubuntu5.6_amd64.deb sudo apt install ./libssl1.0.0_1.0.2n-1ubuntu5.7_amd64.deb
# MXE repository was too slow for Travis far too often # MXE repository was too slow for Travis far too often

4
scripting/erm/ERMInterpreter.cpp
View File

@ -988,8 +988,8 @@ namespace ERMConverter
fmt % name; fmt % name;
fmt % params; fmt % params;
GenericReceiver receiver(out, fmt.str(), (name == "DO")); GenericReceiver gr(out, fmt.str(), (name == "DO"));
bo[0].apply_visitor(receiver); bo[0].apply_visitor(gr);
} }
else else
{ {