Use CROSS_FILE

2 files changed, 14 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe7505f63ec8..2c4169132d10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vk9-git
 	pkgdesc = Direct3D 9 compatibility layer using Vulkan.
-	pkgver = 0.29.0.67.gd9654c8
+	pkgver = 0.29.0.74.g94ef918
 	pkgrel = 1
 	url = https://github.com/disks86/VK9
 	arch = x86_64
@@ -10,10 +10,6 @@ pkgbase = vk9-git
 	makedepends = git
 	makedepends = wine>=3.5
 	makedepends = shaderc
-	makedepends = util-linux
-	makedepends = cmake
-	makedepends = mingw-w64-meson
-	makedepends = mingw-w64-cmake
 	makedepends = mingw-w64-eigen
 	options = !strip
 	options = !buildflags
diff --git a/PKGBUILD b/PKGBUILD
index 8256e6203039..310413339bc7 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,15 +5,14 @@
 project=vk9
 pkgbase=vk9-git
 pkgname=('vk9-git' 'lib32-vk9-git')
-pkgver=0.29.0.67.gd9654c8
+pkgver=0.29.0.74.g94ef918
 pkgrel=1
 pkgdesc='Direct3D 9 compatibility layer using Vulkan.'
 arch=('x86_64')
 url='https://github.com/disks86/VK9'
 license=('zlib')
 options=(!strip !buildflags staticlibs)
-makedepends=('ninja' 'meson>=0.43' 'git' 'wine>=3.5' 'shaderc' 'util-linux' 'cmake'
-		'mingw-w64-meson' 'mingw-w64-cmake' 'mingw-w64-eigen')
+makedepends=('ninja' 'meson>=0.43' 'git' 'wine>=3.5' 'shaderc' 'mingw-w64-eigen')
 source=($project::'git+https://github.com/Guy1524/VK9.git')
 sha256sums=('SKIP')
 
@@ -30,16 +29,21 @@ build() {
   
   #./package-release.sh $pkgver '..' --no-package --keep-builddir
   VK9_BUILD_DIR="$srcdir/$project-$pkgver"
-  for arch in 'x86_64' 'i686'; do
-    $arch-w64-mingw32-meson \
+  declare -A real_arch=(
+    [32]=i686
+    [64]=x86_64
+  )
+  for arch in '64' '32'; do
+    CROSS_FILE="$pwd/build-win${arch}.txt" \
+    ${real_arch[$arch]}-w64-mingw32-meson \
         --buildtype 'release' \
         --unity off \
         --strip \
         -Db_pch=true \
         -Denable_tests=false \
-        "$VK9_BUILD_DIR/build.$arch"
+        "$VK9_BUILD_DIR/build${arch}"
 
-    pushd "$VK9_BUILD_DIR/build.$arch"
+    pushd "$VK9_BUILD_DIR/build${arch}"
     ninja
     popd
   done
@@ -51,7 +55,7 @@ package_vk9-git() {
   provides=('vk9')
   depends=('vulkan-icd-loader' 'wine')
   
-  cd "$srcdir/$project-$pkgver/build.x86_64"
+  cd "$srcdir/$project-$pkgver/build64"
   install -Dm644 'VK9-Library/d3d9.dll' "$pkgdir/usr/share/VK9/x64/d3d9.dll"
   install -Dm755 'wine_utils/setup_vk9.sh' "$pkgdir/usr/share/VK9/x64/setup_vk9.sh"
 
@@ -65,7 +69,7 @@ package_lib32-vk9-git() {
   provides=('lib32-vk9')
   depends=('lib32-vulkan-icd-loader' 'wine')
   
-  cd "$srcdir/$project-$pkgver/build.i686"
+  cd "$srcdir/$project-$pkgver/build32"
   install -Dm644 'VK9-Library/d3d9.dll' "$pkgdir/usr/share/VK9/x32/d3d9.dll"
   install -Dm755 'wine_utils/setup_vk9.sh' "$pkgdir/usr/share/VK9/x32/setup_vk9.sh"