Skip to content

Commit

Permalink
Add back CMake support in mingw-w64-meson
Browse files Browse the repository at this point in the history
  • Loading branch information
Martchus committed Jan 20, 2025
1 parent c015663 commit 5485e97
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 49 deletions.
7 changes: 5 additions & 2 deletions meson/mingw-w64-clang-aarch64/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Maintainer: Martchus <[email protected]>
# Contributor: drakkan <nicola.murino at gmail dot com>

pkgname=mingw-w64-clang-aarch64-meson
pkgver=1
pkgrel=2
pkgrel=3
arch=('any')
pkgdesc="Meson wrapper for MinGW (mingw-w64-clang-aarch64)"
depends=('meson' 'mingw-w64-clang-aarch64-pkg-config' 'mingw-w64-clang-aarch64-libc++' 'mingw-w64-clang-environment')
Expand All @@ -9,7 +12,7 @@ license=("GPL")
url="https://github.com/Martchus/PKGBUILDs"
source=("toolchain_generator.py"
"meson-mingw-wrapper")
sha256sums=('3eee880e51bf173fa9743bfee9178d7d0558eb405e48eac9c3590b3186834b5c'
sha256sums=('d7465adfe25418281620c2abc8f0d7349a884a62b3be44a0bc3742184b5763ce'
'2defbbb1f43e13815b2a8a8327bd14aad175219eb4ff9935d5bf9d46b9f8728a')
_architectures="aarch64-w64-mingw32"

Expand Down
22 changes: 0 additions & 22 deletions meson/mingw-w64-clang-aarch64/toolchain-mingw.meson

This file was deleted.

1 change: 1 addition & 0 deletions meson/mingw-w64-clang-aarch64/toolchain_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ def get_binaries_section(self):
'strip':"'mingw-llvm-strip'".format(self.arch),
'windres':"'mingw-llvm-windres'".format(self.arch),
'dlltool':"'llvm-dlltool'".format(self.arch),
'cmake':"'{}-cmake'".format(self.arch),
}
if self.need_exe_wrapper:
binaries.update({'exe_wrapper':"'{}-wine'".format(self.arch)})
Expand Down
8 changes: 5 additions & 3 deletions meson/mingw-w64/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# Maintainer: drakkan <nicola.murino at gmail dot com>
# Maintainer: Martchus <[email protected]>
# Contributor: drakkan <nicola.murino at gmail dot com>

pkgname=mingw-w64-meson
pkgver=1
pkgrel=25
pkgrel=26
arch=('any')
pkgdesc="Meson wrapper for MinGW (mingw-w64)"
depends=('meson' 'mingw-w64-gcc' 'mingw-w64-pkg-config')
Expand All @@ -11,7 +13,7 @@ license=("GPL")
url="http://fedoraproject.org/wiki/MinGW"
source=("toolchain_generator.py"
"meson-mingw-wrapper")
sha256sums=('b24aaa1392d34a6ae73ee26b094e887a820e885b0f417eb38be4a8351e385458'
sha256sums=('a04518bdc84473f5c4f3cecb2c301d9a367909d724687256b61c40eff2eb3430'
'2defbbb1f43e13815b2a8a8327bd14aad175219eb4ff9935d5bf9d46b9f8728a')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

Expand Down
22 changes: 0 additions & 22 deletions meson/mingw-w64/toolchain-mingw.meson

This file was deleted.

1 change: 1 addition & 0 deletions meson/mingw-w64/toolchain_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def get_binaries_section(self):
'strip':"'{}-strip'".format(self.arch),
'windres':"'{}-windres'".format(self.arch),
'dlltool':"'{}-dlltool'".format(self.arch),
'cmake':"'{}-cmake'".format(self.arch),
}
if self.need_exe_wrapper:
binaries.update({'exe_wrapper':"'{}-wine'".format(self.arch)})
Expand Down

0 comments on commit 5485e97

Please sign in to comment.