Fold CultMath deployment into CultLib

deploy/bootstrap-yggdrasil.sh

@@ -18,7 +18,6 @@ clone_for_idunn() {
 }
 
 clone_for_idunn Gjallar https://github.com/GameCult/Gjallar.git
-clone_for_idunn CultMath https://github.com/GameCult/CultMath.git
 clone_for_idunn CultLib https://github.com/GameCult/CultLib.git
 clone_for_idunn Eve https://github.com/GameCult/Eve.git
 

deploy/cultlib.commit

@@ -1 +1 @@
-75c180782aeba7cfd22d6412877397708a4ed28f
+63d6094c9412808730ef5d8043a096c655ae901a

deploy/cultmath.commit

@@ -1 +0,0 @@
-fcdddda72f6aa33ae6eeff3bce6a2d3e26eb16f3

deploy/deploy-yggdrasil.sh

@@ -37,10 +37,8 @@ archive_repo() {
 }
 
 archive_repo Gjallar "$source_commit"
-cultmath_commit="$(tr -d '\r\n' < "$workspace/Gjallar/deploy/cultmath.commit")"
 cultlib_commit="$(tr -d '\r\n' < "$workspace/Gjallar/deploy/cultlib.commit")"
 eve_commit="$(tr -d '\r\n' < "$workspace/Gjallar/deploy/eve.commit")"
-archive_repo CultMath "$cultmath_commit"
 archive_repo CultLib "$cultlib_commit"
 archive_repo Eve "$eve_commit"
 
@@ -65,7 +63,6 @@ if [ ! -d "$release" ]; then
   printf '%s\n' \
     'schema_version=gamecult.gjallar.deployment_manifest.v2' \
     "source_commit=$source_commit" \
-    "cultmath_commit=$cultmath_commit" \
     "cultlib_commit=$cultlib_commit" \
     "eve_commit=$eve_commit" \
     "sdk_image=$sdk_image" \

src/Gjallar/Gjallar.csproj

@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <CultLibRoot Condition="'$(CultLibRoot)' == ''">$(MSBuildThisFileDirectory)..\..\..\CultLib</CultLibRoot>
     <OutputType>Exe</OutputType>
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -9,8 +10,8 @@
     <RootNamespace>Gjallar</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\CultMath\src\CultMath\CultMath.csproj" />
-    <ProjectReference Include="..\..\..\CultLib\src\GameCult.Networking\GameCult.Networking.csproj" />
+    <ProjectReference Include="$(CultLibRoot)\packages\cultmath\src\CultMath\CultMath.csproj" />
+    <ProjectReference Include="$(CultLibRoot)\src\GameCult.Networking\GameCult.Networking.csproj" />
     <ProjectReference Include="..\..\..\Eve\packages\org.gamecult.eve.surface\GameCult.Eve.Surface.csproj" />
   </ItemGroup>
   <ItemGroup>