From 9111cc78c12d2988bfdf7e0a13ec3c272645a7b7 Mon Sep 17 00:00:00 2001
From: Andrew Bernat <bernat@cs.wisc.edu>
Date: Fri, 8 Jun 2012 11:21:19 -0500
Subject: [PATCH] Fix Windows compiler warnings

---
 common/common.vcproj                 | 2 +-
 dyninstAPI/dyninstAPI.vcproj         | 6 +++---
 dyninstAPI_RT/DyninstAPI_RT.vcproj   | 2 +-
 instructionAPI/instructionAPI.vcproj | 2 +-
 parseAPI/parseAPI.vcproj             | 2 +-
 symtabAPI/symtabAPI.vcproj           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/common.vcproj b/common/common.vcproj
index 86e85af..1b3e883 100644
--- a/common/common.vcproj
+++ b/common/common.vcproj
@@ -66,7 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Psapi.lib"
-				OutputFile="$(OutDir)\libcommon.dll"
+				OutputFile="$(OutDir)\$(ProjectName).dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../i386-unknown-nt4.0/lib"
diff --git a/dyninstAPI/dyninstAPI.vcproj b/dyninstAPI/dyninstAPI.vcproj
index ff7c678..3a29f5f 100644
--- a/dyninstAPI/dyninstAPI.vcproj
+++ b/dyninstAPI/dyninstAPI.vcproj
@@ -66,7 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Psapi.lib dbghelp.lib Ws2_32.lib libcommon.lib libsymtabAPI.lib"
-				OutputFile="$(OutDir)\libdyninstAPI.dll"
+				OutputFile="$(OutDir)\$(ProjectName).dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../i386-unknown-nt4.0/lib"
@@ -2249,11 +2249,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\src\Relocation\Widgets\Include.h"
+				RelativePath=".\src\Relocation\Transformers\Include.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\Relocation\Transformers\Include.h"
+				RelativePath=".\src\Relocation\Widgets\Include.h"
 				>
 			</File>
 			<File
diff --git a/dyninstAPI_RT/DyninstAPI_RT.vcproj b/dyninstAPI_RT/DyninstAPI_RT.vcproj
index 9c5daa6..ecee294 100644
--- a/dyninstAPI_RT/DyninstAPI_RT.vcproj
+++ b/dyninstAPI_RT/DyninstAPI_RT.vcproj
@@ -65,7 +65,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/SECTION:.bss,RWE"
 				AdditionalDependencies="Ws2_32.lib"
-				OutputFile="$(OutDir)\libdyninstAPI_RT.dll"
+				OutputFile="$(OutDir)\$(ProjectName).dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				AssemblyDebug="1"
diff --git a/instructionAPI/instructionAPI.vcproj b/instructionAPI/instructionAPI.vcproj
index ffd6e92..11b85e6 100644
--- a/instructionAPI/instructionAPI.vcproj
+++ b/instructionAPI/instructionAPI.vcproj
@@ -66,7 +66,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\libinstructionAPI.dll"
+				OutputFile="$(OutDir)\$(ProjectName).dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../i386-unknown-nt4.0/lib"
diff --git a/parseAPI/parseAPI.vcproj b/parseAPI/parseAPI.vcproj
index e659e78..38e9a04 100644
--- a/parseAPI/parseAPI.vcproj
+++ b/parseAPI/parseAPI.vcproj
@@ -65,7 +65,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/libparseAPI.dll"
+				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="&quot;../../i386-unknown-nt4.0/lib&quot;"
diff --git a/symtabAPI/symtabAPI.vcproj b/symtabAPI/symtabAPI.vcproj
index 6a62591..eb41eae 100644
--- a/symtabAPI/symtabAPI.vcproj
+++ b/symtabAPI/symtabAPI.vcproj
@@ -66,7 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="dbghelp.lib Ws2_32.lib"
-				OutputFile="$(OutDir)\libsymtabAPI.dll"
+				OutputFile="$(OutDir)\$(ProjectName).dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="&quot;../../i386-unknown-nt4.0/lib&quot;"
-- 
1.8.3.1