From c5ad4664f9ab734b814d74a35b07cce432b0afa4 Mon Sep 17 00:00:00 2001
From: Jeff Genovy <29107334+jefgen@users.noreply.github.com>
Date: Mon, 19 Aug 2019 17:28:51 -0700
Subject: [PATCH] ICU-20768 Remove fixed DLL base addresses when building
Windows DLLs.
Remove redundant FixedBaseAddress entries from the vcxproj files.
Make the pkgdata -b option a no-op, and output a message to the user.
---
.../Build.Windows.ProjectConfiguration.props | 1 +
icu4c/source/common/common.vcxproj | 1 -
icu4c/source/config/mh-cygwin-msvc | 12 ++++++------
icu4c/source/config/mh-msys-msvc | 12 ++++++------
icu4c/source/extra/uconv/uconv.vcxproj | 2 --
icu4c/source/i18n/i18n.vcxproj | 5 -----
icu4c/source/io/io.vcxproj | 5 -----
icu4c/source/layoutex/layoutex.vcxproj | 5 -----
icu4c/source/samples/break/break.vcxproj | 4 ----
icu4c/source/samples/cal/cal.vcxproj | 4 ----
icu4c/source/samples/case/case.vcxproj | 4 ----
icu4c/source/samples/citer/citer.vcxproj | 4 ----
icu4c/source/samples/coll/coll.vcxproj | 4 ----
icu4c/source/samples/csdet/csdet.vcxproj | 4 ----
icu4c/source/samples/date/date.vcxproj | 4 ----
icu4c/source/samples/datefmt/datefmt.vcxproj | 4 ----
icu4c/source/samples/layout/layout.vcxproj | 4 ----
icu4c/source/samples/legacy/legacy.vcxproj | 4 ----
icu4c/source/samples/msgfmt/msgfmt.vcxproj | 4 ----
icu4c/source/samples/numfmt/numfmt.vcxproj | 4 ----
icu4c/source/samples/props/props.vcxproj | 4 ----
icu4c/source/samples/strsrch/strsrch.vcxproj | 4 ----
.../source/samples/translit/translit.vcxproj | 4 ----
icu4c/source/samples/uciter8/uciter8.vcxproj | 4 ----
icu4c/source/samples/ucnv/ucnv.vcxproj | 4 ----
icu4c/source/samples/udata/reader.vcxproj | 4 ----
icu4c/source/samples/udata/writer.vcxproj | 4 ----
.../source/samples/ufortune/ufortune.vcxproj | 2 --
icu4c/source/samples/ugrep/ugrep.vcxproj | 4 ----
icu4c/source/samples/uresb/uresb.vcxproj | 4 ----
icu4c/source/samples/ustring/ustring.vcxproj | 4 ----
icu4c/source/stubdata/stubdata.vcxproj | 6 ------
icu4c/source/test/cintltst/cintltst.vcxproj | 4 ----
icu4c/source/test/intltest/intltest.vcxproj | 4 ----
icu4c/source/test/iotest/iotest.vcxproj | 2 --
icu4c/source/test/letest/gendata.vcxproj | 4 ----
icu4c/source/test/letest/letest.vcxproj | 2 --
.../test/perf/DateFmtPerf/DateFmtPerf.vcxproj | 1 -
.../test/perf/charperf/charperf.vcxproj | 4 ----
.../test/perf/collperf/collperf.vcxproj | 4 ----
.../test/perf/collperf2/collperf2.vcxproj | 4 ----
.../test/perf/convperf/convperf.vcxproj | 4 ----
.../test/perf/normperf/dtfmtrtperf.vcxproj | 4 ----
.../test/perf/normperf/normperf.vcxproj | 4 ----
.../test/perf/strsrchperf/strsrchperf.vcxproj | 4 ----
.../test/perf/ubrkperf/ubrkperf.vcxproj | 4 ----
.../test/perf/unisetperf/unisetperf.vcxproj | 4 ----
.../test/perf/usetperf/usetperf.vcxproj | 4 ----
.../test/perf/ustrperf/stringperf.vcxproj | 4 ----
.../source/test/perf/utfperf/utfperf.vcxproj | 4 ----
.../test/perf/utrie2perf/utrie2perf.vcxproj | 4 ----
icu4c/source/tools/ctestfw/ctestfw.vcxproj | 2 --
icu4c/source/tools/genbrk/genbrk.vcxproj | 2 --
icu4c/source/tools/genccode/genccode.vcxproj | 2 --
icu4c/source/tools/gencfu/gencfu.vcxproj | 1 -
icu4c/source/tools/gencmn/gencmn.vcxproj | 2 --
icu4c/source/tools/gencnval/gencnval.vcxproj | 2 --
icu4c/source/tools/gendict/gendict.vcxproj | 2 --
icu4c/source/tools/gennorm2/gennorm2.vcxproj | 4 ----
icu4c/source/tools/genrb/derb.vcxproj | 2 --
icu4c/source/tools/genrb/genrb.vcxproj | 2 --
icu4c/source/tools/gensprep/gensprep.vcxproj | 2 --
icu4c/source/tools/gentest/gentest.vcxproj | 2 --
icu4c/source/tools/icuinfo/icuinfo.vcxproj | 2 --
icu4c/source/tools/icuinfo/testplug.vcxproj | 2 --
icu4c/source/tools/icupkg/icupkg.vcxproj | 2 --
icu4c/source/tools/makeconv/makeconv.vcxproj | 2 --
icu4c/source/tools/pkgdata/pkgdata.cpp | 19 +++++++------------
icu4c/source/tools/pkgdata/pkgdata.vcxproj | 2 --
icu4c/source/tools/toolutil/toolutil.vcxproj | 6 ------
icu4c/source/tools/tzcode/icuzdump.vcxproj | 2 --
71 files changed, 20 insertions(+), 250 deletions(-)
diff --git a/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props b/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props
index 3557e9c7354..e262a01b333 100644
--- a/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props
+++ b/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props
@@ -61,6 +61,7 @@
true
+ true
diff --git a/icu4c/source/common/common.vcxproj b/icu4c/source/common/common.vcxproj
index f8368bbdee8..19968c83ee5 100644
--- a/icu4c/source/common/common.vcxproj
+++ b/icu4c/source/common/common.vcxproj
@@ -58,7 +58,6 @@
icudt.lib;%(AdditionalDependencies)
- 0x4a800000
diff --git a/icu4c/source/config/mh-cygwin-msvc b/icu4c/source/config/mh-cygwin-msvc
index 0db6b2654fa..31ac458d308 100644
--- a/icu4c/source/config/mh-cygwin-msvc
+++ b/icu4c/source/config/mh-cygwin-msvc
@@ -121,13 +121,13 @@ LIBCTESTFW= $(top_builddir)/tools/ctestfw/$(LIBICU)$(CTESTFW_STUBNAME)$(ICULIBSU
LIBICUTOOLUTIL= $(LIBDIR)/$(LIBICU)$(TOOLUTIL_STUBNAME)$(ICULIBSUFFIX).lib
## These are the library specific LDFLAGS
-LDFLAGSICUDT+= -base:"0x4ad00000" -NOENTRY# The NOENTRY option is required for creating a resource-only DLL.
-LDFLAGSICUUC= -base:"0x4a800000"# in-uc = 1MB
-LDFLAGSICUI18N= -base:"0x4a900000"# io-in = 2MB
-LDFLAGSICUIO= -base:"0x4ab00000"# le-io = 1MB
-LDFLAGSICULX= -base:"0x4ac80000"
+LDFLAGSICUDT+= -NOENTRY# The NOENTRY option is required for creating a resource-only DLL.
+LDFLAGSICUUC=# Unused for now.
+LDFLAGSICUI18N=# Unused for now.
+LDFLAGSICUIO=# Unused for now.
+LDFLAGSICULX=# Unused for now.
LDFLAGSCTESTFW=# Unused for now.
-LDFLAGSICUTOOLUTIL= -base:"0x4ac00000"# Same as layout. Layout and tools probably won't mix.
+LDFLAGSICUTOOLUTIL=# Unused for now.
# The #M# is used to delete lines for icu-config
# Current full path directory.
diff --git a/icu4c/source/config/mh-msys-msvc b/icu4c/source/config/mh-msys-msvc
index 05fe514ac7b..17f710ef3c9 100644
--- a/icu4c/source/config/mh-msys-msvc
+++ b/icu4c/source/config/mh-msys-msvc
@@ -122,13 +122,13 @@ LIBCTESTFW= $(top_builddir)/tools/ctestfw/$(LIBICU)$(CTESTFW_STUBNAME)$(ICULIBSU
LIBICUTOOLUTIL= $(LIBDIR)/$(LIBICU)$(TOOLUTIL_STUBNAME)$(ICULIBSUFFIX).lib
## These are the library specific LDFLAGS
-LDFLAGSICUDT+= -base:"0x4ad00000" -NOENTRY# The NOENTRY option is required for creating a resource-only DLL.
-LDFLAGSICUUC= -base:"0x4a800000"# in-uc = 1MB
-LDFLAGSICUI18N= -base:"0x4a900000"# io-in = 2MB
-LDFLAGSICUIO= -base:"0x4ab00000"# le-io = 1MB
-LDFLAGSICULX= -base:"0x4ac80000"
+LDFLAGSICUDT+= -NOENTRY# The NOENTRY option is required for creating a resource-only DLL.
+LDFLAGSICUUC=# Unused for now.
+LDFLAGSICUI18N=# Unused for now.
+LDFLAGSICUIO=# Unused for now.
+LDFLAGSICULX=# Unused for now.
LDFLAGSCTESTFW=# Unused for now.
-LDFLAGSICUTOOLUTIL= -base:"0x4ac00000"# Same as layout. Layout and tools probably won't mix.
+LDFLAGSICUTOOLUTIL=# Unused for now.
## Compilation rules
%.$(STATIC_O): $(srcdir)/%.c
diff --git a/icu4c/source/extra/uconv/uconv.vcxproj b/icu4c/source/extra/uconv/uconv.vcxproj
index 750e5459a80..52473efb375 100644
--- a/icu4c/source/extra/uconv/uconv.vcxproj
+++ b/icu4c/source/extra/uconv/uconv.vcxproj
@@ -79,7 +79,6 @@
x86\Release;..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/uconv.pdb
Console
- false
@@ -109,7 +108,6 @@
true
.\x86\Debug/uconv.pdb
Console
- false
diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj
index 49ddc792ad8..b96b9f0294d 100644
--- a/icu4c/source/i18n/i18n.vcxproj
+++ b/icu4c/source/i18n/i18n.vcxproj
@@ -60,9 +60,6 @@
../common;%(AdditionalIncludeDirectories)
-
- 0x4a900000
-
@@ -98,7 +95,6 @@
..\..\bin\icuin64.dll
.\..\..\lib;%(AdditionalLibraryDirectories)
.\..\..\lib\icuin.pdb
- false
..\..\lib\icuin.lib
@@ -120,7 +116,6 @@
..\..\bin\icuin64d.dll
.\..\..\lib;%(AdditionalLibraryDirectories)
.\..\..\lib\icuind.pdb
- false
..\..\lib\icuind.lib
diff --git a/icu4c/source/io/io.vcxproj b/icu4c/source/io/io.vcxproj
index 4ce537cb403..46e612386f6 100644
--- a/icu4c/source/io/io.vcxproj
+++ b/icu4c/source/io/io.vcxproj
@@ -59,9 +59,6 @@
..\common;%(AdditionalIncludeDirectories)
-
- 0x4ab00000
-
@@ -81,7 +78,6 @@
icuuc.lib;icuin.lib;%(AdditionalDependencies)
..\..\lib;%(AdditionalLibraryDirectories)
.\..\..\lib\icuio.pdb
- false
..\..\lib\icuio.lib
@@ -107,7 +103,6 @@
..\..\lib;%(AdditionalLibraryDirectories)
true
.\..\..\lib\icuiod.pdb
- false
..\..\lib\icuiod.lib
diff --git a/icu4c/source/layoutex/layoutex.vcxproj b/icu4c/source/layoutex/layoutex.vcxproj
index c7ae3b649f9..746a29b6d74 100644
--- a/icu4c/source/layoutex/layoutex.vcxproj
+++ b/icu4c/source/layoutex/layoutex.vcxproj
@@ -54,9 +54,6 @@
U_LAYOUTEX_IMPLEMENTATION;%(PreprocessorDefinitions)
Level3
-
- 0x4ac80000
-
@@ -77,7 +74,6 @@
icuuc.lib;%(AdditionalDependencies)
.\..\..\lib;%(AdditionalLibraryDirectories)
.\..\..\lib\iculx.pdb
- false
..\..\lib\iculx.lib
@@ -104,7 +100,6 @@
.\..\..\lib;%(AdditionalLibraryDirectories)
true
.\..\..\lib\iculxd.pdb
- false
..\..\lib\iculxd.lib
diff --git a/icu4c/source/samples/break/break.vcxproj b/icu4c/source/samples/break/break.vcxproj
index 165f95afe2b..5cf80d76184 100644
--- a/icu4c/source/samples/break/break.vcxproj
+++ b/icu4c/source/samples/break/break.vcxproj
@@ -75,7 +75,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/break.pdb
Console
- false
@@ -102,7 +101,6 @@
..\..\..\lib64;%(AdditionalLibraryDirectories)
.\x64\Release/break.pdb
Console
- false
@@ -130,7 +128,6 @@
true
.\x86\Debug/break.pdb
Console
- false
@@ -158,7 +155,6 @@
true
.\x64\Debug/break.pdb
Console
- false
diff --git a/icu4c/source/samples/cal/cal.vcxproj b/icu4c/source/samples/cal/cal.vcxproj
index a1fd6c68e5f..00c8ef65292 100644
--- a/icu4c/source/samples/cal/cal.vcxproj
+++ b/icu4c/source/samples/cal/cal.vcxproj
@@ -76,7 +76,6 @@
../../../lib;%(AdditionalLibraryDirectories)
.\x86\Release/cal.pdb
Console
- false
@@ -103,7 +102,6 @@
../../../lib64;%(AdditionalLibraryDirectories)
.\x64\Release/cal.pdb
Console
- false
@@ -132,7 +130,6 @@
true
.\x86\Debug/cal.pdb
Console
- false
@@ -160,7 +157,6 @@
true
.\x64\Debug/cal.pdb
Console
- false
diff --git a/icu4c/source/samples/case/case.vcxproj b/icu4c/source/samples/case/case.vcxproj
index f58dd01d900..db4874bcd30 100644
--- a/icu4c/source/samples/case/case.vcxproj
+++ b/icu4c/source/samples/case/case.vcxproj
@@ -75,7 +75,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Debug/case.pdb
Console
- false
@@ -103,7 +102,6 @@
true
.\x64\Debug/case.pdb
Console
- false
@@ -130,7 +128,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/case.pdb
Console
- false
@@ -157,7 +154,6 @@
..\..\..\lib64;%(AdditionalLibraryDirectories)
.\x64\Release/case.pdb
Console
- false
diff --git a/icu4c/source/samples/citer/citer.vcxproj b/icu4c/source/samples/citer/citer.vcxproj
index b7a9ca127c8..c6bf105cd85 100644
--- a/icu4c/source/samples/citer/citer.vcxproj
+++ b/icu4c/source/samples/citer/citer.vcxproj
@@ -63,7 +63,6 @@
true
$(OutDir)citer.pdb
Console
- false
@@ -85,7 +84,6 @@
true
$(OutDir)citer.pdb
Console
- false
@@ -106,7 +104,6 @@
true
Console
true
- false
@@ -127,7 +124,6 @@
true
Console
true
- false
diff --git a/icu4c/source/samples/coll/coll.vcxproj b/icu4c/source/samples/coll/coll.vcxproj
index 86e03eda374..a486491899a 100644
--- a/icu4c/source/samples/coll/coll.vcxproj
+++ b/icu4c/source/samples/coll/coll.vcxproj
@@ -70,7 +70,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/coll.pdb
Console
- false
@@ -99,7 +98,6 @@
..\..\..\lib64;%(AdditionalLibraryDirectories)
.\x64\Release/coll.pdb
Console
- false
@@ -130,7 +128,6 @@
true
.\x86\Debug/coll.pdb
Console
- false
@@ -161,7 +158,6 @@
true
.\x64\Debug/coll.pdb
Console
- false
diff --git a/icu4c/source/samples/csdet/csdet.vcxproj b/icu4c/source/samples/csdet/csdet.vcxproj
index d0e5fbaed69..803a514f202 100644
--- a/icu4c/source/samples/csdet/csdet.vcxproj
+++ b/icu4c/source/samples/csdet/csdet.vcxproj
@@ -65,7 +65,6 @@
true
$(OutDir)csdet.pdb
Console
- false
@@ -92,7 +91,6 @@
true
$(OutDir)csdet.pdb
Console
- false
@@ -113,7 +111,6 @@
true
Console
true
- false
@@ -134,7 +131,6 @@
true
Console
true
- false
diff --git a/icu4c/source/samples/date/date.vcxproj b/icu4c/source/samples/date/date.vcxproj
index 3cb82d9a3e7..d0308a301b4 100644
--- a/icu4c/source/samples/date/date.vcxproj
+++ b/icu4c/source/samples/date/date.vcxproj
@@ -70,7 +70,6 @@
../../../lib;%(AdditionalLibraryDirectories)
.\x86\Release/date.pdb
Console
- false
@@ -98,7 +97,6 @@
..\..\..\lib64;%(AdditionalLibraryDirectories)
.\x64\Release/date.pdb
Console
- false
@@ -128,7 +126,6 @@
true
.\x86\Debug/date.pdb
Console
- false
@@ -156,7 +153,6 @@
true
.\x64\Debug/date.pdb
Console
- false
diff --git a/icu4c/source/samples/datefmt/datefmt.vcxproj b/icu4c/source/samples/datefmt/datefmt.vcxproj
index 854032e343a..e22dde62538 100644
--- a/icu4c/source/samples/datefmt/datefmt.vcxproj
+++ b/icu4c/source/samples/datefmt/datefmt.vcxproj
@@ -70,7 +70,6 @@
true
.\x86\Debug/datefmt.pdb
Console
- false
@@ -99,7 +98,6 @@
true
.\x64\Debug/datefmt.pdb
Console
- false
@@ -128,7 +126,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/datefmt.pdb
Console
- false
@@ -157,7 +154,6 @@
..\..\..\lib64;%(AdditionalLibraryDirectories)
.\x64\Release/datefmt.pdb
Console
- false
diff --git a/icu4c/source/samples/layout/layout.vcxproj b/icu4c/source/samples/layout/layout.vcxproj
index 4b1fb1a1cdc..f6114bb57fa 100644
--- a/icu4c/source/samples/layout/layout.vcxproj
+++ b/icu4c/source/samples/layout/layout.vcxproj
@@ -78,7 +78,6 @@
true
.\x86\Release/layout.pdb
Windows
- false
@@ -116,7 +115,6 @@
true
.\x64\Release/layout.pdb
Windows
- false
MachineX64
@@ -155,7 +153,6 @@
true
.\x86\Debug/layout.pdb
Windows
- false
@@ -194,7 +191,6 @@
true
.\x64\Debug/layout.pdb
Windows
- false
MachineX64
diff --git a/icu4c/source/samples/legacy/legacy.vcxproj b/icu4c/source/samples/legacy/legacy.vcxproj
index 24369830e65..e96fa911396 100644
--- a/icu4c/source/samples/legacy/legacy.vcxproj
+++ b/icu4c/source/samples/legacy/legacy.vcxproj
@@ -115,7 +115,6 @@
../../../lib;%(AdditionalLibraryDirectories)
.\x86\Release/legacy.pdb
Console
- false
@@ -154,7 +153,6 @@
../../../lib64;%(AdditionalLibraryDirectories)
.\x64\Release/legacy.pdb
Console
- false
MachineX64
@@ -194,7 +192,6 @@
true
.\x86\Debug/legacy.pdb
Console
- false
@@ -234,7 +231,6 @@
true
.\x64\Debug/legacy.pdb
Console
- false
MachineX64
diff --git a/icu4c/source/samples/msgfmt/msgfmt.vcxproj b/icu4c/source/samples/msgfmt/msgfmt.vcxproj
index 8e649a71e88..8b7a9518e10 100644
--- a/icu4c/source/samples/msgfmt/msgfmt.vcxproj
+++ b/icu4c/source/samples/msgfmt/msgfmt.vcxproj
@@ -71,7 +71,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/msgfmt.pdb
Console
- false
@@ -100,7 +99,6 @@
..\..\..\lib64;%(AdditionalLibraryDirectories)
.\x64\Release/msgfmt.pdb
Console
- false
@@ -130,7 +128,6 @@
true
.\x86\Debug/msgfmt.pdb
Console
- false
@@ -160,7 +157,6 @@
true
.\x64\Debug/msgfmt.pdb
Console
- false
diff --git a/icu4c/source/samples/numfmt/numfmt.vcxproj b/icu4c/source/samples/numfmt/numfmt.vcxproj
index 61b90fe6711..e345627f8b5 100644
--- a/icu4c/source/samples/numfmt/numfmt.vcxproj
+++ b/icu4c/source/samples/numfmt/numfmt.vcxproj
@@ -70,7 +70,6 @@
true
.\x86\Debug/numfmt.pdb
Console
- false
@@ -103,7 +102,6 @@
true
.\x64\Debug/numfmt.pdb
Console
- false
@@ -132,7 +130,6 @@
../../../lib;%(AdditionalLibraryDirectories)
.\x86\Release/numfmt.pdb
Console
- false
@@ -161,7 +158,6 @@
../../../lib64;%(AdditionalLibraryDirectories)
.\x64\Release/numfmt.pdb
Console
- false
diff --git a/icu4c/source/samples/props/props.vcxproj b/icu4c/source/samples/props/props.vcxproj
index 6137a4888f8..5225c4aa7a5 100644
--- a/icu4c/source/samples/props/props.vcxproj
+++ b/icu4c/source/samples/props/props.vcxproj
@@ -74,7 +74,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/props.pdb
Console
- false
@@ -108,7 +107,6 @@
..\..\..\lib64;%(AdditionalLibraryDirectories)
.\x64\Release/props.pdb
Console
- false
@@ -143,7 +141,6 @@
true
.\x86\Debug/props.pdb
Console
- false
@@ -178,7 +175,6 @@
true
.\x64\Debug/props.pdb
Console
- false
diff --git a/icu4c/source/samples/strsrch/strsrch.vcxproj b/icu4c/source/samples/strsrch/strsrch.vcxproj
index bf8df5274c0..021bf2267a3 100644
--- a/icu4c/source/samples/strsrch/strsrch.vcxproj
+++ b/icu4c/source/samples/strsrch/strsrch.vcxproj
@@ -73,7 +73,6 @@
true
.\x86\Debug/strsrch.pdb
Console
- false
@@ -103,7 +102,6 @@
true
.\x64\Debug/strsrch.pdb
Console
- false
@@ -133,7 +131,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/strsrch.pdb
Console
- false
@@ -164,7 +161,6 @@
..\..\..\lib64;%(AdditionalLibraryDirectories)
.\x64\Release/strsrch.pdb
Console
- false
diff --git a/icu4c/source/samples/translit/translit.vcxproj b/icu4c/source/samples/translit/translit.vcxproj
index bd747ef5c13..fe91ee7f6e0 100644
--- a/icu4c/source/samples/translit/translit.vcxproj
+++ b/icu4c/source/samples/translit/translit.vcxproj
@@ -75,7 +75,6 @@
true
.\x86\Debug/translit.pdb
Console
- false
@@ -102,7 +101,6 @@
true
.\x64\Debug/translit.pdb
Console
- false
@@ -129,7 +127,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/translit.pdb
Console
- false
@@ -156,7 +153,6 @@
..\..\..\lib64;%(AdditionalLibraryDirectories)
.\x64\Release/translit.pdb
Console
- false
diff --git a/icu4c/source/samples/uciter8/uciter8.vcxproj b/icu4c/source/samples/uciter8/uciter8.vcxproj
index 39e32562ab6..b417be32aaf 100644
--- a/icu4c/source/samples/uciter8/uciter8.vcxproj
+++ b/icu4c/source/samples/uciter8/uciter8.vcxproj
@@ -75,7 +75,6 @@
true
.\x86\Debug/uciter8.pdb
Console
- false
@@ -102,7 +101,6 @@
true
.\x64\Debug/uciter8.pdb
Console
- false
@@ -129,7 +127,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/uciter8.pdb
Console
- false
@@ -156,7 +153,6 @@
..\..\..\lib64;%(AdditionalLibraryDirectories)
.\x64\Release/uciter8.pdb
Console
- false
diff --git a/icu4c/source/samples/ucnv/ucnv.vcxproj b/icu4c/source/samples/ucnv/ucnv.vcxproj
index e17e5552e64..65d4dbe0099 100644
--- a/icu4c/source/samples/ucnv/ucnv.vcxproj
+++ b/icu4c/source/samples/ucnv/ucnv.vcxproj
@@ -75,7 +75,6 @@
true
.\x86\Debug/ucnv.pdb
Console
- false
@@ -102,7 +101,6 @@
true
.\x64\Debug/ucnv.pdb
Console
- false
@@ -129,7 +127,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/ucnv.pdb
Console
- false
@@ -156,7 +153,6 @@
..\..\..\lib64;%(AdditionalLibraryDirectories)
.\x64\Release/ucnv.pdb
Console
- false
diff --git a/icu4c/source/samples/udata/reader.vcxproj b/icu4c/source/samples/udata/reader.vcxproj
index 24408b7f004..32c11f90533 100644
--- a/icu4c/source/samples/udata/reader.vcxproj
+++ b/icu4c/source/samples/udata/reader.vcxproj
@@ -76,7 +76,6 @@
true
.\reader_Win32_Debug/reader.pdb
Console
- false
@@ -105,7 +104,6 @@
true
.\reader_x64_Debug/reader.pdb
Console
- false
@@ -134,7 +132,6 @@
../../../lib;%(AdditionalLibraryDirectories)
.\reader_Win32_Release/reader.pdb
Console
- false
@@ -164,7 +161,6 @@
../../../lib64;%(AdditionalLibraryDirectories)
.\reader_x64_Release/reader.pdb
Console
- false
diff --git a/icu4c/source/samples/udata/writer.vcxproj b/icu4c/source/samples/udata/writer.vcxproj
index ee57b6123f8..0bb83204d81 100644
--- a/icu4c/source/samples/udata/writer.vcxproj
+++ b/icu4c/source/samples/udata/writer.vcxproj
@@ -76,7 +76,6 @@
true
.\x86\Debug/writer.pdb
Console
- false
@@ -107,7 +106,6 @@
true
.\x64\Debug/writer.pdb
Console
- false
@@ -136,7 +134,6 @@
../../../lib;%(AdditionalLibraryDirectories)
.\x86\Release/writer.pdb
Console
- false
@@ -165,7 +162,6 @@
../../../lib64;%(AdditionalLibraryDirectories)
.\x64\Release\writer.pdb
Console
- false
diff --git a/icu4c/source/samples/ufortune/ufortune.vcxproj b/icu4c/source/samples/ufortune/ufortune.vcxproj
index 7eb88ca8f2a..8e049351cb7 100644
--- a/icu4c/source/samples/ufortune/ufortune.vcxproj
+++ b/icu4c/source/samples/ufortune/ufortune.vcxproj
@@ -70,7 +70,6 @@
../../../lib;%(AdditionalLibraryDirectories)
true
Console
- false
@@ -101,7 +100,6 @@
true
../../../lib;%(AdditionalLibraryDirectories)
Console
- false
diff --git a/icu4c/source/samples/ugrep/ugrep.vcxproj b/icu4c/source/samples/ugrep/ugrep.vcxproj
index 5d7416fadc7..39ab564bc93 100644
--- a/icu4c/source/samples/ugrep/ugrep.vcxproj
+++ b/icu4c/source/samples/ugrep/ugrep.vcxproj
@@ -74,7 +74,6 @@
../../../lib;%(AdditionalLibraryDirectories)
.\x86\Release/ugrep.pdb
Console
- false
@@ -109,7 +108,6 @@
../../../lib64;%(AdditionalLibraryDirectories)
.\x64\Release/ugrep.pdb
Console
- false
@@ -143,7 +141,6 @@
true
.\x86\Debug/ugrep.pdb
Console
- false
@@ -175,7 +172,6 @@
true
.\x64\Debug/ugrep.pdb
Console
- false
diff --git a/icu4c/source/samples/uresb/uresb.vcxproj b/icu4c/source/samples/uresb/uresb.vcxproj
index 49c9a1b31aa..6e6e96b18f8 100644
--- a/icu4c/source/samples/uresb/uresb.vcxproj
+++ b/icu4c/source/samples/uresb/uresb.vcxproj
@@ -78,7 +78,6 @@
../../../lib/;../../tools/toolutil/;%(AdditionalLibraryDirectories)
.\x86\Release/uresb.pdb
Console
- false
@@ -109,7 +108,6 @@
../../../lib64/;../../tools/toolutil/;%(AdditionalLibraryDirectories)
.\x64\Release/uresb.pdb
Console
- false
@@ -140,7 +138,6 @@
true
.\x86\Debug/uresb.pdb
Console
- false
@@ -170,7 +167,6 @@
true
.\x64\Debug/uresb.pdb
Console
- false
diff --git a/icu4c/source/samples/ustring/ustring.vcxproj b/icu4c/source/samples/ustring/ustring.vcxproj
index d7b03d4b9b0..7e2882d65f3 100644
--- a/icu4c/source/samples/ustring/ustring.vcxproj
+++ b/icu4c/source/samples/ustring/ustring.vcxproj
@@ -75,7 +75,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/ustring.pdb
Console
- false
@@ -103,7 +102,6 @@
..\..\..\lib64;%(AdditionalLibraryDirectories)
.\x64\Release/ustring.pdb
Console
- false
@@ -130,7 +128,6 @@
true
.\x86\Debug/ustring.pdb
Console
- false
@@ -157,7 +154,6 @@
true
.\x64\Debug/ustring.pdb
Console
- false
diff --git a/icu4c/source/stubdata/stubdata.vcxproj b/icu4c/source/stubdata/stubdata.vcxproj
index dbc605ccf86..852b9bc1ff8 100644
--- a/icu4c/source/stubdata/stubdata.vcxproj
+++ b/icu4c/source/stubdata/stubdata.vcxproj
@@ -96,10 +96,8 @@
echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > "$(ProjectDir)stubdatabuilt.txt"
- 0x4ad00000
true
true
- true
true
@@ -203,8 +201,6 @@
MachineARM
..\..\libARM\icudt.lib
kernel32.lib;%(AdditionalDependencies)
-
- true
@@ -251,8 +247,6 @@
..\..\libARM64\icudt.lib
kernel32.lib;%(AdditionalDependencies)
C:\Program Files (x86)\Windows Kits\10\Lib\10.0.16299.0\um\arm64
-
- true
diff --git a/icu4c/source/test/cintltst/cintltst.vcxproj b/icu4c/source/test/cintltst/cintltst.vcxproj
index bb5a2a7efee..b706feeb90b 100644
--- a/icu4c/source/test/cintltst/cintltst.vcxproj
+++ b/icu4c/source/test/cintltst/cintltst.vcxproj
@@ -75,8 +75,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Debug/cintltst.pdb
Console
- false
- false
@@ -102,7 +100,6 @@
true
.\x86\Release/cintltst.pdb
Console
- false
@@ -127,7 +124,6 @@
..\..\..\lib64;%(AdditionalLibraryDirectories)
.\x64\Debug/cintltst.pdb
Console
- false
diff --git a/icu4c/source/test/intltest/intltest.vcxproj b/icu4c/source/test/intltest/intltest.vcxproj
index 5cf154d4e67..543a7798e7f 100644
--- a/icu4c/source/test/intltest/intltest.vcxproj
+++ b/icu4c/source/test/intltest/intltest.vcxproj
@@ -76,8 +76,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Debug/intltest.pdb
Console
- false
- false
@@ -103,7 +101,6 @@
true
.\x64\Debug/intltest.pdb
Console
- false
@@ -125,7 +122,6 @@
true
.\x86\Release/intltest.pdb
Console
- false
diff --git a/icu4c/source/test/iotest/iotest.vcxproj b/icu4c/source/test/iotest/iotest.vcxproj
index 518347ae8d0..b6ce25352e9 100644
--- a/icu4c/source/test/iotest/iotest.vcxproj
+++ b/icu4c/source/test/iotest/iotest.vcxproj
@@ -79,7 +79,6 @@
true
.\x86\Debug/iotest.pdb
Console
- false
@@ -102,7 +101,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/iotest.pdb
Console
- false
diff --git a/icu4c/source/test/letest/gendata.vcxproj b/icu4c/source/test/letest/gendata.vcxproj
index 0e564b930b5..5a0b943d64b 100644
--- a/icu4c/source/test/letest/gendata.vcxproj
+++ b/icu4c/source/test/letest/gendata.vcxproj
@@ -114,7 +114,6 @@
true
.\x86\Debug/gendata.pdb
Console
- false
@@ -153,7 +152,6 @@
true
.\x64\Debug/gendata.pdb
Console
- false
MachineX64
@@ -191,7 +189,6 @@
true
.\x86\Release/gendata.pdb
Console
- false
@@ -229,7 +226,6 @@
true
.\x64\Release/gendata.pdb
Console
- false
MachineX64
diff --git a/icu4c/source/test/letest/letest.vcxproj b/icu4c/source/test/letest/letest.vcxproj
index 0a83aacc285..e2a5499b383 100644
--- a/icu4c/source/test/letest/letest.vcxproj
+++ b/icu4c/source/test/letest/letest.vcxproj
@@ -114,7 +114,6 @@
.\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/letest.pdb
Console
- false
@@ -154,7 +153,6 @@
true
.\x86\Debug/letest.pdb
Console
- false
diff --git a/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.vcxproj b/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.vcxproj
index 3eacbcf69c3..c03f3960035 100644
--- a/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.vcxproj
+++ b/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.vcxproj
@@ -95,7 +95,6 @@
- false
MachineX86
diff --git a/icu4c/source/test/perf/charperf/charperf.vcxproj b/icu4c/source/test/perf/charperf/charperf.vcxproj
index 42fce5161c6..1128037fb7c 100644
--- a/icu4c/source/test/perf/charperf/charperf.vcxproj
+++ b/icu4c/source/test/perf/charperf/charperf.vcxproj
@@ -115,7 +115,6 @@
true
.\x86\Debug/charperf.pdb
Console
- false
@@ -157,7 +156,6 @@
true
.\x64\Debug/charperf.pdb
Console
- false
MachineX64
@@ -198,7 +196,6 @@
..\..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/charperf.pdb
Console
- false
MachineX86
@@ -240,7 +237,6 @@
..\..\..\..\lib64;%(AdditionalLibraryDirectories)
.\x64\Release/charperf.pdb
Console
- false
MachineX64
diff --git a/icu4c/source/test/perf/collperf/collperf.vcxproj b/icu4c/source/test/perf/collperf/collperf.vcxproj
index 062b24c30cf..807894d60fe 100644
--- a/icu4c/source/test/perf/collperf/collperf.vcxproj
+++ b/icu4c/source/test/perf/collperf/collperf.vcxproj
@@ -113,7 +113,6 @@
true
.\x86\Debug/collperf.pdb
Console
- false
@@ -153,7 +152,6 @@
true
.\x64\Debug/collperf.pdb
Console
- false
MachineX64
@@ -192,7 +190,6 @@
..\..\..\..\lib\;%(AdditionalLibraryDirectories)
.\x86\Release/collperf.pdb
Console
- false
MachineX86
@@ -232,7 +229,6 @@
..\..\..\..\lib64\;%(AdditionalLibraryDirectories)
.\x64\Release/collperf.pdb
Console
- false
MachineX64
diff --git a/icu4c/source/test/perf/collperf2/collperf2.vcxproj b/icu4c/source/test/perf/collperf2/collperf2.vcxproj
index 3cc4bfc9aac..cb6cb110750 100644
--- a/icu4c/source/test/perf/collperf2/collperf2.vcxproj
+++ b/icu4c/source/test/perf/collperf2/collperf2.vcxproj
@@ -113,7 +113,6 @@
true
.\x86\Debug/collperf2.pdb
Console
- false
@@ -153,7 +152,6 @@
true
.\x64\Debug/collperf2.pdb
Console
- false
MachineX64
@@ -192,7 +190,6 @@
..\..\..\..\lib\;%(AdditionalLibraryDirectories)
.\x86\Release/collperf2.pdb
Console
- false
MachineX86
@@ -232,7 +229,6 @@
..\..\..\..\lib64\;%(AdditionalLibraryDirectories)
.\x64\Release/collperf2.pdb
Console
- false
MachineX64
diff --git a/icu4c/source/test/perf/convperf/convperf.vcxproj b/icu4c/source/test/perf/convperf/convperf.vcxproj
index 1cc62da1726..41bdd92f7e2 100644
--- a/icu4c/source/test/perf/convperf/convperf.vcxproj
+++ b/icu4c/source/test/perf/convperf/convperf.vcxproj
@@ -114,7 +114,6 @@
..\..\..\..\lib\;%(AdditionalLibraryDirectories)
.\x86\Release/convperf.pdb
Console
- false
MachineX86
@@ -156,7 +155,6 @@
..\..\..\..\lib64\;%(AdditionalLibraryDirectories)
.\x64\Release/convperf.pdb
Console
- false
MachineX64
@@ -198,7 +196,6 @@
true
.\x86\Debug/convperf.pdb
Console
- false
@@ -240,7 +237,6 @@
true
.\x64\Debug/convperf.pdb
Console
- false
MachineX64
diff --git a/icu4c/source/test/perf/normperf/dtfmtrtperf.vcxproj b/icu4c/source/test/perf/normperf/dtfmtrtperf.vcxproj
index d97e0503aec..689ce0693a4 100644
--- a/icu4c/source/test/perf/normperf/dtfmtrtperf.vcxproj
+++ b/icu4c/source/test/perf/normperf/dtfmtrtperf.vcxproj
@@ -118,7 +118,6 @@
true
.\x86\Debug/dtfmtrtperf.pdb
Console
- false
@@ -158,7 +157,6 @@
..\..\..\..\lib\;%(AdditionalLibraryDirectories)
.\x86\Release/normperf.pdb
Console
- false
MachineX86
@@ -201,7 +199,6 @@
true
.\x64\Debug/normperf.pdb
Console
- false
MachineX64
@@ -243,7 +240,6 @@
..\..\..\..\lib64\;%(AdditionalLibraryDirectories)
.\x64\Release/normperf.pdb
Console
- false
MachineX64
diff --git a/icu4c/source/test/perf/normperf/normperf.vcxproj b/icu4c/source/test/perf/normperf/normperf.vcxproj
index 9e78807093d..62c9aad1d42 100644
--- a/icu4c/source/test/perf/normperf/normperf.vcxproj
+++ b/icu4c/source/test/perf/normperf/normperf.vcxproj
@@ -115,7 +115,6 @@
true
.\x86\Debug/normperf.pdb
Console
- false
@@ -157,7 +156,6 @@
true
.\x64\Debug/normperf.pdb
Console
- false
MachineX64
@@ -198,7 +196,6 @@
..\..\..\..\lib\;%(AdditionalLibraryDirectories)
.\x86\Release/normperf.pdb
Console
- false
MachineX86
@@ -240,7 +237,6 @@
..\..\..\..\lib64\;%(AdditionalLibraryDirectories)
.\x64\Release/normperf.pdb
Console
- false
MachineX64
diff --git a/icu4c/source/test/perf/strsrchperf/strsrchperf.vcxproj b/icu4c/source/test/perf/strsrchperf/strsrchperf.vcxproj
index e317c8dc754..89f2ccdbc9c 100644
--- a/icu4c/source/test/perf/strsrchperf/strsrchperf.vcxproj
+++ b/icu4c/source/test/perf/strsrchperf/strsrchperf.vcxproj
@@ -115,7 +115,6 @@
true
.\x86\Debug/strsrchperf.pdb
Console
- false
@@ -157,7 +156,6 @@
true
.\x64\Debug/strsrchperf.pdb
Console
- false
MachineX64
@@ -198,7 +196,6 @@
..\..\..\..\lib\;%(AdditionalLibraryDirectories)
.\x86\Release/strsrchperf.pdb
Console
- false
MachineX86
@@ -240,7 +237,6 @@
..\..\..\..\lib64\;%(AdditionalLibraryDirectories)
.\x64\Release/strsrchperf.pdb
Console
- false
MachineX64
diff --git a/icu4c/source/test/perf/ubrkperf/ubrkperf.vcxproj b/icu4c/source/test/perf/ubrkperf/ubrkperf.vcxproj
index a354c354ab4..f38d9b4d503 100644
--- a/icu4c/source/test/perf/ubrkperf/ubrkperf.vcxproj
+++ b/icu4c/source/test/perf/ubrkperf/ubrkperf.vcxproj
@@ -113,7 +113,6 @@
true
.\x86\Debug/ubrkperf.pdb
Console
- false
@@ -151,7 +150,6 @@
..\..\..\..\lib\;%(AdditionalLibraryDirectories)
.\x86\Release/ubrkperf24.pdb
Console
- false
MachineX86
@@ -192,7 +190,6 @@
true
.\x64\Debug/ubrkperf.pdb
Console
- false
MachineX64
@@ -232,7 +229,6 @@
..\..\..\..\lib64\;%(AdditionalLibraryDirectories)
.\x64\Release/ubrkperf24.pdb
Console
- false
MachineX64
diff --git a/icu4c/source/test/perf/unisetperf/unisetperf.vcxproj b/icu4c/source/test/perf/unisetperf/unisetperf.vcxproj
index d72b556c865..7e689014152 100644
--- a/icu4c/source/test/perf/unisetperf/unisetperf.vcxproj
+++ b/icu4c/source/test/perf/unisetperf/unisetperf.vcxproj
@@ -112,7 +112,6 @@
true
.\x86\Debug/unisetperf.pdb
Console
- false
MachineX86
@@ -152,7 +151,6 @@
true
.\x64\Debug/unisetperf.pdb
Console
- false
MachineX64
@@ -191,7 +189,6 @@
..\..\..\..\lib\;%(AdditionalLibraryDirectories)
.\x86\Release/unisetperf.pdb
Console
- false
MachineX86
@@ -231,7 +228,6 @@
..\..\..\..\lib64\;%(AdditionalLibraryDirectories)
.\x64\Release/unisetperf.pdb
Console
- false
MachineX64
diff --git a/icu4c/source/test/perf/usetperf/usetperf.vcxproj b/icu4c/source/test/perf/usetperf/usetperf.vcxproj
index cdc254c23e2..801b8a80742 100644
--- a/icu4c/source/test/perf/usetperf/usetperf.vcxproj
+++ b/icu4c/source/test/perf/usetperf/usetperf.vcxproj
@@ -112,7 +112,6 @@
..\..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/usetperf.pdb
Console
- false
MachineX86
@@ -152,7 +151,6 @@
..\..\..\..\lib64;%(AdditionalLibraryDirectories)
.\x64\Release/usetperf.pdb
Console
- false
MachineX64
@@ -191,7 +189,6 @@
true
.\x86\Debug/usetperf.pdb
Console
- false
@@ -230,7 +227,6 @@
true
.\x64\Debug/usetperf.pdb
Console
- false
MachineX64
diff --git a/icu4c/source/test/perf/ustrperf/stringperf.vcxproj b/icu4c/source/test/perf/ustrperf/stringperf.vcxproj
index 7e791e80b12..a6b4e5cbd7f 100644
--- a/icu4c/source/test/perf/ustrperf/stringperf.vcxproj
+++ b/icu4c/source/test/perf/ustrperf/stringperf.vcxproj
@@ -114,7 +114,6 @@
..\..\..\..\lib\;%(AdditionalLibraryDirectories)
.\x86\Release/stringperf.pdb
Console
- false
MachineX86
@@ -156,7 +155,6 @@
..\..\..\..\lib64\;%(AdditionalLibraryDirectories)
.\x64\Release/stringperf.pdb
Console
- false
MachineX64
@@ -198,7 +196,6 @@
true
.\x86\Debug/stringperf.pdb
Console
- false
@@ -240,7 +237,6 @@
true
.\x64\Debug/stringperf.pdb
Console
- false
MachineX64
diff --git a/icu4c/source/test/perf/utfperf/utfperf.vcxproj b/icu4c/source/test/perf/utfperf/utfperf.vcxproj
index 9815de914cb..0d0eef71fcc 100644
--- a/icu4c/source/test/perf/utfperf/utfperf.vcxproj
+++ b/icu4c/source/test/perf/utfperf/utfperf.vcxproj
@@ -112,7 +112,6 @@
true
.\x86\Debug/utfperf.pdb
Console
- false
@@ -151,7 +150,6 @@
true
.\x64\Debug/utfperf.pdb
Console
- false
MachineX64
@@ -190,7 +188,6 @@
..\..\..\..\lib\;%(AdditionalLibraryDirectories)
.\x86\Release/utfperf.pdb
Console
- false
MachineX86
@@ -230,7 +227,6 @@
..\..\..\..\lib64\;%(AdditionalLibraryDirectories)
.\x64\Release/utfperf.pdb
Console
- false
MachineX64
diff --git a/icu4c/source/test/perf/utrie2perf/utrie2perf.vcxproj b/icu4c/source/test/perf/utrie2perf/utrie2perf.vcxproj
index b7bffeea89c..bca5958b8bb 100644
--- a/icu4c/source/test/perf/utrie2perf/utrie2perf.vcxproj
+++ b/icu4c/source/test/perf/utrie2perf/utrie2perf.vcxproj
@@ -112,7 +112,6 @@
true
.\x86\Debug/utrie2perf.pdb
Console
- false
@@ -151,7 +150,6 @@
true
.\x64\Debug/utrie2perf.pdb
Console
- false
MachineX64
@@ -190,7 +188,6 @@
..\..\..\..\lib\;%(AdditionalLibraryDirectories)
.\x86\Release/utrie2perf.pdb
Console
- false
MachineX86
@@ -230,7 +227,6 @@
..\..\..\..\lib64\;%(AdditionalLibraryDirectories)
.\x64\Release/utrie2perf.pdb
Console
- false
MachineX64
diff --git a/icu4c/source/tools/ctestfw/ctestfw.vcxproj b/icu4c/source/tools/ctestfw/ctestfw.vcxproj
index 9e2e7f34b06..ee497cb859e 100644
--- a/icu4c/source/tools/ctestfw/ctestfw.vcxproj
+++ b/icu4c/source/tools/ctestfw/ctestfw.vcxproj
@@ -79,7 +79,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\..\..\..\lib\icutest.pdb
UseLinkTimeCodeGeneration
- false
.\..\..\..\lib\icutest.lib
@@ -105,7 +104,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
true
.\..\..\..\lib\icutestd.pdb
- false
.\..\..\..\lib\icutestd.lib
diff --git a/icu4c/source/tools/genbrk/genbrk.vcxproj b/icu4c/source/tools/genbrk/genbrk.vcxproj
index 46f5b108557..4e1feeb9c44 100644
--- a/icu4c/source/tools/genbrk/genbrk.vcxproj
+++ b/icu4c/source/tools/genbrk/genbrk.vcxproj
@@ -84,7 +84,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/genbrk.pdb
Console
- false
@@ -131,7 +130,6 @@
true
.\x86\Debug/genbrk.pdb
Console
- false
diff --git a/icu4c/source/tools/genccode/genccode.vcxproj b/icu4c/source/tools/genccode/genccode.vcxproj
index 1bff87b98b6..c55b2ca5d9f 100644
--- a/icu4c/source/tools/genccode/genccode.vcxproj
+++ b/icu4c/source/tools/genccode/genccode.vcxproj
@@ -83,7 +83,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/genccode.pdb
Console
- false
@@ -129,7 +128,6 @@
true
.\x86\Debug/genccode.pdb
Console
- false
diff --git a/icu4c/source/tools/gencfu/gencfu.vcxproj b/icu4c/source/tools/gencfu/gencfu.vcxproj
index a857bd7eda7..b97fd785f7d 100644
--- a/icu4c/source/tools/gencfu/gencfu.vcxproj
+++ b/icu4c/source/tools/gencfu/gencfu.vcxproj
@@ -113,7 +113,6 @@
icuuc.lib;icuin.lib;icutu.lib;%(AdditionalDependencies)
..\..\..\lib;%(AdditionalLibraryDirectories)
Console
- false
diff --git a/icu4c/source/tools/gencmn/gencmn.vcxproj b/icu4c/source/tools/gencmn/gencmn.vcxproj
index 5d0b2746514..92c989b8dc3 100644
--- a/icu4c/source/tools/gencmn/gencmn.vcxproj
+++ b/icu4c/source/tools/gencmn/gencmn.vcxproj
@@ -84,7 +84,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/gencmn.pdb
Console
- false
@@ -131,7 +130,6 @@
true
.\x86\Debug/gencmn.pdb
Console
- false
diff --git a/icu4c/source/tools/gencnval/gencnval.vcxproj b/icu4c/source/tools/gencnval/gencnval.vcxproj
index 6423bc31d80..6e3dd0c970e 100644
--- a/icu4c/source/tools/gencnval/gencnval.vcxproj
+++ b/icu4c/source/tools/gencnval/gencnval.vcxproj
@@ -84,7 +84,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/gencnval.pdb
Console
- false
@@ -131,7 +130,6 @@
true
.\x86\Debug/gencnval.pdb
Console
- false
diff --git a/icu4c/source/tools/gendict/gendict.vcxproj b/icu4c/source/tools/gendict/gendict.vcxproj
index 7e203bc2991..6cd26c2065e 100644
--- a/icu4c/source/tools/gendict/gendict.vcxproj
+++ b/icu4c/source/tools/gendict/gendict.vcxproj
@@ -84,7 +84,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/gendict.pdb
Console
- false
@@ -131,7 +130,6 @@
true
.\x86\Debug/gendict.pdb
Console
- false
diff --git a/icu4c/source/tools/gennorm2/gennorm2.vcxproj b/icu4c/source/tools/gennorm2/gennorm2.vcxproj
index c1e5d7b5159..20457f132f7 100644
--- a/icu4c/source/tools/gennorm2/gennorm2.vcxproj
+++ b/icu4c/source/tools/gennorm2/gennorm2.vcxproj
@@ -82,7 +82,6 @@
true
true
MachineX86
- false
false
@@ -110,7 +109,6 @@
true
.\x86\Debug\gennorm2.pdb
Console
- false
false
@@ -140,7 +138,6 @@
true
Console
true
- false
false
@@ -169,7 +166,6 @@
true
.\x64\Debug\gennorm2.pdb
Console
- false
false
diff --git a/icu4c/source/tools/genrb/derb.vcxproj b/icu4c/source/tools/genrb/derb.vcxproj
index 3361bfb9e92..0ac383d8624 100644
--- a/icu4c/source/tools/genrb/derb.vcxproj
+++ b/icu4c/source/tools/genrb/derb.vcxproj
@@ -88,7 +88,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release_derb/derb.pdb
Console
- false
@@ -138,7 +137,6 @@
true
.\x86\Debug_derb/derb.pdb
Console
- false
diff --git a/icu4c/source/tools/genrb/genrb.vcxproj b/icu4c/source/tools/genrb/genrb.vcxproj
index 2dd68f2213f..a7183dc6f4c 100644
--- a/icu4c/source/tools/genrb/genrb.vcxproj
+++ b/icu4c/source/tools/genrb/genrb.vcxproj
@@ -88,7 +88,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/genrb.pdb
Console
- false
@@ -134,7 +133,6 @@
true
.\x86\Debug/genrb.pdb
Console
- false
diff --git a/icu4c/source/tools/gensprep/gensprep.vcxproj b/icu4c/source/tools/gensprep/gensprep.vcxproj
index a0a13c5848c..1089742e04b 100644
--- a/icu4c/source/tools/gensprep/gensprep.vcxproj
+++ b/icu4c/source/tools/gensprep/gensprep.vcxproj
@@ -84,7 +84,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/gensprep.pdb
Console
- false
@@ -130,7 +129,6 @@
true
.\x86\Debug/gensprep.pdb
Console
- false
diff --git a/icu4c/source/tools/gentest/gentest.vcxproj b/icu4c/source/tools/gentest/gentest.vcxproj
index dd4ddc8fe9f..6c8d7bb7e9a 100644
--- a/icu4c/source/tools/gentest/gentest.vcxproj
+++ b/icu4c/source/tools/gentest/gentest.vcxproj
@@ -80,7 +80,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/gentest.pdb
Console
- false
@@ -122,7 +121,6 @@
true
.\x86\Debug/gentest.pdb
Console
- false
diff --git a/icu4c/source/tools/icuinfo/icuinfo.vcxproj b/icu4c/source/tools/icuinfo/icuinfo.vcxproj
index 4597f9455d3..f77d96b4e40 100644
--- a/icu4c/source/tools/icuinfo/icuinfo.vcxproj
+++ b/icu4c/source/tools/icuinfo/icuinfo.vcxproj
@@ -75,7 +75,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
x86\Release/icuinfo.pdb
Console
- false
@@ -102,7 +101,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
$(OutDir)icuinfo.pdb
Console
- false
diff --git a/icu4c/source/tools/icuinfo/testplug.vcxproj b/icu4c/source/tools/icuinfo/testplug.vcxproj
index a288ec9b03f..8e1c830177d 100644
--- a/icu4c/source/tools/icuinfo/testplug.vcxproj
+++ b/icu4c/source/tools/icuinfo/testplug.vcxproj
@@ -85,7 +85,6 @@
.\..\..\..\lib\testplug.pdb
true
UseLinkTimeCodeGeneration
- false
.\..\..\..\lib\testplug.lib
@@ -131,7 +130,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
true
.\..\..\..\lib\testplugd.pdb
- false
.\..\..\..\lib\testplugd.lib
diff --git a/icu4c/source/tools/icupkg/icupkg.vcxproj b/icu4c/source/tools/icupkg/icupkg.vcxproj
index ffbef9a880c..ceaab592adb 100644
--- a/icu4c/source/tools/icupkg/icupkg.vcxproj
+++ b/icu4c/source/tools/icupkg/icupkg.vcxproj
@@ -75,7 +75,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
x86\Release/icupkg.pdb
Console
- false
@@ -103,7 +102,6 @@
true
$(OutDir)icupkg.pdb
Console
- false
diff --git a/icu4c/source/tools/makeconv/makeconv.vcxproj b/icu4c/source/tools/makeconv/makeconv.vcxproj
index 7471759f6f4..1ade1ba9f99 100644
--- a/icu4c/source/tools/makeconv/makeconv.vcxproj
+++ b/icu4c/source/tools/makeconv/makeconv.vcxproj
@@ -79,7 +79,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Debug/makeconv.pdb
Console
- false
@@ -107,7 +106,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/makeconv.pdb
Console
- false
diff --git a/icu4c/source/tools/pkgdata/pkgdata.cpp b/icu4c/source/tools/pkgdata/pkgdata.cpp
index 5e730790fbd..1f318ac0f3a 100644
--- a/icu4c/source/tools/pkgdata/pkgdata.cpp
+++ b/icu4c/source/tools/pkgdata/pkgdata.cpp
@@ -261,7 +261,7 @@ const char options_help[][320]={
"Build PDS dataset (zOS build only)",
"Build for Universal Windows Platform (Windows build only)",
"Specify the DLL machine architecture for LINK.exe (Windows build only)",
- "Set DYNAMICBASE on for the DLL (Windows build only)",
+ "Ignored. Enable DYNAMICBASE on the DLL. This is now the default. (Windows build only)",
};
const char *progname = "PKGDATA";
@@ -471,6 +471,10 @@ main(int argc, char* argv[]) {
#endif
}
+ if (options[WIN_DYNAMICBASE].doesOccur) {
+ fprintf(stdout, "Note: Ignoring option -b (windows-dynamicbase).\n");
+ }
+
/* OK options are set up. Now the file lists. */
tail = NULL;
for( n=1; ntrue
.\x86\Debug/pkgdata.pdb
Console
- false
@@ -115,7 +114,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\x86\Release/pkgdata.pdb
Console
- false
diff --git a/icu4c/source/tools/toolutil/toolutil.vcxproj b/icu4c/source/tools/toolutil/toolutil.vcxproj
index 22ab0ef88d1..bd4a7f397be 100644
--- a/icu4c/source/tools/toolutil/toolutil.vcxproj
+++ b/icu4c/source/tools/toolutil/toolutil.vcxproj
@@ -75,8 +75,6 @@
..\..\..\lib;%(AdditionalLibraryDirectories)
.\..\..\..\lib\icutu.pdb
UseLinkTimeCodeGeneration
- 0x4ac00000
- false
..\..\..\lib\icutu.lib
@@ -100,8 +98,6 @@
icuucd.lib;icuind.lib;%(AdditionalDependencies)
..\..\..\lib;%(AdditionalLibraryDirectories)
.\..\..\..\lib\icutud.pdb
- 0x4ac00000
- false
..\..\..\lib\icutud.lib
@@ -127,7 +123,6 @@
..\..\..\lib64;%(AdditionalLibraryDirectories)
.\..\..\..\lib64\icutu.pdb
UseLinkTimeCodeGeneration
- 0x4ac00000
..\..\..\lib64\icutu.lib
@@ -149,7 +144,6 @@
icuucd.lib;icuind.lib;%(AdditionalDependencies)
..\..\..\lib64;%(AdditionalLibraryDirectories)
.\..\..\..\lib64\icutud.pdb
- 0x4ac00000
..\..\..\lib64\icutud.lib
diff --git a/icu4c/source/tools/tzcode/icuzdump.vcxproj b/icu4c/source/tools/tzcode/icuzdump.vcxproj
index 15c9432a6cb..4f7b96fc291 100644
--- a/icu4c/source/tools/tzcode/icuzdump.vcxproj
+++ b/icu4c/source/tools/tzcode/icuzdump.vcxproj
@@ -77,7 +77,6 @@
true
.\x86\Debug/icuzdump.pdb
Console
- false
NotSet
@@ -97,7 +96,6 @@
Console
true
true
- false
MachineX86