History

ci/mingw: add exe_wrapper to cross file

Allows running complied binaries on build machine.

Kacper Michajłow committed 2 years ago

Commit bb078b81 parent 7e8c8872 files · +6 −1Browse files

Unified · Split

2 files
  1. .github/workflows/build.yml +1 −1
  2. ci/build-mingw64.sh +5 −0
.github/workflows/build.yml+1−1
@@ -54,7 +54,7 @@ jobs: · 53 unmodified lines
5454 run: |
5555 sudo dpkg --add-architecture i386
5656 sudo apt-get update
57− sudo apt-get install -y ccache g++-mingw-w64 gcc-multilib nasm ninja-build pkg-config python3-pip wine
57+ sudo apt-get install -y ccache g++-mingw-w64 gcc-multilib nasm ninja-build pkg-config python3-pip wine wine32 wine64
5858 sudo python3 -m pip install meson
5959
6060 - name: Build libraries
ci/build-mingw64.sh+5−0
@@ -23,6 +23,10 @@ export LDFLAGS="-fstack-protector-strong" · 22 unmodified lines
2323 export PKG_CONFIG_SYSROOT_DIR="$prefix_dir"
2424 export PKG_CONFIG_LIBDIR="$PKG_CONFIG_SYSROOT_DIR/lib/pkgconfig"
2525
26+if [[ "$TARGET" == "i686-"* ]]; then
27+ export WINEPATH="`$CC -print-file-name=`;/usr/$TARGET/lib"
28+fi
29+
2630 # autotools(-like)
2731 commonflags="--disable-static --enable-shared"
2832
@@ -41,6 +45,7 @@ strip = '${TARGET}-strip' · 12 unmodified lines
4145 pkgconfig = 'pkg-config'
4246 windres = '${TARGET}-windres'
4347 dlltool = '${TARGET}-dlltool'
48+exe_wrapper = 'wine'
4449 [host_machine]
4550 system = 'windows'
4651 cpu_family = '${fam}'

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t