Project updates.

* olmod now targets Windows SDK 10.0.18362.0, as 8.1 is deprecated. * Turned off whole program optimization, as this was causing build failure. * Better modularized the Overload-specific dependencies. Instead of updating .csproj with the location of your Overload directory for each reference, now you just do it once in Directory.Build.targets.
overload-development-community · Jul 28, 2020 · d419b89 · d419b89
1 parent 127bd44
commit d419b89
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/GameMod/Directory.Build.targets b/GameMod/Directory.Build.targets
@@ -0,0 +1,5 @@
+<Project>
+    <PropertyGroup>
+        <OverloadDir>..\..\..\Program Files (x86)\Steam\steamapps\common\Overload</OverloadDir>
+    </PropertyGroup>
+</Project>
diff --git a/GameMod/GameMod.csproj b/GameMod/GameMod.csproj
@@ -4,6 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <OverloadDir Condition=" '$(OverloadDir)' == '' ">..\..\..\Program Files (x86)\Steam\steamapps\common\Overload</OverloadDir>
     <ProjectGuid>{FB32EB50-DE78-4FFB-8DE8-C3C8A82E8B62}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -36,19 +37,19 @@
       <HintPath>.\0Harmony.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-CSharp">
-      <HintPath>..\..\..\Program Files (x86)\Steam\steamapps\common\Overload\Overload_Data\Managed\Assembly-CSharp.dll</HintPath>
+      <HintPath>$(OverloadDir)\Overload_Data\Managed\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Steam\steamapps\common\Overload\Overload_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
+      <HintPath>$(OverloadDir)\Overload_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
     </Reference>
     <Reference Include="DotNetZip, Version=1.10.1.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Steam\steamapps\common\Overload\Overload_Data\Managed\DotNetZip.dll</HintPath>
+      <HintPath>$(OverloadDir)\Overload_Data\Managed\DotNetZip.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Steam\steamapps\common\Overload\Overload_Data\Managed\Newtonsoft.Json.dll</HintPath>
+      <HintPath>$(OverloadDir)\Overload_Data\Managed\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -58,38 +59,38 @@
     <Reference Include="System.Xml" />
     <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Steam\steamapps\common\Overload\Overload_Data\Managed\UnityEngine.dll</HintPath>
+      <HintPath>$(OverloadDir)\Overload_Data\Managed\UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.AudioModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Steam\steamapps\common\Overload\Overload_Data\Managed\UnityEngine.AudioModule.dll</HintPath>
+      <HintPath>$(OverloadDir)\Overload_Data\Managed\UnityEngine.AudioModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.CoreModule">
-      <HintPath>..\..\..\Program Files (x86)\Steam\steamapps\common\Overload\Overload_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
+      <HintPath>$(OverloadDir)\Overload_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.IMGUIModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Steam\steamapps\common\Overload\Overload_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
+      <HintPath>$(OverloadDir)\Overload_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.Networking, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Steam\steamapps\common\Overload\Overload_Data\Managed\UnityEngine.Networking.dll</HintPath>
+      <HintPath>$(OverloadDir)\Overload_Data\Managed\UnityEngine.Networking.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.ParticleSystemModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Steam\steamapps\common\Overload\Overload_Data\Managed\UnityEngine.ParticleSystemModule.dll</HintPath>
+      <HintPath>$(OverloadDir)\Overload_Data\Managed\UnityEngine.ParticleSystemModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Steam\steamapps\common\Overload\Overload_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
+      <HintPath>$(OverloadDir)\Overload_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.UnityWebRequestModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Steam\steamapps\common\Overload\Overload_Data\Managed\UnityEngine.UnityWebRequestModule.dll</HintPath>
+      <HintPath>$(OverloadDir)\Overload_Data\Managed\UnityEngine.UnityWebRequestModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.UnityWebRequestWWWModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Steam\steamapps\common\Overload\Overload_Data\Managed\UnityEngine.UnityWebRequestWWWModule.dll</HintPath>
+      <HintPath>$(OverloadDir)\Overload_Data\Managed\UnityEngine.UnityWebRequestWWWModule.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -156,6 +157,7 @@
     <Content Include="0Harmony.dll" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Directory.Build.targets" />
     <None Include="olmodsettings.json" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/olmod/olmod.vcxproj b/olmod/olmod.vcxproj
@@ -15,7 +15,7 @@
     <ProjectGuid>{CFB62AD7-1212-4E0F-A695-1503E89A578F}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>olmod</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -79,6 +79,7 @@
       <ConformanceMode>true</ConformanceMode>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>