Close to work, missing spriv-headers

2 files changed, 16 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 43a1ec34994f..8ab00267049c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,6 +17,7 @@ pkgbase = vk9-git
 	makedepends = mingw-w64-vulkan-headers
 	makedepends = mingw-w64-eigen
 	makedepends = mingw-w64-vulkan-loader
+	makedepends = mingw-w64-spirv-headers
 	options = !strip
 	options = !buildflags
 	options = staticlibs
diff --git a/PKGBUILD b/PKGBUILD
index 9af4f699eff0..f4d25f4e38cb 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,8 @@ 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-cmake' 'mingw-w64-boost' 'mingw-w64-vulkan-headers' 'mingw-w64-eigen' 'mingw-w64-vulkan-loader')
+		'mingw-w64-cmake' 'mingw-w64-boost' 'mingw-w64-vulkan-headers'
+		'mingw-w64-eigen' 'mingw-w64-vulkan-loader' 'mingw-w64-spirv-headers')
 source=($project::'git+https://github.com/disks86/VK9.git')
 sha256sums=('SKIP')
 
@@ -25,17 +26,27 @@ pkgver() {
 
 prepare(){
   mkdir -p "$srcdir/wine/VK9-build"
-  
+
+  cat > "$srcdir/fix-build.sh" << EOF
+#!/usr/bin/env bash
+sed -i'' -E 's/-isystem\/usr\/[^-]+-w64-mingw32\/include//g' build.ninja
+EOF
+  chmod +x "$srcdir/fix-build.sh"
+
   cd "$srcdir/$project"
   cat > dep64/boost.sh << EOF
 #!/usr/bin/env bash
 export BOOST_INCLUDEDIR=/usr/x86_64-w64-mingw32/include
 export BOOST_LIBRARYDIR=$srcdir/boost64
+export CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES=/usr/x86_64-w64-mingw32/include/.
+export CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES=/usr/x86_64-w64-mingw32/include/.
 EOF
   cat > dep32/boost.sh << EOF
 #!/usr/bin/env bash
 export BOOST_INCLUDEDIR=/usr/i686-w64-mingw32/include
 export BOOST_LIBRARYDIR=$srcdir/boost32
+export CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES=/usr/i686-w64-mingw32/include/.
+export CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES=/usr/i686-w64-mingw32/include/.
 EOF
   cat > dep64/eigen.pc << EOF
 # Package Information for pkg-config
@@ -62,6 +73,8 @@ Version: 3.3.5
 Cflags: -I${includedir}
 EOF
   rm dep{32,64}/vulkan-1.pc
+
+  sed -i'' -E 's/ninja install/..\/..\/fix-build.sh\nninja install/g' package-release.sh
   
   mkdir -p "$srcdir/boost"{32,64}
   cd "$srcdir/boost32"