Forráskód Böngészése

conan: build for 64-bit windows by default

This was strongly suggested by VCMI developers.
Konstantin 2 éve
szülő
commit
38ebb62c3e
2 módosított fájl, 5 hozzáadás és 5 törlés
  1. 1 1
      .github/workflows/github.yml
  2. 4 4
      CI/mingw-ubuntu/before_install.sh

+ 1 - 1
.github/workflows/github.yml

@@ -121,7 +121,7 @@ jobs:
             cpack_args: -D CPACK_NSIS_EXECUTABLE=`which makensis`
             cpack_args: -D CPACK_NSIS_EXECUTABLE=`which makensis`
             cmake_args: -G Ninja
             cmake_args: -G Ninja
             preset: windows-mingw-conan-linux
             preset: windows-mingw-conan-linux
-            conan_profile: mingw32-linux.jinja
+            conan_profile: mingw64-linux.jinja
     runs-on: ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     defaults:
     defaults:
       run:
       run:

+ 4 - 4
CI/mingw-ubuntu/before_install.sh

@@ -2,15 +2,15 @@
 
 
 sudo apt-get update
 sudo apt-get update
 sudo apt-get install ninja-build mingw-w64 nsis
 sudo apt-get install ninja-build mingw-w64 nsis
-sudo update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix
+sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
 
 
 # Workaround for getting new MinGW headers on Ubuntu 22.04.
 # Workaround for getting new MinGW headers on Ubuntu 22.04.
 # Remove it once MinGW headers version in repository will be 10.0 at least
 # Remove it once MinGW headers version in repository will be 10.0 at least
 curl -O -L http://mirrors.kernel.org/ubuntu/pool/universe/m/mingw-w64/mingw-w64-common_10.0.0-2_all.deb \
 curl -O -L http://mirrors.kernel.org/ubuntu/pool/universe/m/mingw-w64/mingw-w64-common_10.0.0-2_all.deb \
   && sudo dpkg -i mingw-w64-common_10.0.0-2_all.deb;
   && sudo dpkg -i mingw-w64-common_10.0.0-2_all.deb;
-curl -O -L http://mirrors.kernel.org/ubuntu/pool/universe/m/mingw-w64/mingw-w64-i686-dev_10.0.0-2_all.deb \
-  && sudo dpkg -i mingw-w64-i686-dev_10.0.0-2_all.deb;
+curl -O -L http://mirrors.kernel.org/ubuntu/pool/universe/m/mingw-w64/mingw-w64-x86-64-dev_10.0.0-2_all.deb \
+  && sudo dpkg -i mingw-w64-x86-64-dev_10.0.0-2_all.deb;
 
 
 mkdir ~/.conan ; cd ~/.conan
 mkdir ~/.conan ; cd ~/.conan
-curl -L "https://github.com/rilian-la-te/vcmi-deps-windows-conan/releases/download/0.0.1/vcmi-deps-windows-conan.tgz" \
+curl -L "https://github.com/vcmi/vcmi-deps-windows-conan/releases/download/1.0/vcmi-deps-windows-conan-w64.tgz" \
 	| tar -xzf -
 	| tar -xzf -