Some build support changes needed to support 32-bit.

Part of #5.
vezel-dev · Jul 5, 2022 · 1a194ce · 1a194ce
1 parent bb3f8ca
commit 1a194ce
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/src/injection/injection.csproj b/src/injection/injection.csproj
@@ -38,9 +38,8 @@ assemblies into processes.</PackageDescription>
         <PackageReference Include="PeNet" />
     </ItemGroup>
 
-    <Target Name="_AddModuleContent"
-            DependsOnTargets="ResolveAssemblyReferences"
-            BeforeTargets="AssignTargetPaths">
+    <Target Name="_AddModule"
+            Returns="@(Content)">
         <MSBuild Projects="../module/module.cproj"
                  Targets="GetTargetPath">
             <Output TaskParameter="TargetOutputs"
@@ -53,4 +52,21 @@ assemblies into processes.</PackageDescription>
                      PackagePath="ruptura" />
         </ItemGroup>
     </Target>
+
+    <Target Name="_AddModules"
+            DependsOnTargets="ResolveAssemblyReferences"
+            BeforeTargets="AssignTargetPaths">
+        <ItemGroup>
+            <_RuntimeIdentifiers Include="win-x64" />
+            <_Projects Include="$(MSBuildProjectFullPath)"
+                       Properties="RuntimeIdentifier=%(_RuntimeIdentifiers.Identity)" />
+        </ItemGroup>
+
+        <MSBuild Projects="@(_Projects)"
+                 Targets="_AddModule"
+                 BuildInParallel="$(BuildInParallel)">
+            <Output TaskParameter="TargetOutputs"
+                    ItemName="Content" />
+        </MSBuild>
+    </Target>
 </Project>
diff --git a/src/module/module.cproj b/src/module/module.cproj
@@ -1,6 +1,6 @@
 <Project Sdk="Vezel.Zig.Sdk">
     <PropertyGroup>
-        <AssemblyName>ruptura-x64</AssemblyName>
+        <AssemblyName>ruptura</AssemblyName>
         <DefineConstants>
             $(DefineConstants);
             WIN32_LEAN_AND_MEAN;
@@ -12,7 +12,13 @@
         </DisableWarnings>
         <!-- TODO: https://github.com/dotnet/msbuild/issues/6672 -->
         <PackageDefines>false</PackageDefines>
-        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+        <RuntimeIdentifiers>
+            win-x64
+        </RuntimeIdentifiers>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <AssemblyName Condition="'$(RuntimeIdentifier)' != ''">ruptura-$(RuntimeIdentifier.Split('-')[1])</AssemblyName>
     </PropertyGroup>
 
     <ItemGroup>