From 7fe030d918ab7e5293af5a0bd83243763aa689da Mon Sep 17 00:00:00 2001
From: George Rhoten <grhoten@users.noreply.github.com>
Date: Wed, 24 Mar 2004 23:09:55 +0000
Subject: [PATCH] ICU-3612 Don't explicitly specify the import libraries.  Use
 the project dependencies.

X-SVN-Rev: 14750
---
 icu4c/source/common/common.vcproj           |  6 ------
 icu4c/source/extra/uconv/uconv.vcproj       | 10 ++++------
 icu4c/source/extra/ustdio/ustdio.vcproj     |  6 ------
 icu4c/source/i18n/i18n.vcproj               |  6 ------
 icu4c/source/layout/layout.vcproj           |  4 ----
 icu4c/source/layoutex/layoutex.vcproj       |  4 ----
 icu4c/source/test/cintltst/cintltst.vcproj  |  6 ------
 icu4c/source/test/ieeetest/ieeetest.vcproj  |  6 ------
 icu4c/source/test/intltest/intltest.vcproj  |  6 ------
 icu4c/source/tools/genbrk/genbrk.vcproj     |  6 ------
 icu4c/source/tools/genccode/genccode.vcproj |  6 ------
 icu4c/source/tools/gencmn/decmn.vcproj      |  6 ------
 icu4c/source/tools/gencmn/gencmn.vcproj     |  6 ------
 icu4c/source/tools/gencnval/gencnval.vcproj |  6 ------
 icu4c/source/tools/gennames/gennames.vcproj |  6 ------
 icu4c/source/tools/gennorm/gennorm.vcproj   |  6 ------
 icu4c/source/tools/genpname/genpname.vcproj |  6 ------
 icu4c/source/tools/genprops/genprops.vcproj | 10 ++--------
 icu4c/source/tools/genrb/derb.vcproj        |  6 ------
 icu4c/source/tools/genrb/genrb.vcproj       |  6 ------
 icu4c/source/tools/gensprep/gensprep.vcproj |  6 ------
 icu4c/source/tools/gentest/gentest.vcproj   |  6 ------
 icu4c/source/tools/genuca/genuca.vcproj     |  6 ------
 icu4c/source/tools/icuswap/icuswap.vcproj   |  6 ------
 icu4c/source/tools/makeconv/makeconv.vcproj |  6 ------
 icu4c/source/tools/pkgdata/pkgdata.vcproj   |  6 ------
 26 files changed, 6 insertions(+), 154 deletions(-)

diff --git a/icu4c/source/common/common.vcproj b/icu4c/source/common/common.vcproj
index 23ee90a8427..43c9af8e1ce 100644
--- a/icu4c/source/common/common.vcproj
+++ b/icu4c/source/common/common.vcproj
@@ -41,12 +41,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icudata.lib"
 				OutputFile="..\..\bin\icuuc28.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\lib"
 				ProgramDatabaseFile=".\..\..\lib/icuuc28.pdb"
 				BaseAddress="0x4a800000"
 				ImportLibrary="..\..\lib\icuuc.lib"/>
@@ -107,12 +104,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icudata.lib"
 				OutputFile="..\..\bin\icuuc28d.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\..\..\lib/icuuc28d.pdb"
 				BaseAddress="0x4a800000"
diff --git a/icu4c/source/extra/uconv/uconv.vcproj b/icu4c/source/extra/uconv/uconv.vcproj
index a3f67a38f2e..3e3f07c9e01 100644
--- a/icu4c/source/extra/uconv/uconv.vcproj
+++ b/icu4c/source/extra/uconv/uconv.vcproj
@@ -41,12 +41,11 @@
 				Outputs="$(ProjectDir)..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuuc.lib icuin.lib uconvmsg.lib"
+				AdditionalDependencies="uconvmsg.lib"
 				OutputFile=".\Release/uconv.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib,Release"
+				AdditionalLibraryDirectories="Release"
 				ProgramDatabaseFile=".\Release/uconv.pdb"
 				SubSystem="1"/>
 			<Tool
@@ -104,12 +103,11 @@
 				Outputs="$(ProjectDir)..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuucd.lib icuind.lib uconvmsg.lib"
+				AdditionalDependencies="uconvmsg.lib"
 				OutputFile=".\Debug/uconv.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib,Debug"
+				AdditionalLibraryDirectories="Debug"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/uconv.pdb"
 				SubSystem="1"/>
diff --git a/icu4c/source/extra/ustdio/ustdio.vcproj b/icu4c/source/extra/ustdio/ustdio.vcproj
index 8f88e6bcbcd..d4d57cda75a 100644
--- a/icu4c/source/extra/ustdio/ustdio.vcproj
+++ b/icu4c/source/extra/ustdio/ustdio.vcproj
@@ -41,12 +41,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuuc.lib icuin.lib"
 				OutputFile="..\..\..\bin\icuio28.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib\"
 				ProgramDatabaseFile=".\..\..\..\lib/icuio28.pdb"
 				BaseAddress="0x4ab00000"
 				ImportLibrary="..\..\..\lib/icuio.lib"/>
@@ -111,12 +108,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuucd.lib icuind.lib"
 				OutputFile="..\..\..\bin\icuio28d.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="debug,..\..\..\lib\"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\..\..\..\lib/icuio28d.pdb"
 				BaseAddress="0x4ab00000"
diff --git a/icu4c/source/i18n/i18n.vcproj b/icu4c/source/i18n/i18n.vcproj
index 96ce175a782..b4f8780523b 100644
--- a/icu4c/source/i18n/i18n.vcproj
+++ b/icu4c/source/i18n/i18n.vcproj
@@ -42,12 +42,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuuc.lib"
 				OutputFile="..\..\bin\icuin28.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\lib"
 				ProgramDatabaseFile=".\..\..\lib/icuin28.pdb"
 				BaseAddress="0x4a900000"
 				ImportLibrary="..\..\lib\icuin.lib"/>
@@ -111,12 +108,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuucd.lib"
 				OutputFile="..\..\bin\icuin28d.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\..\..\lib/icuin28d.pdb"
 				BaseAddress="0x4a900000"
diff --git a/icu4c/source/layout/layout.vcproj b/icu4c/source/layout/layout.vcproj
index af7b6877b00..631ac6c1f0d 100644
--- a/icu4c/source/layout/layout.vcproj
+++ b/icu4c/source/layout/layout.vcproj
@@ -41,8 +41,6 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\..\lib\icuucd.lib"
 				OutputFile="..\..\bin\icule28d.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
@@ -108,8 +106,6 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\..\lib\icuuc.lib"
 				OutputFile="..\..\bin\icule28.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
diff --git a/icu4c/source/layoutex/layoutex.vcproj b/icu4c/source/layoutex/layoutex.vcproj
index 42aacd63416..6a463fc95a0 100644
--- a/icu4c/source/layoutex/layoutex.vcproj
+++ b/icu4c/source/layoutex/layoutex.vcproj
@@ -38,8 +38,6 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\..\lib\icuuc.lib ..\..\lib\icule.lib"
 				OutputFile="..\..\bin\iculx28.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -101,8 +99,6 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\..\lib\icuucd.lib ..\..\lib\iculed.lib"
 				OutputFile="..\..\bin\iculx28d.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
diff --git a/icu4c/source/test/cintltst/cintltst.vcproj b/icu4c/source/test/cintltst/cintltst.vcproj
index c784327d4c2..8432437d205 100644
--- a/icu4c/source/test/cintltst/cintltst.vcproj
+++ b/icu4c/source/test/cintltst/cintltst.vcproj
@@ -42,12 +42,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuucd.lib icuind.lib icutud.lib ctestfwd.lib"
 				OutputFile=".\Debug/cintltst.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib\"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/cintltst.pdb"
 				SubSystem="1"/>
@@ -106,12 +103,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuuc.lib icuin.lib ctestfw.lib icutu.lib"
 				OutputFile=".\Release/cintltst.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib\"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Release/cintltst.pdb"
 				SubSystem="1"/>
diff --git a/icu4c/source/test/ieeetest/ieeetest.vcproj b/icu4c/source/test/ieeetest/ieeetest.vcproj
index fd6d1852b2e..b92179cd7ef 100644
--- a/icu4c/source/test/ieeetest/ieeetest.vcproj
+++ b/icu4c/source/test/ieeetest/ieeetest.vcproj
@@ -41,12 +41,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuucd.lib"
 				OutputFile=".\Debug/ieeetest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/ieeetest.pdb"
 				SubSystem="1"/>
@@ -103,12 +100,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuuc.lib"
 				OutputFile=".\Release/ieeetest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib"
 				ProgramDatabaseFile=".\Release/ieeetest.pdb"
 				SubSystem="1"/>
 			<Tool
diff --git a/icu4c/source/test/intltest/intltest.vcproj b/icu4c/source/test/intltest/intltest.vcproj
index 564323843e3..f188444d3f0 100644
--- a/icu4c/source/test/intltest/intltest.vcproj
+++ b/icu4c/source/test/intltest/intltest.vcproj
@@ -42,12 +42,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuucd.lib icuind.lib ctestfwd.lib"
 				OutputFile=".\Debug/intltest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/intltest.pdb"
 				SubSystem="1"/>
@@ -105,12 +102,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuuc.lib icuin.lib ctestfw.lib"
 				OutputFile=".\Release/intltest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Release/intltest.pdb"
 				SubSystem="1"/>
diff --git a/icu4c/source/tools/genbrk/genbrk.vcproj b/icu4c/source/tools/genbrk/genbrk.vcproj
index eed1d73a62b..24018853159 100644
--- a/icu4c/source/tools/genbrk/genbrk.vcproj
+++ b/icu4c/source/tools/genbrk/genbrk.vcproj
@@ -42,12 +42,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuuc.lib icutu.lib"
 				OutputFile=".\Release/genbrk.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Release,..\..\..\lib"
 				ProgramDatabaseFile=".\Release/genbrk.pdb"
 				SubSystem="1"/>
 			<Tool
@@ -108,12 +105,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuucd.lib icutud.lib"
 				OutputFile=".\Debug/genbrk.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Debug,..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/genbrk.pdb"
 				SubSystem="1"/>
diff --git a/icu4c/source/tools/genccode/genccode.vcproj b/icu4c/source/tools/genccode/genccode.vcproj
index 3d629a16a75..7379af129d1 100644
--- a/icu4c/source/tools/genccode/genccode.vcproj
+++ b/icu4c/source/tools/genccode/genccode.vcproj
@@ -41,12 +41,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuuc.lib icutu.lib"
 				OutputFile=".\Release/genccode.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Release,..\..\..\lib"
 				ProgramDatabaseFile=".\Release/genccode.pdb"
 				SubSystem="1"/>
 			<Tool
@@ -105,12 +102,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuucd.lib icutud.lib"
 				OutputFile=".\Debug/genccode.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Debug,..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/genccode.pdb"
 				SubSystem="1"/>
diff --git a/icu4c/source/tools/gencmn/decmn.vcproj b/icu4c/source/tools/gencmn/decmn.vcproj
index b88df003913..3d0d1d4ee36 100644
--- a/icu4c/source/tools/gencmn/decmn.vcproj
+++ b/icu4c/source/tools/gencmn/decmn.vcproj
@@ -42,12 +42,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuuc.lib icutu.lib"
 				OutputFile=".\decmn_Win32_Release/decmn.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib"
 				ProgramDatabaseFile=".\decmn_Win32_Release/decmn.pdb"
 				SubSystem="1"/>
 			<Tool
@@ -108,12 +105,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuucd.lib icutud.lib"
 				OutputFile=".\decmn_Win32_Debug/decmn.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\decmn_Win32_Debug/decmn.pdb"
 				SubSystem="1"/>
diff --git a/icu4c/source/tools/gencmn/gencmn.vcproj b/icu4c/source/tools/gencmn/gencmn.vcproj
index f8a081ff0dc..8e51fbd36d8 100644
--- a/icu4c/source/tools/gencmn/gencmn.vcproj
+++ b/icu4c/source/tools/gencmn/gencmn.vcproj
@@ -42,12 +42,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuuc.lib icutu.lib"
 				OutputFile=".\Release/gencmn.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Release,..\..\..\lib"
 				ProgramDatabaseFile=".\Release/gencmn.pdb"
 				SubSystem="1"/>
 			<Tool
@@ -108,12 +105,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuucd.lib icutud.lib"
 				OutputFile=".\Debug/gencmn.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Debug,..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/gencmn.pdb"
 				SubSystem="1"/>
diff --git a/icu4c/source/tools/gencnval/gencnval.vcproj b/icu4c/source/tools/gencnval/gencnval.vcproj
index e5891fc04e1..5c6d5235686 100644
--- a/icu4c/source/tools/gencnval/gencnval.vcproj
+++ b/icu4c/source/tools/gencnval/gencnval.vcproj
@@ -42,12 +42,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuuc.lib icutu.lib"
 				OutputFile=".\Release/gencnval.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Release,..\..\..\lib"
 				ProgramDatabaseFile=".\Release/gencnval.pdb"
 				SubSystem="1"/>
 			<Tool
@@ -108,12 +105,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuucd.lib icutud.lib"
 				OutputFile=".\Debug/gencnval.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Debug,..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/gencnval.pdb"
 				SubSystem="1"/>
diff --git a/icu4c/source/tools/gennames/gennames.vcproj b/icu4c/source/tools/gennames/gennames.vcproj
index 28405c90d0b..b552c71fe2b 100644
--- a/icu4c/source/tools/gennames/gennames.vcproj
+++ b/icu4c/source/tools/gennames/gennames.vcproj
@@ -42,12 +42,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuuc.lib icutu.lib"
 				OutputFile=".\Release/gennames.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Release,..\..\..\lib\Release,..\..\..\lib"
 				ProgramDatabaseFile=".\Release/gennames.pdb"
 				SubSystem="1"/>
 			<Tool
@@ -108,12 +105,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuucd.lib icutud.lib"
 				OutputFile=".\Debug/gennames.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Debug,..\..\..\lib\Debug,..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/gennames.pdb"
 				SubSystem="1"/>
diff --git a/icu4c/source/tools/gennorm/gennorm.vcproj b/icu4c/source/tools/gennorm/gennorm.vcproj
index 73081806767..ed098248bf6 100644
--- a/icu4c/source/tools/gennorm/gennorm.vcproj
+++ b/icu4c/source/tools/gennorm/gennorm.vcproj
@@ -42,12 +42,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icutu.lib"
 				OutputFile=".\Release/gennorm.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Release,..\..\..\lib\Release,..\..\..\lib"
 				ProgramDatabaseFile=".\Release/gennorm.pdb"
 				SubSystem="1"/>
 			<Tool
@@ -108,12 +105,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icutud.lib"
 				OutputFile=".\Debug/gennorm.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Debug,..\..\..\lib\Debug,..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/gennorm.pdb"
 				SubSystem="1"/>
diff --git a/icu4c/source/tools/genpname/genpname.vcproj b/icu4c/source/tools/genpname/genpname.vcproj
index fe6eb84f08c..a10a7607a49 100644
--- a/icu4c/source/tools/genpname/genpname.vcproj
+++ b/icu4c/source/tools/genpname/genpname.vcproj
@@ -42,12 +42,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuuc.lib icutu.lib"
 				OutputFile=".\Release/genpname.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Release,..\..\..\lib"
 				ProgramDatabaseFile=".\Release/genpname.pdb"
 				SubSystem="1"/>
 			<Tool
@@ -108,12 +105,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuucd.lib icutud.lib"
 				OutputFile=".\Debug/genpname.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Debug,..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/genpname.pdb"
 				SubSystem="1"/>
diff --git a/icu4c/source/tools/genprops/genprops.vcproj b/icu4c/source/tools/genprops/genprops.vcproj
index 9b3a1cef34c..f09fee0de76 100644
--- a/icu4c/source/tools/genprops/genprops.vcproj
+++ b/icu4c/source/tools/genprops/genprops.vcproj
@@ -42,12 +42,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuuc.lib icutu.lib"
 				OutputFile=".\Release/genprops.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Release,..\..\..\lib\Release,..\..\..\lib"
 				ProgramDatabaseFile=".\Release/genprops.pdb"
 				SubSystem="1"/>
 			<Tool
@@ -108,12 +105,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuucd.lib icutud.lib"
 				OutputFile=".\Debug/genprops.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Debug,..\..\..\lib\Debug,..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/genprops.pdb"
 				SubSystem="1"/>
@@ -147,7 +141,7 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="c;cpp;rc">
 			<File
 				RelativePath=".\genprops.c">
 			</File>
@@ -163,7 +157,7 @@
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h">
 			<File
 				RelativePath=".\genprops.h">
 			</File>
diff --git a/icu4c/source/tools/genrb/derb.vcproj b/icu4c/source/tools/genrb/derb.vcproj
index 5d9e343ad78..99f14895935 100644
--- a/icu4c/source/tools/genrb/derb.vcproj
+++ b/icu4c/source/tools/genrb/derb.vcproj
@@ -42,12 +42,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuuc.lib icutu.lib"
 				OutputFile=".\derb_Win32_Release/derb.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib"
 				ProgramDatabaseFile=".\derb_Win32_Release/derb.pdb"
 				SubSystem="1"/>
 			<Tool
@@ -111,12 +108,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuucd.lib icutud.lib"
 				OutputFile=".\derb_Win32_Debug/derb.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\derb_Win32_Debug/derb.pdb"
 				SubSystem="1"/>
diff --git a/icu4c/source/tools/genrb/genrb.vcproj b/icu4c/source/tools/genrb/genrb.vcproj
index 3e9d5051605..4fa362705a2 100644
--- a/icu4c/source/tools/genrb/genrb.vcproj
+++ b/icu4c/source/tools/genrb/genrb.vcproj
@@ -40,12 +40,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuin.lib icuuc.lib icutu.lib"
 				OutputFile=".\Release/genrb.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Release,..\..\..\lib"
 				ProgramDatabaseFile=".\Release/genrb.pdb"
 				SubSystem="1"/>
 			<Tool
@@ -106,12 +103,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuind.lib icuucd.lib icutud.lib"
 				OutputFile=".\Debug/genrb.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Debug,..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/genrb.pdb"
 				SubSystem="1"/>
diff --git a/icu4c/source/tools/gensprep/gensprep.vcproj b/icu4c/source/tools/gensprep/gensprep.vcproj
index c5df4d19c09..d984e261220 100644
--- a/icu4c/source/tools/gensprep/gensprep.vcproj
+++ b/icu4c/source/tools/gensprep/gensprep.vcproj
@@ -42,12 +42,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuuc.lib icutu.lib"
 				OutputFile=".\Release/gensprep.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib"
 				ProgramDatabaseFile=".\Release/gensprep.pdb"
 				SubSystem="1"/>
 			<Tool
@@ -105,12 +102,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icutud.lib icuucd.lib"
 				OutputFile=".\Debug/gensprep.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/gensprep.pdb"
 				SubSystem="1"/>
diff --git a/icu4c/source/tools/gentest/gentest.vcproj b/icu4c/source/tools/gentest/gentest.vcproj
index c182a3010e8..4397f3747d9 100644
--- a/icu4c/source/tools/gentest/gentest.vcproj
+++ b/icu4c/source/tools/gentest/gentest.vcproj
@@ -39,12 +39,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuuc.lib icutu.lib"
 				OutputFile=".\Release/gentest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Release,..\..\..\lib"
 				ProgramDatabaseFile=".\Release/gentest.pdb"
 				SubSystem="1"/>
 			<Tool
@@ -102,12 +99,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuucd.lib icutud.lib"
 				OutputFile=".\Debug/gentest.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\debug\,..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/gentest.pdb"
 				SubSystem="1"/>
diff --git a/icu4c/source/tools/genuca/genuca.vcproj b/icu4c/source/tools/genuca/genuca.vcproj
index f84a95fd8a9..e4962744e2c 100644
--- a/icu4c/source/tools/genuca/genuca.vcproj
+++ b/icu4c/source/tools/genuca/genuca.vcproj
@@ -44,12 +44,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuucd.lib icuind.lib icutud.lib"
 				OutputFile=".\Debug/genuca.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/genuca.pdb"
 				SubSystem="1"/>
@@ -109,12 +106,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuin.lib icuuc.lib icutu.lib"
 				OutputFile=".\Release/genuca.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\toolutil\Release,..\..\..\lib"
 				ProgramDatabaseFile=".\Release/genuca.pdb"
 				SubSystem="1"/>
 			<Tool
diff --git a/icu4c/source/tools/icuswap/icuswap.vcproj b/icu4c/source/tools/icuswap/icuswap.vcproj
index ac11573fa68..030a991d275 100644
--- a/icu4c/source/tools/icuswap/icuswap.vcproj
+++ b/icu4c/source/tools/icuswap/icuswap.vcproj
@@ -42,12 +42,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuin.lib icuuc.lib icutu.lib"
 				OutputFile=".\Release/icuswap.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib"
 				ProgramDatabaseFile=".\Release/icuswap.pdb"
 				SubSystem="1"/>
 			<Tool
@@ -108,12 +105,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuind.lib icuucd.lib icutud.lib"
 				OutputFile=".\Debug/icuswap.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/icuswap.pdb"
 				SubSystem="1"/>
diff --git a/icu4c/source/tools/makeconv/makeconv.vcproj b/icu4c/source/tools/makeconv/makeconv.vcproj
index e3ed227eba7..614528a672b 100644
--- a/icu4c/source/tools/makeconv/makeconv.vcproj
+++ b/icu4c/source/tools/makeconv/makeconv.vcproj
@@ -44,12 +44,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuucd.lib icutud.lib"
 				OutputFile=".\Debug/makeconv.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/makeconv.pdb"
 				SubSystem="1"/>
@@ -107,12 +104,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuuc.lib icutu.lib"
 				OutputFile=".\Release/makeconv.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib"
 				ProgramDatabaseFile=".\Release/makeconv.pdb"
 				SubSystem="1"/>
 			<Tool
diff --git a/icu4c/source/tools/pkgdata/pkgdata.vcproj b/icu4c/source/tools/pkgdata/pkgdata.vcproj
index e5690067f54..89b358afe02 100644
--- a/icu4c/source/tools/pkgdata/pkgdata.vcproj
+++ b/icu4c/source/tools/pkgdata/pkgdata.vcproj
@@ -44,12 +44,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuucd.lib icutud.lib"
 				OutputFile=".\Debug/pkgdata.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../../../lib/debug,../toolutil/debug,..\toolutil\Debug,..\..\..\lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/pkgdata.pdb"
 				SubSystem="1"/>
@@ -109,12 +106,9 @@
 				Outputs="..\..\..\bin\$(TargetFileName)"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="icuuc.lib icutu.lib"
 				OutputFile=".\Release/pkgdata.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../../../lib/release,../toolutil/release,..\toolutil\Release,..\..\..\lib"
 				ProgramDatabaseFile=".\Release/pkgdata.pdb"
 				SubSystem="1"/>
 			<Tool