From 5724de13b0590a3b80b85cb0820a1734445e891e Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Mon, 18 Apr 2022 14:34:54 -0700
Subject: [PATCH 1/3] msbuild: brepro -> deterministic

---
 Source/VSProps/Base.props | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
index b7da386cae..0e2ed4daf3 100644
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@@ -5,7 +5,7 @@
     <IntDir>$(BuildRootDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <OutDir>$(IntDir)bin\</OutDir>
     <TargetName Condition="'$(ConfigurationType)'=='Application'">$(ProjectName)$(TargetSuffix)</TargetName>
-    <!--Set link /INCREMENTAL:NO to remove some entropy from builds (assists with /Brepro)-->
+    <!--Set link /INCREMENTAL:NO to remove some entropy from builds (assists with deterministic build)-->
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup>
@@ -126,7 +126,6 @@
       4946  Reinterpret cast between related types
       -->
       <AdditionalOptions>/w44263 /w44265 /w44946 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions>/Brepro %(AdditionalOptions)</AdditionalOptions>
       <!--
         A (currently) hidden switch, like /Brepro, furthermore enabling warnings about non-deterministic code.
         This may be advantageous over /Brepro, which inits __DATE__, __TIME__, etc. equal to 1 (and allows
@@ -158,7 +157,7 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
-      <AdditionalOptions>/Brepro %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/experimental:deterministic %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <!--Link Release-->
     <Link Condition="'$(Configuration)'=='Release'">
@@ -184,7 +183,7 @@
     <Lib>
       <TreatLibWarningAsErrors>true</TreatLibWarningAsErrors>
       <LinkTimeCodeGeneration Condition="'$(DolphinRelease)'=='true'">true</LinkTimeCodeGeneration>
-      <AdditionalOptions>/Brepro %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/experimental:deterministic %(AdditionalOptions)</AdditionalOptions>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup />

From f2c5c052bc5402856123b0f57c7c5a50be97ba49 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Mon, 18 Apr 2022 14:39:04 -0700
Subject: [PATCH 2/3] msbuild: use pdbaltpath to strip dirname of pdb

---
 Source/VSProps/Base.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
index 0e2ed4daf3..5235e57eb6 100644
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@@ -158,6 +158,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
       <AdditionalOptions>/experimental:deterministic %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/PDBALTPATH:Build\$(Platform)\$(Configuration)\$(ProjectName)\bin\%_PDB% %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <!--Link Release-->
     <Link Condition="'$(Configuration)'=='Release'">

From eb87245be8de21c12ba895b4117298120adf0580 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Mon, 18 Apr 2022 14:43:15 -0700
Subject: [PATCH 3/3] msbuild: use pathmap to unify source paths embedded in
 objects

---
 Source/VSProps/Base.props | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
index 5235e57eb6..563086055c 100644
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@@ -132,6 +132,15 @@
         them to be redefined), which could have unexpected results.
       -->
       <AdditionalOptions>/experimental:deterministic %(AdditionalOptions)</AdditionalOptions>
+      <!--
+        pathmap replaces path prefixes of source files with a hardcoded value, assisting with keeping output
+        files uniform even if actually built from different locations. The mapped path doesn't really need full
+        drive prefix, but it keeps things human readable. Note the trailing "\" is actually to be escaped by a
+        preceeding "\" in the expanded variable.
+      -->
+      <AdditionalOptions>/pathmap:"$(DolphinRootDir)\"=d:\ %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/pathmap:"$(WindowsSdkDir)\"=w:\ %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/pathmap:"$(VCToolsetsDir)\"=v:\ %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <!--ClCompile Debug-->
     <ClCompile Condition="'$(Configuration)'=='Debug'">