From b367501c23eafa1f24b7aeae684fd7357c2109c3 Mon Sep 17 00:00:00 2001
From: Chris Peyer <cpeyer@adobe.com>
Date: Tue, 24 Aug 2010 15:52:04 -0700
Subject: [PATCH] Bug 478714 VS Project Patch (p=jsudduth, r=wsharp)

---
 platform/win32/shell2008.vcproj | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/platform/win32/shell2008.vcproj b/platform/win32/shell2008.vcproj
index 0b5c7c49..3b9e269a 100644
--- a/platform/win32/shell2008.vcproj
+++ b/platform/win32/shell2008.vcproj
@@ -77,7 +77,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/FIXED:NO"
 				AdditionalDependencies="winmm.lib DbgHelp.lib shlwapi.lib"
-				OutputFile="$(OutDir)/avmplus_d.exe"
+				OutputFile="$(OutDir)/avm.exe"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
 				RandomizedBaseAddress="1"
@@ -162,7 +162,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/FIXED:NO"
 				AdditionalDependencies="winmm.lib shlwapi.lib"
-				OutputFile="$(OutDir)/avmplus_d_64.exe"
+				OutputFile="$(OutDir)/avm.exe"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
 				LargeAddressAware="2"
@@ -248,7 +248,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="winmm.lib"
-				OutputFile="$(OutDir)/avmplus.exe"
+				OutputFile="$(OutDir)/avm.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
@@ -335,7 +335,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="winmm.lib"
-				OutputFile="$(OutDir)/avmplus_64.exe"
+				OutputFile="$(OutDir)/avm.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				AssemblyDebug="1"
@@ -423,7 +423,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="winmm.lib"
-				OutputFile="$(OutDir)/avmplus_s.exe"
+				OutputFile="$(OutDir)/avm.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
@@ -509,7 +509,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="winmm.lib"
-				OutputFile="$(OutDir)/avmplus_s_64.exe"
+				OutputFile="$(OutDir)/avm.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
@@ -595,7 +595,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/FIXED:NO"
 				AdditionalDependencies="winmm.lib DbgHelp.lib shlwapi.lib"
-				OutputFile="$(OutDir)/avmplus_sd.exe"
+				OutputFile="$(OutDir)/avm.exe"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
@@ -680,7 +680,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/FIXED:NO"
 				AdditionalDependencies="winmm.lib shlwapi.lib"
-				OutputFile="$(OutDir)/avmplus_sd_64.exe"
+				OutputFile="$(OutDir)/avm.exe"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
@@ -766,7 +766,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/fixed:no"
 				AdditionalDependencies="winmm.lib JitProfiling.lib"
-				OutputFile="$(OutDir)/avmplus.exe"
+				OutputFile="$(OutDir)/avm.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\..\modules\vtune\ia32\libcmt"
 				GenerateDebugInformation="true"
@@ -854,7 +854,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="winmm.lib"
-				OutputFile="$(OutDir)/avmplus_64.exe"
+				OutputFile="$(OutDir)/avm.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				AssemblyDebug="1"
@@ -943,7 +943,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="winmm.lib"
-				OutputFile="$(OutDir)/avmplus.exe"
+				OutputFile="$(OutDir)/avm.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
@@ -1030,7 +1030,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="winmm.lib"
-				OutputFile="$(OutDir)/avmplus_64.exe"
+				OutputFile="$(OutDir)/avm.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				AssemblyDebug="1"
@@ -1120,7 +1120,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="mmtimer.lib corelibc.lib coredll.lib"
-				OutputFile="$(OutDir)/avmplus_d.exe"
+				OutputFile="$(OutDir)/avm.exe"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
 				EntryPointSymbol="mainWCRTStartup"
@@ -1211,7 +1211,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="mmtimer.lib corelibc.lib coredll.lib"
-				OutputFile="$(OutDir)/avmplus.exe"
+				OutputFile="$(OutDir)/avm.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
@@ -1304,7 +1304,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="winmm.lib"
-				OutputFile="$(OutDir)/avmplus_s.exe"
+				OutputFile="$(OutDir)/avm.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
@@ -1395,7 +1395,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/FIXED:NO"
 				AdditionalDependencies="winmm.lib DbgHelp.lib"
-				OutputFile="$(OutDir)/avmplus_sd.exe"
+				OutputFile="$(OutDir)/avm.exe"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
@@ -1548,7 +1548,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="mmtimer.lib corelibc.lib coredll.lib"
-				OutputFile="$(OutDir)/avmplus.exe"
+				OutputFile="$(OutDir)/avm.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
-- 
2.11.4.GIT