Skip to content

Display and control your Android device

Define both pkg-config and pkgconfig for meson

Romain Vimontf751274b1762
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a5701b0a..da021c6e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -137,9 +137,6 @@ jobs:
libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
mingw-w64 mingw-w64-tools libz-mingw-w64-dev
- - name: Workaround for old meson version run by Github Actions
- run: sed -i 's/^pkg-config/pkgconfig/' cross_win32.txt
-
- name: Build
run: release/build_windows.sh 32
@@ -171,9 +168,6 @@ jobs:
libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
mingw-w64 mingw-w64-tools libz-mingw-w64-dev
- - name: Workaround for old meson version run by Github Actions
- run: sed -i 's/^pkg-config/pkgconfig/' cross_win64.txt
-
- name: Build
run: release/build_windows.sh 64
diff --git a/cross_win32.txt b/cross_win32.txt
index 05f9a86b..ddbc65f3 100644
--- a/cross_win32.txt
+++ b/cross_win32.txt
@@ -7,6 +7,8 @@ cpp = 'i686-w64-mingw32-g++'
ar = 'i686-w64-mingw32-ar'
strip = 'i686-w64-mingw32-strip'
pkg-config = 'i686-w64-mingw32-pkg-config'
+# backward compatibility
+pkgconfig = 'i686-w64-mingw32-pkg-config'
windres = 'i686-w64-mingw32-windres'
[host_machine]
diff --git a/cross_win64.txt b/cross_win64.txt
index 86364ad6..a6f16e16 100644
--- a/cross_win64.txt
+++ b/cross_win64.txt
@@ -7,6 +7,8 @@ cpp = 'x86_64-w64-mingw32-g++'
ar = 'x86_64-w64-mingw32-ar'
strip = 'x86_64-w64-mingw32-strip'
pkg-config = 'x86_64-w64-mingw32-pkg-config'
+# backward compatibility
+pkgconfig = 'x86_64-w64-mingw32-pkg-config'
windres = 'x86_64-w64-mingw32-windres'
[host_machine]