From 7fba7a08bce4ade8845acbb7d9bdf97b04dd8a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Sun, 29 Jun 2014 13:33:39 +0300
Subject: [PATCH 1/3] Set ProgramDatabaseFile to the default used in all other
 project files

---
 codec/build/win32/dec/WelsDecPlus.vcproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/codec/build/win32/dec/WelsDecPlus.vcproj b/codec/build/win32/dec/WelsDecPlus.vcproj
index b942d693..9c4a54e5 100644
--- a/codec/build/win32/dec/WelsDecPlus.vcproj
+++ b/codec/build/win32/dec/WelsDecPlus.vcproj
@@ -83,7 +83,7 @@
 				AdditionalLibraryDirectories=".\..\..\..\libs\Release\"
 				ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\..\..\..\maps\Release\welsdec.pdb"
+				ProgramDatabaseFile="$(OutDir)\welsdec.pdb"
 				GenerateMapFile="true"
 				MapFileName=".\..\..\..\maps\Release\welsdec.map"
 				RandomizedBaseAddress="1"
@@ -179,7 +179,7 @@
 				AdditionalLibraryDirectories=".\..\..\..\libs\Release\"
 				ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\..\..\..\maps\Release\welsdec.pdb"
+				ProgramDatabaseFile="$(OutDir)\welsdec.pdb"
 				GenerateMapFile="true"
 				MapFileName=".\..\..\..\maps\Release\welsdec.map"
 				RandomizedBaseAddress="1"
@@ -274,7 +274,7 @@
 				AdditionalLibraryDirectories="..\..\..\libs\debug"
 				ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\..\..\..\..\bin\win32\Debug/welsdec.pdb"
+				ProgramDatabaseFile="$(OutDir)\welsdec.pdb"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
 				ImportLibrary="$(OutDir)\welsdec.lib"
@@ -367,7 +367,7 @@
 				AdditionalLibraryDirectories="..\..\..\libs\debug"
 				ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\..\..\..\..\bin\win32\Debug/welsdec.pdb"
+				ProgramDatabaseFile="$(OutDir)\welsdec.pdb"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
 				ImportLibrary="$(OutDir)\welsdec.lib"

From 157935e9a0484d536788e312acae3847f2465255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Sun, 29 Jun 2014 13:35:49 +0300
Subject: [PATCH 2/3] Write map files to the default directory instead of a
 custom directory

---
 codec/build/win32/dec/WelsDecPlus.vcproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/codec/build/win32/dec/WelsDecPlus.vcproj b/codec/build/win32/dec/WelsDecPlus.vcproj
index 9c4a54e5..8dd03fbe 100644
--- a/codec/build/win32/dec/WelsDecPlus.vcproj
+++ b/codec/build/win32/dec/WelsDecPlus.vcproj
@@ -85,7 +85,7 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\welsdec.pdb"
 				GenerateMapFile="true"
-				MapFileName=".\..\..\..\maps\Release\welsdec.map"
+				MapFileName="$(OutDir)\welsdec.map"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
 				ImportLibrary="$(OutDir)\welsdec.lib"
@@ -181,7 +181,7 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\welsdec.pdb"
 				GenerateMapFile="true"
-				MapFileName=".\..\..\..\maps\Release\welsdec.map"
+				MapFileName="$(OutDir)\welsdec.map"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
 				ImportLibrary="$(OutDir)\welsdec.lib"

From 3a43c6bad46c1c70a63870828c90f1780d03f794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Sun, 29 Jun 2014 13:41:10 +0300
Subject: [PATCH 3/3] Remove custom, manual linker options for the encoder in
 the MSVC project files

---
 codec/build/win32/enc/WelsEncCore.vcproj | 2 --
 codec/build/win32/enc/WelsEncPlus.vcproj | 2 --
 2 files changed, 4 deletions(-)

diff --git a/codec/build/win32/enc/WelsEncCore.vcproj b/codec/build/win32/enc/WelsEncCore.vcproj
index 80737bf9..8f7bb898 100644
--- a/codec/build/win32/enc/WelsEncCore.vcproj
+++ b/codec/build/win32/enc/WelsEncCore.vcproj
@@ -233,7 +233,6 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalOptions="/LTCG"
 				OutputFile="$(OutDir)\welsecore.lib"
 			/>
 			<Tool
@@ -314,7 +313,6 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalOptions="/LTCG"
 				OutputFile="$(OutDir)\welsecore.lib"
 			/>
 			<Tool
diff --git a/codec/build/win32/enc/WelsEncPlus.vcproj b/codec/build/win32/enc/WelsEncPlus.vcproj
index 102d519d..11c5a467 100644
--- a/codec/build/win32/enc/WelsEncPlus.vcproj
+++ b/codec/build/win32/enc/WelsEncPlus.vcproj
@@ -270,7 +270,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MAPINFO:exports /LTCG"
 				AdditionalDependencies="$(OutDir)\welsecore.lib"
 				OutputFile="$(OutDir)\welsenc.dll"
 				LinkIncremental="1"
@@ -371,7 +370,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MAPINFO:exports /LTCG"
 				AdditionalDependencies="$(OutDir)\welsecore.lib"
 				OutputFile="$(OutDir)\welsenc.dll"
 				LinkIncremental="1"