Change the iOS build to create a full, combined libveldrid-spirv-static.a and include it in nupkg.

Author: mellinoe

CMakeLists.txt

@@ -38,3 +38,5 @@ set_target_properties(veldrid-spirv PROPERTIES PREFIX "lib")
 set_target_properties(veldrid-spirv PROPERTIES DEBUG_POSTFIX "")
 
 set_target_properties(veldrid-spirv PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
+
+shaderc_combine_static_lib(veldrid-spirv-combined veldrid-spirv)

build-full-package.ps1

@@ -76,26 +76,15 @@ if( -not $? )
 Write-Host "- libveldrid-spirv.dylib (64-bit macOS)"
 
 $client.DownloadFile(
-    "https://github.com/mellinoe/veldrid-spirv/releases/download/$tag/libveldrid-spirv.a",
-    "$PSScriptRoot/download/$configuration/ios/libveldrid-spirv.a")
+    "https://github.com/mellinoe/veldrid-spirv/releases/download/$tag/libveldrid-spirv-combined.a",
+    "$PSScriptRoot/download/$configuration/ios/libveldrid-spirv-combined.a")
 if( -not $? )
 {
     $msg = $Error[0].Exception.Message
-    Write-Error "Couldn't download libveldrid-spirv.a. This most likely indicates the iOS native build failed."
+    Write-Error "Couldn't download libveldrid-spirv-combined.a. This most likely indicates the iOS native build failed."
     exit
 }
-Write-Host "- libveldrid-spirv.a (64-bit iOS)"
-
-$client.DownloadFile(
-    "https://github.com/mellinoe/veldrid-spirv/releases/download/$tag/libshaderc_combined.a",
-    "$PSScriptRoot/download/$configuration/ios/libshaderc_combined.a")
-if( -not $? )
-{
-    $msg = $Error[0].Exception.Message
-    Write-Error "Couldn't download libshaderc_combined.a. This most likely indicates the iOS native build failed."
-    exit
-}
-Write-Host "- libshaderc_combined.a (64-bit iOS)"
+Write-Host "- libveldrid-spirv-combined.a (64-bit iOS)"
 
 $client.DownloadFile(
     "https://github.com/mellinoe/veldrid-spirv/releases/download/$tag/libveldrid-spirv.android-arm64-v8a.so",

build-native.sh

@@ -6,6 +6,7 @@ _CMakeToolchain=
 _CMakeIOSPlatform=
 _CMakeEnableBitcode=
 _OutputPathPrefix=
+_CMakeBuildTarget=veldrid-spirv
 
 while :; do
     if [ $# -le 0 ]; then
@@ -25,6 +26,7 @@ while :; do
             _CMakeIOSPlatform=-DIOS_PLATFORM=OS64
             _CMakeEnableBitcode=-DENABLE_BITCODE=0
             _OutputPathPrefix=ios-
+            _CMakeBuildTarget=veldrid-spirv-combined_genfile
             ;;
         *)
             __UnprocessedBuildArgs="$__UnprocessedBuildArgs $1"
@@ -43,5 +45,5 @@ fi
 mkdir -p $_OutputPath
 pushd $_OutputPath
 cmake ../.. -DCMAKE_BUILD_TYPE=$_CMakeBuildType $_CMakeToolchain $_CMakeIOSPlatform $_CMakeEnableBitcode -DPYTHON_EXE=$_PythonExePath
-make
+cmake --build . --target $_CMakeBuildTarget
 popd

src/Veldrid.SPIRV/Veldrid.SPIRV.csproj

@@ -33,8 +33,7 @@
       <_NativeAssetName Include="$(Configuration)/win-x64/libveldrid-spirv.dll" PackagePath="runtimes/win-x64/native" />
       <_NativeAssetName Include="$(Configuration)/linux-x64/libveldrid-spirv.so" PackagePath="runtimes/linux-x64/native" />
       <_NativeAssetName Include="$(Configuration)/osx-x64/libveldrid-spirv.dylib" PackagePath="runtimes/osx-x64/native" />
-      <_NativeAssetName Include="$(Configuration)/ios/libveldrid-spirv.a" PackagePath="build/Xamarin.iOS10/native" />
-      <_NativeAssetName Include="$(Configuration)/ios/libshaderc_combined.a" PackagePath="build/Xamarin.iOS10/native" />
+      <_NativeAssetName Include="$(Configuration)/ios/libveldrid-spirv-combined.a" PackagePath="build/Xamarin.iOS10/native" />
       <_NativeAssetName Include="$(Configuration)/android-arm64-v8a/libveldrid-spirv.so" PackagePath="build/MonoAndroid10/native/arm64-v8a" />
       <_NativeAssetName Include="$(Configuration)/android-armeabi-v7a/libveldrid-spirv.so" PackagePath="build/MonoAndroid10/native/armeabi-v7a" />
 

src/Veldrid.SPIRV/build/Xamarin.iOS10/Veldrid.SPIRV.targets

@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <NativeReference Include="$(MSBuildThisFileDirectory)native\libshaderc_combined.a">
-      <Kind>Static</Kind>
-      <SmartLink>False</SmartLink>
-      <ForceLoad>True</ForceLoad>
-      <IsCxx>True</IsCxx>
-    </NativeReference>
-    <NativeReference Include="$(MSBuildThisFileDirectory)native\libveldrid-spirv.a">
+    <NativeReference Include="$(MSBuildThisFileDirectory)native\libveldrid-spirv-combined.a">
       <Kind>Static</Kind>
       <SmartLink>False</SmartLink>
       <ForceLoad>True</ForceLoad>