From 408752ec490f8e2c43891591fb5f3258ece0f89f Mon Sep 17 00:00:00 2001
From: Jeff Genovy <29107334+jefgen@users.noreply.github.com>
Date: Wed, 14 Aug 2019 00:41:26 -0700
Subject: [PATCH] ICU-20782 Enable Windows desktop ARM and ARM64 builds of
ICU4C.
This enables "classic" desktop builds of ICU4C for both ARM (32-bit)
and ARM64 (64-bit) on Windows.
All but the two samples "cal" and "date" in the "allinone" project now
have ARM and ARM64 project configurations, and build for Windows Desktop
ARM/ARM64.
Note: In order to build the ARM/ARM64 data DLL, you need to first build
x64/Release, as the ARM/ARM build uses the x64 bits in order to be able
to cross-compile for ARM/ARM64. This allows for completely building
ARM/ARM64 binaries using only x64 hardware.
The ARM/ARM64 builds require using a newer version of the Windows SDK
than 8.1, so they have a separate WindowsTargetPlatformVersion which
uses Windows 10 SDK version 10.0.16299.0 (aka RS3), which is the first
version of the Windows SDK to support building ARM64 desktop applications.
In addition this also greatly cleans-up the ICU4C ".vcxproj" files, in
order to remove redundant parts, fix inconsistencies, and make them more
readable. This introduces two new variables in the shared `*.props`
files: `IcuBinOutputDir` and `IcuLibOutputDir` in order to further
reduce the amount of duplicated lines in the individual ".vcxproj"
files themselves.
---
.gitignore | 44 +++
.../Build.Windows.ProjectConfiguration.props | 82 ++++-
...ild.Windows.UWP.ProjectConfiguration.props | 17 +
icu4c/source/allinone/allinone.sln | 312 ++++++++++++------
icu4c/source/common/common.vcxproj | 110 ++----
icu4c/source/common/common_uwp.vcxproj | 166 ++--------
icu4c/source/data/makedata.vcxproj | 79 +----
icu4c/source/data/makedata_uwp.vcxproj | 85 +----
icu4c/source/extra/uconv/makedata.mak | 25 +-
icu4c/source/extra/uconv/uconv.vcxproj | 154 ++-------
icu4c/source/i18n/i18n.vcxproj | 112 ++-----
icu4c/source/i18n/i18n_uwp.vcxproj | 30 +-
icu4c/source/io/io.vcxproj | 117 ++-----
icu4c/source/stubdata/stubdata.vcxproj | 230 ++-----------
icu4c/source/test/cintltst/cintltst.vcxproj | 117 ++-----
icu4c/source/test/intltest/intltest.vcxproj | 110 ++----
icu4c/source/test/iotest/iotest.vcxproj | 114 ++-----
icu4c/source/tools/ctestfw/ctestfw.vcxproj | 121 ++-----
icu4c/source/tools/genbrk/genbrk.vcxproj | 189 ++---------
icu4c/source/tools/genccode/genccode.vcxproj | 185 ++---------
icu4c/source/tools/gencfu/gencfu.vcxproj | 178 ++--------
icu4c/source/tools/gencmn/gencmn.vcxproj | 189 ++---------
icu4c/source/tools/gencnval/gencnval.vcxproj | 189 ++---------
icu4c/source/tools/gendict/gendict.vcxproj | 189 ++---------
icu4c/source/tools/gennorm2/gennorm2.vcxproj | 139 ++------
icu4c/source/tools/genrb/derb.vcxproj | 201 ++---------
icu4c/source/tools/genrb/genrb.vcxproj | 187 ++---------
icu4c/source/tools/gensprep/gensprep.vcxproj | 187 ++---------
icu4c/source/tools/gentest/gentest.vcxproj | 168 ++--------
icu4c/source/tools/icuinfo/icuinfo.vcxproj | 121 ++-----
icu4c/source/tools/icuinfo/testplug.vcxproj | 192 ++---------
icu4c/source/tools/icupkg/icupkg.vcxproj | 122 ++-----
icu4c/source/tools/makeconv/makeconv.vcxproj | 129 ++------
icu4c/source/tools/pkgdata/pkgdata.vcxproj | 143 ++------
icu4c/source/tools/toolutil/toolutil.vcxproj | 177 ++++++----
35 files changed, 1226 insertions(+), 3684 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3ef3453e6be..d6acf6dd058 100644
--- a/.gitignore
+++ b/.gitignore
@@ -121,6 +121,8 @@ icu4c/source/extra/uconv/uconv.vcproj.*.*.user
icu4c/source/extra/uconv/uconvmsg
icu4c/source/extra/uconv/x64
icu4c/source/extra/uconv/x86
+icu4c/source/extra/uconv/ARM
+icu4c/source/extra/uconv/ARM64
icu4c/source/i18n/*.ao
icu4c/source/i18n/*.d
icu4c/source/i18n/*.o
@@ -139,6 +141,8 @@ icu4c/source/i18n/i18n.vcproj.*.*.user
icu4c/source/i18n/release
icu4c/source/i18n/x64
icu4c/source/i18n/x86
+icu4c/source/i18n/ARM
+icu4c/source/i18n/ARM64
icu4c/source/icudefs.local
icu4c/source/icudefs.mk
icu4c/source/io/*.ao
@@ -154,6 +158,8 @@ icu4c/source/io/io.vcproj.*.*.user
icu4c/source/io/release
icu4c/source/io/x64
icu4c/source/io/x86
+icu4c/source/io/ARM
+icu4c/source/io/ARM64
icu4c/source/layoutex/*.ao
icu4c/source/layoutex/*.d
icu4c/source/layoutex/*.o
@@ -439,6 +445,8 @@ icu4c/source/test/cintltst/debug
icu4c/source/test/cintltst/release
icu4c/source/test/cintltst/x64
icu4c/source/test/cintltst/x86
+icu4c/source/test/cintltst/ARM
+icu4c/source/test/cintltst/ARM64
icu4c/source/test/compat/Makefile
icu4c/source/test/fuzzer/Makefile
icu4c/source/test/fuzzer/*.d
@@ -460,6 +468,8 @@ icu4c/source/test/intltest/intltest.vcproj.*.*.user
icu4c/source/test/intltest/release
icu4c/source/test/intltest/x64
icu4c/source/test/intltest/x86
+icu4c/source/test/intltest/ARM
+icu4c/source/test/intltest/ARM64
icu4c/source/test/iotest/*.d
icu4c/source/test/iotest/*.dSYM
icu4c/source/test/iotest/*.o
@@ -474,6 +484,8 @@ icu4c/source/test/iotest/iotest.vcproj.*.*.user
icu4c/source/test/iotest/release
icu4c/source/test/iotest/x64
icu4c/source/test/iotest/x86
+icu4c/source/test/iotest/ARM
+icu4c/source/test/iotest/ARM64
icu4c/source/test/letest/*.d
icu4c/source/test/letest/*.o
icu4c/source/test/letest/*.opensdf
@@ -670,6 +682,8 @@ icu4c/source/tools/ctestfw/libsicutest*
icu4c/source/tools/ctestfw/release
icu4c/source/tools/ctestfw/x64
icu4c/source/tools/ctestfw/x86
+icu4c/source/tools/ctestfw/ARM
+icu4c/source/tools/ctestfw/ARM64
icu4c/source/tools/escapesrc/*.d
icu4c/source/tools/escapesrc/*.o
icu4c/source/tools/escapesrc/Makefile
@@ -689,6 +703,8 @@ icu4c/source/tools/genbrk/genbrk.vcproj.*.*.user
icu4c/source/tools/genbrk/release
icu4c/source/tools/genbrk/x64
icu4c/source/tools/genbrk/x86
+icu4c/source/tools/genbrk/ARM
+icu4c/source/tools/genbrk/ARM64
icu4c/source/tools/genccode/*.d
icu4c/source/tools/genccode/*.o
icu4c/source/tools/genccode/*.pdb
@@ -704,6 +720,8 @@ icu4c/source/tools/genccode/genccode.vcproj.*.*.user
icu4c/source/tools/genccode/release
icu4c/source/tools/genccode/x64
icu4c/source/tools/genccode/x86
+icu4c/source/tools/genccode/ARM
+icu4c/source/tools/genccode/ARM64
icu4c/source/tools/gencfu/*.d
icu4c/source/tools/gencfu/*.o
icu4c/source/tools/gencfu/*.pdb
@@ -719,6 +737,8 @@ icu4c/source/tools/gencfu/gencfu.vcproj.*.*.user
icu4c/source/tools/gencfu/release
icu4c/source/tools/gencfu/x64
icu4c/source/tools/gencfu/x86
+icu4c/source/tools/gencfu/ARM
+icu4c/source/tools/gencfu/ARM64
icu4c/source/tools/gencmn/*.d
icu4c/source/tools/gencmn/*.o
icu4c/source/tools/gencmn/*.pdb
@@ -735,6 +755,8 @@ icu4c/source/tools/gencmn/gencmn.vcproj.*.*.user
icu4c/source/tools/gencmn/release
icu4c/source/tools/gencmn/x64
icu4c/source/tools/gencmn/x86
+icu4c/source/tools/gencmn/ARM
+icu4c/source/tools/gencmn/ARM64
icu4c/source/tools/gencnval/*.d
icu4c/source/tools/gencnval/*.ncb
icu4c/source/tools/gencnval/*.o
@@ -753,6 +775,8 @@ icu4c/source/tools/gencnval/gencnval.vcproj.*.*.user
icu4c/source/tools/gencnval/release
icu4c/source/tools/gencnval/x64
icu4c/source/tools/gencnval/x86
+icu4c/source/tools/gencnval/ARM
+icu4c/source/tools/gencnval/ARM64
icu4c/source/tools/gencolusb/Makefile.local
icu4c/source/tools/gencolusb/extract_unsafe_backwards
icu4c/source/tools/gencolusb/verify_uset
@@ -767,6 +791,8 @@ icu4c/source/tools/gendict/Makefile
icu4c/source/tools/gendict/Release
icu4c/source/tools/gendict/x64
icu4c/source/tools/gendict/x86
+icu4c/source/tools/gendict/ARM
+icu4c/source/tools/gendict/ARM64
icu4c/source/tools/gennorm2/*.d
icu4c/source/tools/gennorm2/*.o
icu4c/source/tools/gennorm2/*.pdb
@@ -782,6 +808,8 @@ icu4c/source/tools/gennorm2/gennorm2.vcproj.*.*.user
icu4c/source/tools/gennorm2/release
icu4c/source/tools/gennorm2/x64
icu4c/source/tools/gennorm2/x86
+icu4c/source/tools/gennorm2/ARM
+icu4c/source/tools/gennorm2/ARM64
icu4c/source/tools/genrb/*.1
icu4c/source/tools/genrb/*.d
icu4c/source/tools/genrb/*.o
@@ -804,6 +832,8 @@ icu4c/source/tools/genrb/release
icu4c/source/tools/genrb/temp
icu4c/source/tools/genrb/x64
icu4c/source/tools/genrb/x86
+icu4c/source/tools/genrb/ARM
+icu4c/source/tools/genrb/ARM64
icu4c/source/tools/genren/ICUunrenamed
icu4c/source/tools/genren/Makefile.local
icu4c/source/tools/genren/urename.*
@@ -823,6 +853,8 @@ icu4c/source/tools/gensprep/gensprep.vcproj.*.*.user
icu4c/source/tools/gensprep/release
icu4c/source/tools/gensprep/x64
icu4c/source/tools/gensprep/x86
+icu4c/source/tools/gensprep/ARM
+icu4c/source/tools/gensprep/ARM64
icu4c/source/tools/gentest/*.d
icu4c/source/tools/gentest/*.o
icu4c/source/tools/gentest/*.pdb
@@ -837,6 +869,8 @@ icu4c/source/tools/gentest/gentest.vcproj.*.*.user
icu4c/source/tools/gentest/release
icu4c/source/tools/gentest/x64
icu4c/source/tools/gentest/x86
+icu4c/source/tools/gentest/ARM
+icu4c/source/tools/gentest/ARM64
icu4c/source/tools/icuinfo/*.d
icu4c/source/tools/icuinfo/*.dSYM
icu4c/source/tools/icuinfo/*.dylib
@@ -853,6 +887,8 @@ icu4c/source/tools/icuinfo/icuplugins*.txt
!icu4c/source/tools/icuinfo/icuplugins_windows_sample.txt
icu4c/source/tools/icuinfo/x64
icu4c/source/tools/icuinfo/x86
+icu4c/source/tools/icuinfo/ARM
+icu4c/source/tools/icuinfo/ARM64
icu4c/source/tools/icupkg/*.8
icu4c/source/tools/icupkg/*.d
icu4c/source/tools/icupkg/*.ncb
@@ -871,6 +907,8 @@ icu4c/source/tools/icupkg/icupkg.vcproj.*.*.user
icu4c/source/tools/icupkg/release
icu4c/source/tools/icupkg/x64
icu4c/source/tools/icupkg/x86
+icu4c/source/tools/icupkg/ARM
+icu4c/source/tools/icupkg/ARM64
icu4c/source/tools/icuswap/*.d
icu4c/source/tools/icuswap/*.ncb
icu4c/source/tools/icuswap/*.o
@@ -901,6 +939,8 @@ icu4c/source/tools/makeconv/makeconv.vcproj.*.*.user
icu4c/source/tools/makeconv/release
icu4c/source/tools/makeconv/x64
icu4c/source/tools/makeconv/x86
+icu4c/source/tools/makeconv/ARM
+icu4c/source/tools/makeconv/ARM64
icu4c/source/tools/pkgdata/*.1
icu4c/source/tools/pkgdata/*.d
icu4c/source/tools/pkgdata/*.ncb
@@ -919,6 +959,8 @@ icu4c/source/tools/pkgdata/pkgdata.vcproj.*.*.user
icu4c/source/tools/pkgdata/release
icu4c/source/tools/pkgdata/x64
icu4c/source/tools/pkgdata/x86
+icu4c/source/tools/pkgdata/ARM
+icu4c/source/tools/pkgdata/ARM64
icu4c/source/tools/toolutil/*.ao
icu4c/source/tools/toolutil/*.d
icu4c/source/tools/toolutil/*.ncb
@@ -936,6 +978,8 @@ icu4c/source/tools/toolutil/release
icu4c/source/tools/toolutil/toolutil.vcproj.*.*.user
icu4c/source/tools/toolutil/x64
icu4c/source/tools/toolutil/x86
+icu4c/source/tools/toolutil/ARM
+icu4c/source/tools/toolutil/ARM64
icu4c/source/tools/tzcode/*.ao
icu4c/source/tools/tzcode/*.o
icu4c/source/tools/tzcode/.vs
diff --git a/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props b/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props
index e262a01b333..ab535881c79 100644
--- a/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props
+++ b/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props
@@ -12,6 +12,14 @@
Debug
x64
+
+ Debug
+ ARM
+
+
+ Debug
+ ARM64
+
Release
Win32
@@ -20,15 +28,52 @@
Release
x64
+
+ Release
+ ARM
+
+
+ Release
+ ARM64
+
+
+
+ bin
+ lib
+
+
+ bin64
+ lib64
+
+
+ binARM
+ libARM
+
+
+ binARM64
+ libARM64
+
+
-
8.1
+
+
+
+ 10.0.16299.0
+ true
+
+
+ 10.0.16299.0
+ true
+
0x0601
@@ -72,12 +117,15 @@
NDEBUG;%(PreprocessorDefinitions)
true
+ true
+ ProgramDatabase
NDEBUG;%(PreprocessorDefinitions)
true
+ UseLinkTimeCodeGeneration
@@ -123,4 +171,36 @@
MachineX64
+
+
+
+ ARM
+
+
+ ARM;WIN32;%(PreprocessorDefinitions)
+
+
+ MachineARM
+
+ kernel32.lib;%(AdditionalDependencies)
+
+ C:\Program Files (x86)\Windows Kits\10\Lib\10.0.16299.0\um\arm
+
+
+
+
+
+ ARM64
+
+
+ ARM64;WIN32;%(PreprocessorDefinitions)
+
+
+ MachineARM64
+
+ kernel32.lib;%(AdditionalDependencies)
+
+ C:\Program Files (x86)\Windows Kits\10\Lib\10.0.16299.0\um\arm64
+
+
\ No newline at end of file
diff --git a/icu4c/source/allinone/Build.Windows.UWP.ProjectConfiguration.props b/icu4c/source/allinone/Build.Windows.UWP.ProjectConfiguration.props
index 5dffa96c6cd..359d2c2de43 100644
--- a/icu4c/source/allinone/Build.Windows.UWP.ProjectConfiguration.props
+++ b/icu4c/source/allinone/Build.Windows.UWP.ProjectConfiguration.props
@@ -24,6 +24,23 @@
+
+
+ bin32uwp
+ lib32uwp
+
+
+ bin64uwp
+ lib64uwp
+
+
+ binARMuwp
+ libARMuwp
+
+
+ binARM64uwp
+ libARM64uwp
+
diff --git a/icu4c/source/allinone/allinone.sln b/icu4c/source/allinone/allinone.sln
index 2b18941596d..fbbec359e48 100644
--- a/icu4c/source/allinone/allinone.sln
+++ b/icu4c/source/allinone/allinone.sln
@@ -218,38 +218,50 @@ Global
{F7659D77-09CF-4FE9-ACEE-927287AA9509}.Release|Win32.Build.0 = Release|Win32
{F7659D77-09CF-4FE9-ACEE-927287AA9509}.Release|x64.ActiveCfg = Release|x64
{F7659D77-09CF-4FE9-ACEE-927287AA9509}.Release|x64.Build.0 = Release|x64
- {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug|ARM.ActiveCfg = Debug|Win32
- {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug|ARM.ActiveCfg = Debug|ARM
+ {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug|ARM.Build.0 = Debug|ARM
+ {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug|ARM64.Build.0 = Debug|ARM64
{3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug|Win32.ActiveCfg = Debug|Win32
{3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug|Win32.Build.0 = Debug|Win32
{3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug|x64.ActiveCfg = Debug|x64
{3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug|x64.Build.0 = Debug|x64
- {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Release|ARM.ActiveCfg = Release|Win32
- {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Release|ARM64.ActiveCfg = Release|Win32
+ {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Release|ARM.ActiveCfg = Release|ARM
+ {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Release|ARM.Build.0 = Release|ARM
+ {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Release|ARM64.ActiveCfg = Release|ARM64
+ {3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Release|ARM64.Build.0 = Release|ARM64
{3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Release|Win32.ActiveCfg = Release|Win32
{3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Release|Win32.Build.0 = Release|Win32
{3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Release|x64.ActiveCfg = Release|x64
{3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Release|x64.Build.0 = Release|x64
- {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|ARM.ActiveCfg = Debug|Win32
- {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|ARM.ActiveCfg = Debug|ARM
+ {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|ARM.Build.0 = Debug|ARM
+ {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|ARM64.Build.0 = Debug|ARM64
{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|Win32.ActiveCfg = Debug|Win32
{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|Win32.Build.0 = Debug|Win32
{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|x64.ActiveCfg = Debug|x64
{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|x64.Build.0 = Debug|x64
- {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|ARM.ActiveCfg = Release|Win32
- {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|ARM64.ActiveCfg = Release|Win32
+ {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|ARM.ActiveCfg = Release|ARM
+ {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|ARM.Build.0 = Release|ARM
+ {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|ARM64.ActiveCfg = Release|ARM64
+ {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|ARM64.Build.0 = Release|ARM64
{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|Win32.ActiveCfg = Release|Win32
{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|Win32.Build.0 = Release|Win32
{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|x64.ActiveCfg = Release|x64
{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|x64.Build.0 = Release|x64
- {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Debug|ARM.ActiveCfg = Debug|Win32
- {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Debug|ARM.ActiveCfg = Debug|ARM
+ {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Debug|ARM.Build.0 = Debug|ARM
+ {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Debug|ARM64.Build.0 = Debug|ARM64
{ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Debug|Win32.ActiveCfg = Debug|Win32
{ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Debug|Win32.Build.0 = Debug|Win32
{ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Debug|x64.ActiveCfg = Debug|x64
{ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Debug|x64.Build.0 = Debug|x64
- {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Release|ARM.ActiveCfg = Release|Win32
- {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Release|ARM64.ActiveCfg = Release|Win32
+ {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Release|ARM.ActiveCfg = Release|ARM
+ {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Release|ARM.Build.0 = Release|ARM
+ {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Release|ARM64.ActiveCfg = Release|ARM64
+ {ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Release|ARM64.Build.0 = Release|ARM64
{ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Release|Win32.ActiveCfg = Release|Win32
{ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Release|Win32.Build.0 = Release|Win32
{ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Release|x64.ActiveCfg = Release|x64
@@ -266,146 +278,194 @@ Global
{38B5751A-C6F9-4409-950C-F4F9DA17275F}.Release|Win32.Build.0 = Release|Win32
{38B5751A-C6F9-4409-950C-F4F9DA17275F}.Release|x64.ActiveCfg = Release|x64
{38B5751A-C6F9-4409-950C-F4F9DA17275F}.Release|x64.Build.0 = Release|x64
- {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Debug|ARM.ActiveCfg = Debug|Win32
- {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Debug|ARM.ActiveCfg = Debug|ARM
+ {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Debug|ARM.Build.0 = Debug|ARM
+ {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Debug|ARM64.Build.0 = Debug|ARM64
{D3065ADB-8820-4CC7-9B6C-9510833961A3}.Debug|Win32.ActiveCfg = Debug|Win32
{D3065ADB-8820-4CC7-9B6C-9510833961A3}.Debug|Win32.Build.0 = Debug|Win32
{D3065ADB-8820-4CC7-9B6C-9510833961A3}.Debug|x64.ActiveCfg = Debug|x64
{D3065ADB-8820-4CC7-9B6C-9510833961A3}.Debug|x64.Build.0 = Debug|x64
- {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Release|ARM.ActiveCfg = Release|Win32
- {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Release|ARM64.ActiveCfg = Release|Win32
+ {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Release|ARM.ActiveCfg = Release|ARM
+ {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Release|ARM.Build.0 = Release|ARM
+ {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Release|ARM64.ActiveCfg = Release|ARM64
+ {D3065ADB-8820-4CC7-9B6C-9510833961A3}.Release|ARM64.Build.0 = Release|ARM64
{D3065ADB-8820-4CC7-9B6C-9510833961A3}.Release|Win32.ActiveCfg = Release|Win32
{D3065ADB-8820-4CC7-9B6C-9510833961A3}.Release|Win32.Build.0 = Release|Win32
{D3065ADB-8820-4CC7-9B6C-9510833961A3}.Release|x64.ActiveCfg = Release|x64
{D3065ADB-8820-4CC7-9B6C-9510833961A3}.Release|x64.Build.0 = Release|x64
- {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Debug|ARM.ActiveCfg = Debug|Win32
- {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Debug|ARM.ActiveCfg = Debug|ARM
+ {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Debug|ARM.Build.0 = Debug|ARM
+ {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Debug|ARM64.Build.0 = Debug|ARM64
{C2BE5000-7501-4E87-9724-B8D82494FAE6}.Debug|Win32.ActiveCfg = Debug|Win32
{C2BE5000-7501-4E87-9724-B8D82494FAE6}.Debug|Win32.Build.0 = Debug|Win32
{C2BE5000-7501-4E87-9724-B8D82494FAE6}.Debug|x64.ActiveCfg = Debug|x64
{C2BE5000-7501-4E87-9724-B8D82494FAE6}.Debug|x64.Build.0 = Debug|x64
- {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Release|ARM.ActiveCfg = Release|Win32
- {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Release|ARM64.ActiveCfg = Release|Win32
+ {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Release|ARM.ActiveCfg = Release|ARM
+ {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Release|ARM.Build.0 = Release|ARM
+ {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Release|ARM64.ActiveCfg = Release|ARM64
+ {C2BE5000-7501-4E87-9724-B8D82494FAE6}.Release|ARM64.Build.0 = Release|ARM64
{C2BE5000-7501-4E87-9724-B8D82494FAE6}.Release|Win32.ActiveCfg = Release|Win32
{C2BE5000-7501-4E87-9724-B8D82494FAE6}.Release|Win32.Build.0 = Release|Win32
{C2BE5000-7501-4E87-9724-B8D82494FAE6}.Release|x64.ActiveCfg = Release|x64
{C2BE5000-7501-4E87-9724-B8D82494FAE6}.Release|x64.Build.0 = Release|x64
- {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Debug|ARM.ActiveCfg = Debug|Win32
- {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Debug|ARM.ActiveCfg = Debug|ARM
+ {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Debug|ARM.Build.0 = Debug|ARM
+ {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Debug|ARM64.Build.0 = Debug|ARM64
{FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Debug|Win32.ActiveCfg = Debug|Win32
{FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Debug|Win32.Build.0 = Debug|Win32
{FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Debug|x64.ActiveCfg = Debug|x64
{FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Debug|x64.Build.0 = Debug|x64
- {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Release|ARM.ActiveCfg = Release|Win32
- {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Release|ARM64.ActiveCfg = Release|Win32
+ {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Release|ARM.ActiveCfg = Release|ARM
+ {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Release|ARM.Build.0 = Release|ARM
+ {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Release|ARM64.ActiveCfg = Release|ARM64
+ {FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Release|ARM64.Build.0 = Release|ARM64
{FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Release|Win32.ActiveCfg = Release|Win32
{FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Release|Win32.Build.0 = Release|Win32
{FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Release|x64.ActiveCfg = Release|x64
{FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Release|x64.Build.0 = Release|x64
- {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Debug|ARM.ActiveCfg = Debug|Win32
- {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Debug|ARM.ActiveCfg = Debug|ARM
+ {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Debug|ARM.Build.0 = Debug|ARM
+ {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Debug|ARM64.Build.0 = Debug|ARM64
{A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Debug|Win32.ActiveCfg = Debug|Win32
{A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Debug|Win32.Build.0 = Debug|Win32
{A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Debug|x64.ActiveCfg = Debug|x64
{A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Debug|x64.Build.0 = Debug|x64
- {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Release|ARM.ActiveCfg = Release|Win32
- {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Release|ARM64.ActiveCfg = Release|Win32
+ {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Release|ARM.ActiveCfg = Release|ARM
+ {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Release|ARM.Build.0 = Release|ARM
+ {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Release|ARM64.ActiveCfg = Release|ARM64
+ {A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Release|ARM64.Build.0 = Release|ARM64
{A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Release|Win32.ActiveCfg = Release|Win32
{A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Release|Win32.Build.0 = Release|Win32
{A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Release|x64.ActiveCfg = Release|x64
{A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Release|x64.Build.0 = Release|x64
- {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Debug|ARM.ActiveCfg = Debug|Win32
- {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Debug|ARM.ActiveCfg = Debug|ARM
+ {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Debug|ARM.Build.0 = Debug|ARM
+ {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Debug|ARM64.Build.0 = Debug|ARM64
{8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Debug|Win32.ActiveCfg = Debug|Win32
{8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Debug|Win32.Build.0 = Debug|Win32
{8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Debug|x64.ActiveCfg = Debug|x64
{8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Debug|x64.Build.0 = Debug|x64
- {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Release|ARM.ActiveCfg = Release|Win32
- {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Release|ARM64.ActiveCfg = Release|Win32
+ {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Release|ARM.ActiveCfg = Release|ARM
+ {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Release|ARM.Build.0 = Release|ARM
+ {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Release|ARM64.ActiveCfg = Release|ARM64
+ {8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Release|ARM64.Build.0 = Release|ARM64
{8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Release|Win32.ActiveCfg = Release|Win32
{8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Release|Win32.Build.0 = Release|Win32
{8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Release|x64.ActiveCfg = Release|x64
{8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Release|x64.Build.0 = Release|x64
- {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Debug|ARM.ActiveCfg = Debug|Win32
- {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Debug|ARM.ActiveCfg = Debug|ARM
+ {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Debug|ARM.Build.0 = Debug|ARM
+ {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Debug|ARM64.Build.0 = Debug|ARM64
{97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Debug|Win32.ActiveCfg = Debug|Win32
{97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Debug|Win32.Build.0 = Debug|Win32
{97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Debug|x64.ActiveCfg = Debug|x64
{97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Debug|x64.Build.0 = Debug|x64
- {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Release|ARM.ActiveCfg = Release|Win32
- {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Release|ARM64.ActiveCfg = Release|Win32
+ {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Release|ARM.ActiveCfg = Release|ARM
+ {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Release|ARM.Build.0 = Release|ARM
+ {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Release|ARM64.ActiveCfg = Release|ARM64
+ {97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Release|ARM64.Build.0 = Release|ARM64
{97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Release|Win32.ActiveCfg = Release|Win32
{97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Release|Win32.Build.0 = Release|Win32
{97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Release|x64.ActiveCfg = Release|x64
{97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Release|x64.Build.0 = Release|x64
- {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Debug|ARM.ActiveCfg = Debug|Win32
- {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Debug|ARM.ActiveCfg = Debug|ARM
+ {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Debug|ARM.Build.0 = Debug|ARM
+ {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Debug|ARM64.Build.0 = Debug|ARM64
{77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Debug|Win32.ActiveCfg = Debug|Win32
{77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Debug|Win32.Build.0 = Debug|Win32
{77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Debug|x64.ActiveCfg = Debug|x64
{77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Debug|x64.Build.0 = Debug|x64
- {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Release|ARM.ActiveCfg = Release|Win32
- {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Release|ARM64.ActiveCfg = Release|Win32
+ {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Release|ARM.ActiveCfg = Release|ARM
+ {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Release|ARM.Build.0 = Release|ARM
+ {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Release|ARM64.ActiveCfg = Release|ARM64
+ {77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Release|ARM64.Build.0 = Release|ARM64
{77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Release|Win32.ActiveCfg = Release|Win32
{77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Release|Win32.Build.0 = Release|Win32
{77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Release|x64.ActiveCfg = Release|x64
{77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Release|x64.Build.0 = Release|x64
- {0178B127-6269-407D-B112-93877BB62776}.Debug|ARM.ActiveCfg = Debug|Win32
- {0178B127-6269-407D-B112-93877BB62776}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {0178B127-6269-407D-B112-93877BB62776}.Debug|ARM.ActiveCfg = Debug|ARM
+ {0178B127-6269-407D-B112-93877BB62776}.Debug|ARM.Build.0 = Debug|ARM
+ {0178B127-6269-407D-B112-93877BB62776}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {0178B127-6269-407D-B112-93877BB62776}.Debug|ARM64.Build.0 = Debug|ARM64
{0178B127-6269-407D-B112-93877BB62776}.Debug|Win32.ActiveCfg = Debug|Win32
{0178B127-6269-407D-B112-93877BB62776}.Debug|Win32.Build.0 = Debug|Win32
{0178B127-6269-407D-B112-93877BB62776}.Debug|x64.ActiveCfg = Debug|x64
{0178B127-6269-407D-B112-93877BB62776}.Debug|x64.Build.0 = Debug|x64
- {0178B127-6269-407D-B112-93877BB62776}.Release|ARM.ActiveCfg = Release|Win32
- {0178B127-6269-407D-B112-93877BB62776}.Release|ARM64.ActiveCfg = Release|Win32
+ {0178B127-6269-407D-B112-93877BB62776}.Release|ARM.ActiveCfg = Release|ARM
+ {0178B127-6269-407D-B112-93877BB62776}.Release|ARM.Build.0 = Release|ARM
+ {0178B127-6269-407D-B112-93877BB62776}.Release|ARM64.ActiveCfg = Release|ARM64
+ {0178B127-6269-407D-B112-93877BB62776}.Release|ARM64.Build.0 = Release|ARM64
{0178B127-6269-407D-B112-93877BB62776}.Release|Win32.ActiveCfg = Release|Win32
{0178B127-6269-407D-B112-93877BB62776}.Release|Win32.Build.0 = Release|Win32
{0178B127-6269-407D-B112-93877BB62776}.Release|x64.ActiveCfg = Release|x64
{0178B127-6269-407D-B112-93877BB62776}.Release|x64.Build.0 = Release|x64
- {73632960-B3A6-464D-83A3-4B43365F19B8}.Debug|ARM.ActiveCfg = Debug|Win32
- {73632960-B3A6-464D-83A3-4B43365F19B8}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {73632960-B3A6-464D-83A3-4B43365F19B8}.Debug|ARM.ActiveCfg = Debug|ARM
+ {73632960-B3A6-464D-83A3-4B43365F19B8}.Debug|ARM.Build.0 = Debug|ARM
+ {73632960-B3A6-464D-83A3-4B43365F19B8}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {73632960-B3A6-464D-83A3-4B43365F19B8}.Debug|ARM64.Build.0 = Debug|ARM64
{73632960-B3A6-464D-83A3-4B43365F19B8}.Debug|Win32.ActiveCfg = Debug|Win32
{73632960-B3A6-464D-83A3-4B43365F19B8}.Debug|Win32.Build.0 = Debug|Win32
{73632960-B3A6-464D-83A3-4B43365F19B8}.Debug|x64.ActiveCfg = Debug|x64
{73632960-B3A6-464D-83A3-4B43365F19B8}.Debug|x64.Build.0 = Debug|x64
- {73632960-B3A6-464D-83A3-4B43365F19B8}.Release|ARM.ActiveCfg = Release|Win32
- {73632960-B3A6-464D-83A3-4B43365F19B8}.Release|ARM64.ActiveCfg = Release|Win32
+ {73632960-B3A6-464D-83A3-4B43365F19B8}.Release|ARM.ActiveCfg = Release|ARM
+ {73632960-B3A6-464D-83A3-4B43365F19B8}.Release|ARM.Build.0 = Release|ARM
+ {73632960-B3A6-464D-83A3-4B43365F19B8}.Release|ARM64.ActiveCfg = Release|ARM64
+ {73632960-B3A6-464D-83A3-4B43365F19B8}.Release|ARM64.Build.0 = Release|ARM64
{73632960-B3A6-464D-83A3-4B43365F19B8}.Release|Win32.ActiveCfg = Release|Win32
{73632960-B3A6-464D-83A3-4B43365F19B8}.Release|Win32.Build.0 = Release|Win32
{73632960-B3A6-464D-83A3-4B43365F19B8}.Release|x64.ActiveCfg = Release|x64
{73632960-B3A6-464D-83A3-4B43365F19B8}.Release|x64.Build.0 = Release|x64
- {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Debug|ARM.ActiveCfg = Debug|Win32
- {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Debug|ARM.ActiveCfg = Debug|ARM
+ {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Debug|ARM.Build.0 = Debug|ARM
+ {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Debug|ARM64.Build.0 = Debug|ARM64
{F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Debug|Win32.ActiveCfg = Debug|Win32
{F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Debug|Win32.Build.0 = Debug|Win32
{F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Debug|x64.ActiveCfg = Debug|x64
{F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Debug|x64.Build.0 = Debug|x64
- {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Release|ARM.ActiveCfg = Release|Win32
- {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Release|ARM64.ActiveCfg = Release|Win32
+ {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Release|ARM.ActiveCfg = Release|ARM
+ {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Release|ARM.Build.0 = Release|ARM
+ {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Release|ARM64.ActiveCfg = Release|ARM64
+ {F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Release|ARM64.Build.0 = Release|ARM64
{F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Release|Win32.ActiveCfg = Release|Win32
{F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Release|Win32.Build.0 = Release|Win32
{F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Release|x64.ActiveCfg = Release|x64
{F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Release|x64.Build.0 = Release|x64
- {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Debug|ARM.ActiveCfg = Debug|Win32
- {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Debug|ARM.ActiveCfg = Debug|ARM
+ {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Debug|ARM.Build.0 = Debug|ARM
+ {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Debug|ARM64.Build.0 = Debug|ARM64
{D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Debug|Win32.ActiveCfg = Debug|Win32
{D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Debug|Win32.Build.0 = Debug|Win32
{D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Debug|x64.ActiveCfg = Debug|x64
{D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Debug|x64.Build.0 = Debug|x64
- {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Release|ARM.ActiveCfg = Release|Win32
- {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Release|ARM64.ActiveCfg = Release|Win32
+ {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Release|ARM.ActiveCfg = Release|ARM
+ {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Release|ARM.Build.0 = Release|ARM
+ {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Release|ARM64.ActiveCfg = Release|ARM64
+ {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Release|ARM64.Build.0 = Release|ARM64
{D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Release|Win32.ActiveCfg = Release|Win32
{D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Release|Win32.Build.0 = Release|Win32
{D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Release|x64.ActiveCfg = Release|x64
{D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Release|x64.Build.0 = Release|x64
- {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Debug|ARM.ActiveCfg = Debug|Win32
- {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Debug|ARM.ActiveCfg = Debug|ARM
+ {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Debug|ARM.Build.0 = Debug|ARM
+ {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Debug|ARM64.Build.0 = Debug|ARM64
{4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Debug|Win32.ActiveCfg = Debug|Win32
{4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Debug|Win32.Build.0 = Debug|Win32
{4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Debug|x64.ActiveCfg = Debug|x64
{4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Debug|x64.Build.0 = Debug|x64
- {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release|ARM.ActiveCfg = Release|Win32
- {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release|ARM64.ActiveCfg = Release|Win32
+ {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release|ARM.ActiveCfg = Release|ARM
+ {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release|ARM.Build.0 = Release|ARM
+ {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release|ARM64.ActiveCfg = Release|ARM64
+ {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release|ARM64.Build.0 = Release|ARM64
{4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release|Win32.ActiveCfg = Release|Win32
{4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release|Win32.Build.0 = Release|Win32
{4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release|x64.ActiveCfg = Release|x64
@@ -426,134 +486,178 @@ Global
{203EC78A-0531-43F0-A636-285439BDE025}.Release|Win32.Build.0 = Release|Win32
{203EC78A-0531-43F0-A636-285439BDE025}.Release|x64.ActiveCfg = Release|x64
{203EC78A-0531-43F0-A636-285439BDE025}.Release|x64.Build.0 = Release|x64
- {6B231032-3CB5-4EED-9210-810D666A23A0}.Debug|ARM.ActiveCfg = Debug|Win32
- {6B231032-3CB5-4EED-9210-810D666A23A0}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {6B231032-3CB5-4EED-9210-810D666A23A0}.Debug|ARM.ActiveCfg = Debug|ARM
+ {6B231032-3CB5-4EED-9210-810D666A23A0}.Debug|ARM.Build.0 = Debug|ARM
+ {6B231032-3CB5-4EED-9210-810D666A23A0}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {6B231032-3CB5-4EED-9210-810D666A23A0}.Debug|ARM64.Build.0 = Debug|ARM64
{6B231032-3CB5-4EED-9210-810D666A23A0}.Debug|Win32.ActiveCfg = Debug|Win32
{6B231032-3CB5-4EED-9210-810D666A23A0}.Debug|Win32.Build.0 = Debug|Win32
{6B231032-3CB5-4EED-9210-810D666A23A0}.Debug|x64.ActiveCfg = Debug|x64
{6B231032-3CB5-4EED-9210-810D666A23A0}.Debug|x64.Build.0 = Debug|x64
- {6B231032-3CB5-4EED-9210-810D666A23A0}.Release|ARM.ActiveCfg = Release|Win32
- {6B231032-3CB5-4EED-9210-810D666A23A0}.Release|ARM64.ActiveCfg = Release|Win32
+ {6B231032-3CB5-4EED-9210-810D666A23A0}.Release|ARM.ActiveCfg = Release|ARM
+ {6B231032-3CB5-4EED-9210-810D666A23A0}.Release|ARM.Build.0 = Release|ARM
+ {6B231032-3CB5-4EED-9210-810D666A23A0}.Release|ARM64.ActiveCfg = Release|ARM64
+ {6B231032-3CB5-4EED-9210-810D666A23A0}.Release|ARM64.Build.0 = Release|ARM64
{6B231032-3CB5-4EED-9210-810D666A23A0}.Release|Win32.ActiveCfg = Release|Win32
{6B231032-3CB5-4EED-9210-810D666A23A0}.Release|Win32.Build.0 = Release|Win32
{6B231032-3CB5-4EED-9210-810D666A23A0}.Release|x64.ActiveCfg = Release|x64
{6B231032-3CB5-4EED-9210-810D666A23A0}.Release|x64.Build.0 = Release|x64
- {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Debug|ARM.ActiveCfg = Debug|Win32
- {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Debug|ARM.ActiveCfg = Debug|ARM
+ {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Debug|ARM.Build.0 = Debug|ARM
+ {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Debug|ARM64.Build.0 = Debug|ARM64
{DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Debug|Win32.ActiveCfg = Debug|Win32
{DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Debug|Win32.Build.0 = Debug|Win32
{DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Debug|x64.ActiveCfg = Debug|x64
{DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Debug|x64.Build.0 = Debug|x64
- {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Release|ARM.ActiveCfg = Release|Win32
- {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Release|ARM64.ActiveCfg = Release|Win32
+ {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Release|ARM.ActiveCfg = Release|ARM
+ {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Release|ARM.Build.0 = Release|ARM
+ {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Release|ARM64.ActiveCfg = Release|ARM64
+ {DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Release|ARM64.Build.0 = Release|ARM64
{DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Release|Win32.ActiveCfg = Release|Win32
{DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Release|Win32.Build.0 = Release|Win32
{DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Release|x64.ActiveCfg = Release|x64
{DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Release|x64.Build.0 = Release|x64
- {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Debug|ARM.ActiveCfg = Debug|Win32
- {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Debug|ARM.ActiveCfg = Debug|ARM
+ {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Debug|ARM.Build.0 = Debug|ARM
+ {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Debug|ARM64.Build.0 = Debug|ARM64
{C2B04507-2521-4801-BF0D-5FD79D6D518C}.Debug|Win32.ActiveCfg = Debug|Win32
{C2B04507-2521-4801-BF0D-5FD79D6D518C}.Debug|Win32.Build.0 = Debug|Win32
{C2B04507-2521-4801-BF0D-5FD79D6D518C}.Debug|x64.ActiveCfg = Debug|x64
{C2B04507-2521-4801-BF0D-5FD79D6D518C}.Debug|x64.Build.0 = Debug|x64
- {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Release|ARM.ActiveCfg = Release|Win32
- {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Release|ARM64.ActiveCfg = Release|Win32
+ {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Release|ARM.ActiveCfg = Release|ARM
+ {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Release|ARM.Build.0 = Release|ARM
+ {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Release|ARM64.ActiveCfg = Release|ARM64
+ {C2B04507-2521-4801-BF0D-5FD79D6D518C}.Release|ARM64.Build.0 = Release|ARM64
{C2B04507-2521-4801-BF0D-5FD79D6D518C}.Release|Win32.ActiveCfg = Release|Win32
{C2B04507-2521-4801-BF0D-5FD79D6D518C}.Release|Win32.Build.0 = Release|Win32
{C2B04507-2521-4801-BF0D-5FD79D6D518C}.Release|x64.ActiveCfg = Release|x64
{C2B04507-2521-4801-BF0D-5FD79D6D518C}.Release|x64.Build.0 = Release|x64
- {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Debug|ARM.ActiveCfg = Debug|Win32
- {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Debug|ARM.ActiveCfg = Debug|ARM
+ {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Debug|ARM.Build.0 = Debug|ARM
+ {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Debug|ARM64.Build.0 = Debug|ARM64
{631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Debug|Win32.ActiveCfg = Debug|Win32
{631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Debug|Win32.Build.0 = Debug|Win32
{631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Debug|x64.ActiveCfg = Debug|x64
{631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Debug|x64.Build.0 = Debug|x64
- {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Release|ARM.ActiveCfg = Release|Win32
- {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Release|ARM64.ActiveCfg = Release|Win32
+ {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Release|ARM.ActiveCfg = Release|ARM
+ {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Release|ARM.Build.0 = Release|ARM
+ {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Release|ARM64.ActiveCfg = Release|ARM64
+ {631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Release|ARM64.Build.0 = Release|ARM64
{631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Release|Win32.ActiveCfg = Release|Win32
{631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Release|Win32.Build.0 = Release|Win32
{631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Release|x64.ActiveCfg = Release|x64
{631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Release|x64.Build.0 = Release|x64
- {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Debug|ARM.ActiveCfg = Debug|Win32
- {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Debug|ARM.ActiveCfg = Debug|ARM
+ {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Debug|ARM.Build.0 = Debug|ARM
+ {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Debug|ARM64.Build.0 = Debug|ARM64
{E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Debug|Win32.ActiveCfg = Debug|Win32
{E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Debug|Win32.Build.0 = Debug|Win32
{E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Debug|x64.ActiveCfg = Debug|x64
{E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Debug|x64.Build.0 = Debug|x64
- {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Release|ARM.ActiveCfg = Release|Win32
- {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Release|ARM64.ActiveCfg = Release|Win32
+ {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Release|ARM.ActiveCfg = Release|ARM
+ {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Release|ARM.Build.0 = Release|ARM
+ {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Release|ARM64.ActiveCfg = Release|ARM64
+ {E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Release|ARM64.Build.0 = Release|ARM64
{E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Release|Win32.ActiveCfg = Release|Win32
{E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Release|Win32.Build.0 = Release|Win32
{E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Release|x64.ActiveCfg = Release|x64
{E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Release|x64.Build.0 = Release|x64
- {62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Debug|ARM.ActiveCfg = Debug|Win32
- {62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Debug|ARM.ActiveCfg = Debug|ARM
+ {62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Debug|ARM.Build.0 = Debug|ARM
+ {62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Debug|ARM64.Build.0 = Debug|ARM64
{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Debug|Win32.ActiveCfg = Debug|Win32
{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Debug|Win32.Build.0 = Debug|Win32
{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Debug|x64.ActiveCfg = Debug|x64
{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Debug|x64.Build.0 = Debug|x64
- {62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Release|ARM.ActiveCfg = Release|Win32
- {62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Release|ARM64.ActiveCfg = Release|Win32
+ {62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Release|ARM.ActiveCfg = Release|ARM
+ {62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Release|ARM.Build.0 = Release|ARM
+ {62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Release|ARM64.ActiveCfg = Release|ARM64
+ {62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Release|ARM64.Build.0 = Release|ARM64
{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Release|Win32.ActiveCfg = Release|Win32
{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Release|Win32.Build.0 = Release|Win32
{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Release|x64.ActiveCfg = Release|x64
{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Release|x64.Build.0 = Release|x64
- {9D4211F7-2C77-439C-82F0-30A4E43BA569}.Debug|ARM.ActiveCfg = Debug|Win32
- {9D4211F7-2C77-439C-82F0-30A4E43BA569}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {9D4211F7-2C77-439C-82F0-30A4E43BA569}.Debug|ARM.ActiveCfg = Debug|ARM
+ {9D4211F7-2C77-439C-82F0-30A4E43BA569}.Debug|ARM.Build.0 = Debug|ARM
+ {9D4211F7-2C77-439C-82F0-30A4E43BA569}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9D4211F7-2C77-439C-82F0-30A4E43BA569}.Debug|ARM64.Build.0 = Debug|ARM64
{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Debug|Win32.ActiveCfg = Debug|Win32
{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Debug|Win32.Build.0 = Debug|Win32
{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Debug|x64.ActiveCfg = Debug|x64
{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Debug|x64.Build.0 = Debug|x64
- {9D4211F7-2C77-439C-82F0-30A4E43BA569}.Release|ARM.ActiveCfg = Release|Win32
- {9D4211F7-2C77-439C-82F0-30A4E43BA569}.Release|ARM64.ActiveCfg = Release|Win32
+ {9D4211F7-2C77-439C-82F0-30A4E43BA569}.Release|ARM.ActiveCfg = Release|ARM
+ {9D4211F7-2C77-439C-82F0-30A4E43BA569}.Release|ARM.Build.0 = Release|ARM
+ {9D4211F7-2C77-439C-82F0-30A4E43BA569}.Release|ARM64.ActiveCfg = Release|ARM64
+ {9D4211F7-2C77-439C-82F0-30A4E43BA569}.Release|ARM64.Build.0 = Release|ARM64
{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Release|Win32.ActiveCfg = Release|Win32
{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Release|Win32.Build.0 = Release|Win32
{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Release|x64.ActiveCfg = Release|x64
{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Release|x64.Build.0 = Release|x64
- {691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Debug|ARM.ActiveCfg = Debug|Win32
- {691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Debug|ARM.ActiveCfg = Debug|ARM
+ {691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Debug|ARM.Build.0 = Debug|ARM
+ {691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Debug|ARM64.Build.0 = Debug|ARM64
{691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Debug|Win32.ActiveCfg = Debug|Win32
{691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Debug|Win32.Build.0 = Debug|Win32
{691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Debug|x64.ActiveCfg = Debug|x64
{691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Debug|x64.Build.0 = Debug|x64
- {691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Release|ARM.ActiveCfg = Release|Win32
- {691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Release|ARM64.ActiveCfg = Release|Win32
+ {691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Release|ARM.ActiveCfg = Release|ARM
+ {691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Release|ARM.Build.0 = Release|ARM
+ {691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Release|ARM64.ActiveCfg = Release|ARM64
+ {691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Release|ARM64.Build.0 = Release|ARM64
{691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Release|Win32.ActiveCfg = Release|Win32
{691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Release|Win32.Build.0 = Release|Win32
{691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Release|x64.ActiveCfg = Release|x64
{691EE0C0-DC57-4A48-8AEE-8ED75EB3A057}.Release|x64.Build.0 = Release|x64
- {C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Debug|ARM.ActiveCfg = Debug|Win32
- {C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Debug|ARM.ActiveCfg = Debug|ARM
+ {C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Debug|ARM.Build.0 = Debug|ARM
+ {C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Debug|ARM64.Build.0 = Debug|ARM64
{C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Debug|Win32.ActiveCfg = Debug|Win32
{C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Debug|Win32.Build.0 = Debug|Win32
{C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Debug|x64.ActiveCfg = Debug|x64
{C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Debug|x64.Build.0 = Debug|x64
- {C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Release|ARM.ActiveCfg = Release|Win32
- {C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Release|ARM64.ActiveCfg = Release|Win32
+ {C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Release|ARM.ActiveCfg = Release|ARM
+ {C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Release|ARM.Build.0 = Release|ARM
+ {C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Release|ARM64.ActiveCfg = Release|ARM64
+ {C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Release|ARM64.Build.0 = Release|ARM64
{C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Release|Win32.ActiveCfg = Release|Win32
{C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Release|Win32.Build.0 = Release|Win32
{C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Release|x64.ActiveCfg = Release|x64
{C7891A65-80AB-4245-912E-5F1E17B0E6C4}.Release|x64.Build.0 = Release|x64
- {E7611F49-F088-4175-9446-6111444E72C8}.Debug|ARM.ActiveCfg = Debug|Win32
- {E7611F49-F088-4175-9446-6111444E72C8}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {E7611F49-F088-4175-9446-6111444E72C8}.Debug|ARM.ActiveCfg = Debug|ARM
+ {E7611F49-F088-4175-9446-6111444E72C8}.Debug|ARM.Build.0 = Debug|ARM
+ {E7611F49-F088-4175-9446-6111444E72C8}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {E7611F49-F088-4175-9446-6111444E72C8}.Debug|ARM64.Build.0 = Debug|ARM64
{E7611F49-F088-4175-9446-6111444E72C8}.Debug|Win32.ActiveCfg = Debug|Win32
{E7611F49-F088-4175-9446-6111444E72C8}.Debug|Win32.Build.0 = Debug|Win32
{E7611F49-F088-4175-9446-6111444E72C8}.Debug|x64.ActiveCfg = Debug|x64
{E7611F49-F088-4175-9446-6111444E72C8}.Debug|x64.Build.0 = Debug|x64
- {E7611F49-F088-4175-9446-6111444E72C8}.Release|ARM.ActiveCfg = Release|Win32
- {E7611F49-F088-4175-9446-6111444E72C8}.Release|ARM64.ActiveCfg = Release|Win32
+ {E7611F49-F088-4175-9446-6111444E72C8}.Release|ARM.ActiveCfg = Release|ARM
+ {E7611F49-F088-4175-9446-6111444E72C8}.Release|ARM.Build.0 = Release|ARM
+ {E7611F49-F088-4175-9446-6111444E72C8}.Release|ARM64.ActiveCfg = Release|ARM64
+ {E7611F49-F088-4175-9446-6111444E72C8}.Release|ARM64.Build.0 = Release|ARM64
{E7611F49-F088-4175-9446-6111444E72C8}.Release|Win32.ActiveCfg = Release|Win32
{E7611F49-F088-4175-9446-6111444E72C8}.Release|Win32.Build.0 = Release|Win32
{E7611F49-F088-4175-9446-6111444E72C8}.Release|x64.ActiveCfg = Release|x64
{E7611F49-F088-4175-9446-6111444E72C8}.Release|x64.Build.0 = Release|x64
- {659D0C08-D4ED-4BF3-B02B-2D8D4B5A7A7A}.Debug|ARM.ActiveCfg = Debug|Win32
- {659D0C08-D4ED-4BF3-B02B-2D8D4B5A7A7A}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {659D0C08-D4ED-4BF3-B02B-2D8D4B5A7A7A}.Debug|ARM.ActiveCfg = Debug|ARM
+ {659D0C08-D4ED-4BF3-B02B-2D8D4B5A7A7A}.Debug|ARM.Build.0 = Debug|ARM
+ {659D0C08-D4ED-4BF3-B02B-2D8D4B5A7A7A}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {659D0C08-D4ED-4BF3-B02B-2D8D4B5A7A7A}.Debug|ARM64.Build.0 = Debug|ARM64
{659D0C08-D4ED-4BF3-B02B-2D8D4B5A7A7A}.Debug|Win32.ActiveCfg = Debug|Win32
{659D0C08-D4ED-4BF3-B02B-2D8D4B5A7A7A}.Debug|Win32.Build.0 = Debug|Win32
{659D0C08-D4ED-4BF3-B02B-2D8D4B5A7A7A}.Debug|x64.ActiveCfg = Debug|x64
{659D0C08-D4ED-4BF3-B02B-2D8D4B5A7A7A}.Debug|x64.Build.0 = Debug|x64
- {659D0C08-D4ED-4BF3-B02B-2D8D4B5A7A7A}.Release|ARM.ActiveCfg = Release|Win32
- {659D0C08-D4ED-4BF3-B02B-2D8D4B5A7A7A}.Release|ARM64.ActiveCfg = Release|Win32
+ {659D0C08-D4ED-4BF3-B02B-2D8D4B5A7A7A}.Release|ARM.ActiveCfg = Release|ARM
+ {659D0C08-D4ED-4BF3-B02B-2D8D4B5A7A7A}.Release|ARM.Build.0 = Release|ARM
+ {659D0C08-D4ED-4BF3-B02B-2D8D4B5A7A7A}.Release|ARM64.ActiveCfg = Release|ARM64
+ {659D0C08-D4ED-4BF3-B02B-2D8D4B5A7A7A}.Release|ARM64.Build.0 = Release|ARM64
{659D0C08-D4ED-4BF3-B02B-2D8D4B5A7A7A}.Release|Win32.ActiveCfg = Release|Win32
{659D0C08-D4ED-4BF3-B02B-2D8D4B5A7A7A}.Release|Win32.Build.0 = Release|Win32
{659D0C08-D4ED-4BF3-B02B-2D8D4B5A7A7A}.Release|x64.ActiveCfg = Release|x64
diff --git a/icu4c/source/common/common.vcxproj b/icu4c/source/common/common.vcxproj
index 19968c83ee5..7fd4aed1541 100644
--- a/icu4c/source/common/common.vcxproj
+++ b/icu4c/source/common/common.vcxproj
@@ -35,29 +35,35 @@
<_ProjectFileVersion>10.0.30319.1
- .\..\..\lib\
- .\x86\Release\
- false
- .\..\..\lib\
- .\x86\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
+
+ $(OutDir)\icuuc.tlb
+
U_ATTRIBUTE_DEPRECATED=;U_COMMON_IMPLEMENTATION;U_PLATFORM_USES_ONLY_WIN32_API=1;%(PreprocessorDefinitions)
false
Level3
+ Default
+ ProgramDatabase
+ $(OutDir)/icuuc.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)/icuuc.pdb
icudt.lib;%(AdditionalDependencies)
+ .\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
@@ -67,6 +73,11 @@
true
MultiThreadedDebugDLL
+
+ ..\..\$(IcuBinOutputDir)\icuuc64d.dll
+ .\..\..\$(IcuLibOutputDir)\icuucd.pdb
+ ..\..\$(IcuLibOutputDir)\icuucd.lib
+
@@ -74,79 +85,10 @@
MultiThreadedDLL
true
-
-
-
- .\..\..\lib\icuuc.tlb
-
-
- .\x86\Release/common.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
-
-
- ..\..\bin\icuuc64.dll
- .\..\..\lib;%(AdditionalLibraryDirectories)
- .\..\..\lib\icuuc.pdb
-
-
- ..\..\lib\icuuc.lib
-
-
-
-
- .\..\..\lib\icuucd.tlb
-
-
- .\x86\Debug/common.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
- EditAndContinue
-
-
- ..\..\bin\icuuc64d.dll
- .\..\..\lib;%(AdditionalLibraryDirectories)
- .\..\..\lib\icuucd.pdb
-
-
- ..\..\lib\icuucd.lib
-
-
-
-
- .\..\..\lib64\icuuc.tlb
-
-
- .\x64\Release/common.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
-
-
- ..\..\bin64\icuuc64.dll
- .\..\..\lib64;%(AdditionalLibraryDirectories)
- .\..\..\lib64\icuuc.pdb
- ..\..\lib64\icuuc.lib
-
-
-
-
- .\..\..\lib64\icuucd.tlb
-
-
- .\x64\Debug/common.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
- ProgramDatabase
-
- ..\..\bin64\icuuc64d.dll
- .\..\..\lib64;%(AdditionalLibraryDirectories)
- .\..\..\lib64\icuucd.pdb
- ..\..\lib64\icuucd.lib
+ ..\..\$(IcuBinOutputDir)\icuuc64.dll
+ .\..\..\$(IcuLibOutputDir)\icuuc.pdb
+ ..\..\$(IcuLibOutputDir)\icuuc.lib
diff --git a/icu4c/source/common/common_uwp.vcxproj b/icu4c/source/common/common_uwp.vcxproj
index d85942c31d5..ef4fc8926d0 100644
--- a/icu4c/source/common/common_uwp.vcxproj
+++ b/icu4c/source/common/common_uwp.vcxproj
@@ -59,30 +59,21 @@
<_ProjectFileVersion>10.0.30319.1
- .\x86\ReleaseUWP\
- .\x86\ReleaseUWP\
- .\x86\DebugUWP\
- .\x86\DebugUWP\
- .\x64\ReleaseUWP\
- .\x64\ReleaseUWP\
- .\x64\DebugUWP\
- .\x64\DebugUWP\
- .\arm\ReleaseUWP\
- .\arm\ReleaseUWP\
- .\arm\DebugUWP\
- .\arm\DebugUWP\
- .\arm64\ReleaseUWP\
- .\arm64\ReleaseUWP\
- .\arm64\DebugUWP\
- .\arm64\DebugUWP\
- false
+ .\$(Platform)\$(Configuration)UWP\
+ .\$(Platform)\$(Configuration)UWP\
+
+ .\x86\$(Configuration)UWP\
+ .\x86\$(Configuration)UWP\
+
true
+ false
true
true
+ $(OutDir)\icuuc.tlb
..\..\include;..\common;%(AdditionalIncludeDirectories)
@@ -101,6 +92,11 @@
NotUsing
false
/utf-8 %(AdditionalOptions)
+ $(OutDir)/icuuc.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)/icuuc.pdb
+ ProgramDatabase
0x0409
@@ -133,6 +129,9 @@
true
vccorlib.lib;msvcrt.lib;vcruntime.lib;%(AdditionalDependencies)
+ ..\..\$(IcuBinOutputDir)\icuuc64.dll
+ .\..\..\$(IcuLibOutputDir)\icuuc.pdb
+ ..\..\$(IcuLibOutputDir)\icuuc.lib
@@ -146,7 +145,6 @@
Disabled
EnableFastChecks
true
- EditAndContinue
_DEBUG;%(PreprocessorDefinitions)
@@ -154,6 +152,9 @@
true
vccorlibd.lib;msvcrtd.lib;vcruntimed.lib;%(AdditionalDependencies)
+ ..\..\$(IcuBinOutputDir)\icuuc64d.dll
+ .\..\..\$(IcuLibOutputDir)\icuucd.pdb
+ ..\..\$(IcuLibOutputDir)\icuucd.lib
@@ -211,135 +212,6 @@
.\..\..\libARM64;%(AdditionalLibraryDirectories)
-
-
-
- .\..\..\lib32uwp\icuuc.tlb
-
-
- .\x86\ReleaseUWP/common.pch
- .\x86\ReleaseUWP/
- .\x86\ReleaseUWP/
- .\x86\ReleaseUWP/
-
-
- ..\..\bin32uwp\icuuc64.dll
- .\..\..\lib32uwp\icuuc.pdb
- ..\..\lib32uwp\icuuc.lib
-
-
-
-
- .\..\..\lib32uwp\icuucd.tlb
-
-
- .\x86\DebugUWP/common.pch
- .\x86\DebugUWP/
- .\x86\DebugUWP/
- .\x86\DebugUWP/
-
-
- ..\..\bin32uwp\icuuc64d.dll
- .\..\..\lib32uwp\icuucd.pdb
- ..\..\lib32uwp\icuucd.lib
-
-
-
-
- .\..\..\lib64uwp\icuuc.tlb
-
-
- .\x64\ReleaseUWP/common.pch
- .\x64\ReleaseUWP/
- .\x64\ReleaseUWP/
- .\x64\ReleaseUWP/
-
-
- ..\..\bin64uwp\icuuc64.dll
- .\..\..\lib64uwp\icuuc.pdb
- ..\..\lib64uwp\icuuc.lib
-
-
-
-
- .\..\..\lib64uwp\icuucd.tlb
-
-
- .\x64\DebugUWP/common.pch
- .\x64\DebugUWP/
- .\x64\DebugUWP/
- .\x64\DebugUWP/
-
-
- ..\..\bin64uwp\icuuc64d.dll
- .\..\..\lib64uwp\icuucd.pdb
- ..\..\lib64uwp\icuucd.lib
-
-
-
-
- .\..\..\libARMuwp\icuuc.tlb
-
-
- .\ARM\ReleaseUWP/common.pch
- .\ARM\ReleaseUWP/
- .\ARM\ReleaseUWP/
- .\ARM\ReleaseUWP/
-
-
- ..\..\binARMuwp\icuuc64.dll
- .\..\..\libARMuwp\icuuc.pdb
- ..\..\libARMuwp\icuuc.lib
-
-
-
-
- .\..\..\libARMuwp\icuucd.tlb
-
-
- .\ARM\DebugUWP/common.pch
- .\ARM\DebugUWP/
- .\ARM\DebugUWP/
- .\ARM\DebugUWP/
-
-
- ..\..\binARMuwp\icuuc64d.dll
- .\..\..\libARMuwp\icuucd.pdb
- ..\..\libARMuwp\icuucd.lib
-
-
-
-
- .\..\..\libARM64uwp\icuuc.tlb
-
-
- .\ARM64\ReleaseUWP/common.pch
- .\ARM64\ReleaseUWP/
- .\ARM64\ReleaseUWP/
- .\ARM64\ReleaseUWP/
-
-
- ..\..\binARM64uwp\icuuc62.dll
- .\..\..\libARM64uwp\icuuc.pdb
- ..\..\libARM64uwp\icuuc.lib
-
-
-
-
- .\..\..\libARM64uwp\icuucd.tlb
-
-
- .\ARM64\DebugUWP/common.pch
- .\ARM64\DebugUWP/
- .\ARM64\DebugUWP/
- .\ARM64\DebugUWP/
-
-
- ..\..\binARM64uwp\icuuc62d.dll
- .\..\..\libARM64uwp\icuucd.pdb
- ..\..\libARM64uwp\icuucd.lib
-
-
diff --git a/icu4c/source/data/makedata.vcxproj b/icu4c/source/data/makedata.vcxproj
index 89e07f62db7..d2bc4441c40 100644
--- a/icu4c/source/data/makedata.vcxproj
+++ b/icu4c/source/data/makedata.vcxproj
@@ -19,69 +19,26 @@
<_ProjectFileVersion>10.0.30319.1
- .\data\tmp\x86\
- .\data\build\
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x86\Release
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x86\Release clean all
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x86\Release clean
-
- $(NMakePreprocessorDefinitions)
- $(NMakeIncludeSearchPath)
- $(NMakeForcedIncludes)
- $(NMakeAssemblySearchPath)
- $(NMakeForcedUsingAssemblies)
- .\data\tmp\x86\
- .\data\build\
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x86\Debug
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x86\Debug clean all
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x86\Debug clean
-
- $(NMakePreprocessorDefinitions)
- $(NMakeIncludeSearchPath)
- $(NMakeForcedIncludes)
- $(NMakeAssemblySearchPath)
- $(NMakeForcedUsingAssemblies)
- .\data\tmp\x64\
- .\data\build\
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x64\Release
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x64\Release clean all
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x64\Release clean
-
- $(NMakePreprocessorDefinitions)
- $(NMakeIncludeSearchPath)
- $(NMakeForcedIncludes)
- $(NMakeAssemblySearchPath)
- $(NMakeForcedUsingAssemblies)
- .\data\tmp\x64\
- .\data\build\
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x64\Debug
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x64\Debug clean all
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x64\Debug clean
-
- $(NMakePreprocessorDefinitions)
- $(NMakeIncludeSearchPath)
- $(NMakeForcedIncludes)
- $(NMakeAssemblySearchPath)
- $(NMakeForcedUsingAssemblies)
+ .\data\tmp\$(Platform)\
+ .\data\build\
+ $(Platform)\$(Configuration)
+
+ .\data\tmp\x86\
+ x86\$(Configuration)
+
+ NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=$(MakeCFG)
+ NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=$(MakeCFG) clean all
+ NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=$(MakeCFG) clean
+
+ $(NMakePreprocessorDefinitions)
+ $(NMakeIncludeSearchPath)
+ $(NMakeForcedIncludes)
+ $(NMakeAssemblySearchPath)
+ $(NMakeForcedUsingAssemblies)
-
+
- .\out\tmp\x86\ReleaseBuildLog.html
-
-
-
-
- .\out\tmp\x86\DebugBuildLog.html
-
-
-
-
- .\out\tmp\x64\ReleaseBuildLog.html
-
-
-
-
- .\out\tmp\x64\DebugBuildLog.html
+ $(OutDir)$(Configuration)BuildLog.html
diff --git a/icu4c/source/data/makedata_uwp.vcxproj b/icu4c/source/data/makedata_uwp.vcxproj
index f835ab58700..f89bac014b7 100644
--- a/icu4c/source/data/makedata_uwp.vcxproj
+++ b/icu4c/source/data/makedata_uwp.vcxproj
@@ -54,81 +54,20 @@
<_ProjectFileVersion>10.0.30319.1
- .\data\tmp\x86\
- .\data\tmp\x86\
- .\data\tmp\x64\
- .\data\tmp\x64\
- .\data\tmp\arm\
- .\data\tmp\arm\
- .\data\build\
- .\data\build\
- .\data\build\
- .\data\build\
- .\data\build\
- .\data\build\
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x86\Release UWP=UWP
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x86\Release UWP=UWP clean all
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x86\Release UWP=UWP clean
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x86\Debug UWP=UWP
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x86\Debug UWP=UWP clean all
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x86\Debug UWP=UWP clean
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x64\Release UWP=UWP
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x64\Release UWP=UWP clean all
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x64\Release UWP=UWP clean
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x64\Debug UWP=UWP
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x64\Debug UWP=UWP clean all
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=x64\Debug UWP=UWP clean
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=ARM\Release UWP=UWP
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=ARM\Release UWP=UWP clean all
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=ARM\Release UWP=UWP clean
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=ARM\Debug UWP=UWP
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=ARM\Debug UWP=UWP clean all
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=ARM\Debug UWP=UWP clean
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=ARM64\Release UWP=UWP
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=ARM64\Release UWP=UWP clean all
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=ARM64\Release UWP=UWP clean
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=ARM64\Debug UWP=UWP
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=ARM64\Debug UWP=UWP clean all
- NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=ARM64\Debug UWP=UWP clean
+ .\data\tmp\$(Platform)\
+ .\data\build\
+ $(Platform)\$(Configuration)
+
+ .\data\tmp\x86\
+ x86\$(Configuration)
+
+ NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=$(MakeCFG) UWP=UWP
+ NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=$(MakeCFG) UWP=UWP clean all
+ NMAKE /f makedata.mak ICUMAKE="$(ProjectDir)\" CFG=$(MakeCFG) UWP=UWP clean
-
+
- .\out\tmp\x86\ReleaseUWPBuildLog.html
-
-
-
-
- .\out\tmp\x86\DebugUWPBuildLog.html
-
-
-
-
- .\out\tmp\x64\ReleaseUWPBuildLog.html
-
-
-
-
- .\out\tmp\x64\DebugUWPBuildLog.html
-
-
-
-
- .\out\tmp\arm\ReleaseUWPBuildLog.html
-
-
-
-
- .\out\tmp\arm\DebugUWPBuildLog.html
-
-
-
-
- .\out\tmp\arm64\ReleaseUWPBuildLog.html
-
-
-
-
- .\out\tmp\arm64\DebugUWPBuildLog.html
+ $(OutDir)$(Configuration)UWPBuildLog.html
diff --git a/icu4c/source/extra/uconv/makedata.mak b/icu4c/source/extra/uconv/makedata.mak
index 2cc07d61096..b30f59728b5 100644
--- a/icu4c/source/extra/uconv/makedata.mak
+++ b/icu4c/source/extra/uconv/makedata.mak
@@ -17,7 +17,7 @@ CFG=Debug
!ENDIF
#Here we test if a valid configuration is given
-!IF "$(CFG)" != "Release" && "$(CFG)" != "release" && "$(CFG)" != "Debug" && "$(CFG)" != "debug" && "$(CFG)" != "x86\Release" && "$(CFG)" != "x86\Debug" && "$(CFG)" != "x64\Release" && "$(CFG)" != "x64\Debug"
+!IF "$(CFG)" != "Release" && "$(CFG)" != "release" && "$(CFG)" != "Debug" && "$(CFG)" != "debug" && "$(CFG)" != "x86\Release" && "$(CFG)" != "x86\Debug" && "$(CFG)" != "x64\Release" && "$(CFG)" != "x64\Debug" && "$(CFG)" != "ARM\Release" && "$(CFG)" != "ARM\Debug" && "$(CFG)" != "ARM64\Release" && "$(CFG)" != "ARM64\Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
@@ -51,7 +51,9 @@ PKGMODE=static
ICD=$(ICUDATA)^\
DATA_PATH=$(ICUP)\data^\
-!IF "$(CFG)" == "x64\Release" || "$(CFG)" == "x64\Debug"
+# Use the x64 tools for building ARM and ARM64.
+# Note: This is similar to the TOOLS CFG PATH in source\data\makedata.mak
+!IF "$(CFG)" == "x64\Release" || "$(CFG)" == "x64\Debug" || "$(CFG)" == "ARM\Release" || "$(CFG)" == "ARM\Debug" || "$(CFG)" == "ARM64\Release" || "$(CFG)" == "ARM64\Debug"
ICUTOOLS=$(ICUP)\bin64
PATH = $(ICUP)\bin64;$(PATH)
!ELSE
@@ -59,14 +61,29 @@ ICUTOOLS=$(ICUP)\bin
PATH = $(ICUP)\bin;$(PATH)
!ENDIF
+# If building ARM/ARM, then we need to pass the arch as an argument.
+EXTRA_PKGDATA_ARGUMENTS=
+!IF "$(CFG)" == "ARM\Release" || "$(CFG)" == "ARM\Debug"
+EXTRA_PKGDATA_ARGUMENTS=-a ARM
+!ENDIF
+!IF "$(CFG)" == "ARM64\Release" || "$(CFG)" == "ARM64\Debug"
+EXTRA_PKGDATA_ARGUMENTS=-a ARM64
+!ENDIF
+
# Make sure the necessary tools exist before continuing. (This is to prevent cryptic errors from NMAKE).
!IF !EXISTS($(ICUTOOLS)\pkgdata.exe)
!MESSAGE Unable to find "$(ICUTOOLS)\pkgdata.exe"
!ERROR The tool 'pkgdata.exe' does not exist! (Have you built all of ICU yet?).
+!IF "$(CFG)" == "ARM\Release" || "$(CFG)" == "ARM\Debug" || "$(CFG)" == "ARM64\Release" || "$(CFG)" == "ARM64\Debug"
+!ERROR Note that the ARM and ARM64 builds require building x64 first.
+!ENDIF
!ENDIF
!IF !EXISTS($(ICUTOOLS)\genrb.exe)
!MESSAGE Unable to find "$(ICUTOOLS)\genrb.exe"
!ERROR The tool 'genrb.exe' does not exist! (Have you built all of ICU yet?).
+!IF "$(CFG)" == "ARM\Release" || "$(CFG)" == "ARM\Debug" || "$(CFG)" == "ARM64\Release" || "$(CFG)" == "ARM64\Debug"
+!ERROR Note that the ARM and ARM64 builds require building x64 first.
+!ENDIF
!ENDIF
# Suffixes for data files
@@ -98,7 +115,7 @@ ALL : $(OUTPUT)
# invoke pkgdata - static
"$(DLL_OUTPUT)\$(RESNAME).lib" : $(RB_FILES) $(RESFILES)
@echo Building $(RESNAME).lib
- @"$(ICUTOOLS)\pkgdata" -f -v -m static -c -p $(RESNAME) -d "$(DLL_OUTPUT)" -s "$(RESDIR)" <
<_ProjectFileVersion>10.0.30319.1
- .\x86\Release\
- .\x86\Release\
- false
- .\x86\Debug\
- .\x86\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+ x86\$(Configuration)
+
+ true
+ false
-
+
-
- ..\..\..\include;..\..\common;%(AdditionalIncludeDirectories)
- UCONVMSG_LINK;%(PreprocessorDefinitions)
- true
- Level3
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- $(ProjectDir)..\..\..\bin\$(TargetFileName);%(Outputs)
-
- .\x86\Release/uconv.tlb
+ $(OutDir)\uconv.tlb
- MultiThreadedDLL
- true
- .\x86\Release/uconv.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
+ Level3
Default
+ true
+ ..\..\..\include;..\..\common;%(AdditionalIncludeDirectories)
+ UCONVMSG_LINK;%(PreprocessorDefinitions)
+ $(OutDir)\uconv.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)\uconv.pdb
- uconvmsg.lib;icuuc.lib;icuin.lib;%(AdditionalDependencies)
- .\x86\Release/uconv.exe
- x86\Release;..\..\..\lib;%(AdditionalLibraryDirectories)
- .\x86\Release/uconv.pdb
Console
-
-
+ $(OutDir)\uconv.exe
+ uconvmsg.lib;%(AdditionalDependencies)
+ $(OutDir);..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- $(ProjectDir)..\..\..\bin\$(TargetFileName);%(Outputs)
+ copy "$(TargetPath)" ..\..\..\$(IcuBinOutputDir)
+ ..\..\..\$(IcuBinOutputDir)\$(TargetFileName);%(Outputs)
-
- .\x86\Debug/uconv.tlb
-
+
+
+
+ true
MultiThreadedDebugDLL
- .\x86\Debug/uconv.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
- EditAndContinue
- Default
- uconvmsg.lib;icuucd.lib;icuind.lib;%(AdditionalDependencies)
- .\x86\Debug/uconv.exe
- x86\Debug;..\..\..\lib;%(AdditionalLibraryDirectories)
- true
- .\x86\Debug/uconv.pdb
- Console
-
-
+ icuucd.lib;icuind.lib;%(AdditionalDependencies)
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- $(ProjectDir)..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- .\x64\Release/uconv.tlb
-
+
+
MultiThreadedDLL
true
- .\x64\Release/uconv.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
- Default
- uconvmsg.lib;icuuc.lib;icuin.lib;%(AdditionalDependencies)
- .\x64\Release/uconv.exe
- x64\Release;..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\x64\Release/uconv.pdb
- Console
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- $(ProjectDir)..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- .\x64\Debug/uconv.tlb
-
-
- MultiThreadedDebugDLL
- .\x64\Debug/uconv.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
- ProgramDatabase
- Default
-
-
- uconvmsg.lib;icuucd.lib;icuind.lib;%(AdditionalDependencies)
- .\x64\Debug/uconv.exe
- x64\Debug;..\..\..\lib64;%(AdditionalLibraryDirectories)
- true
- .\x64\Debug/uconv.pdb
- Console
+ icuuc.lib;icuin.lib;%(AdditionalDependencies)
@@ -176,18 +102,8 @@
- nmake /nologo /f %(Filename).mak icup="$(ProjectDir)..\..\.." CFG=x86\Debug
-
- x86\Debug/uconvmsg.lib;%(Outputs)
- nmake /nologo /f %(Filename).mak icup="$(ProjectDir)..\..\.." CFG=x64\Debug
-
- x64\Debug/uconvmsg.lib;%(Outputs)
- nmake /nologo /f %(Filename).mak icup="$(ProjectDir)..\..\.." CFG=x86\Release
-
- x86\Release/uconvmsg.lib;%(Outputs)
- nmake /nologo /f %(Filename).mak icup="$(ProjectDir)..\..\.." CFG=x64\Release
-
- x64\Release/uconvmsg.lib;%(Outputs)
+ nmake /nologo /f %(Filename).mak icup="$(ProjectDir)..\..\.." CFG=$(MakeCFG)
+ $(MakeCFG)\uconvmsg.lib;%(Outputs)
diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj
index b96b9f0294d..f4eaed71d61 100644
--- a/icu4c/source/i18n/i18n.vcxproj
+++ b/icu4c/source/i18n/i18n.vcxproj
@@ -35,31 +35,38 @@
<_ProjectFileVersion>10.0.30319.1
- .\..\..\lib\
- .\x86\Release\
- false
- .\..\..\lib\
- .\x86\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
+
+ $(OutDir)\icuin.tlb
+
U_ATTRIBUTE_DEPRECATED=;U_I18N_IMPLEMENTATION;%(PreprocessorDefinitions)
false
Level3
..\..\include;..\common;%(AdditionalIncludeDirectories)
Default
+ ProgramDatabase
+ $(OutDir)/icuin.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)/icuin.pdb
../common;%(AdditionalIncludeDirectories)
+
+ .\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
+
@@ -69,6 +76,9 @@
icuucd.lib;%(AdditionalDependencies)
+ ..\..\$(IcuBinOutputDir)\icuin64d.dll
+ .\..\..\$(IcuLibOutputDir)\icuind.pdb
+ ..\..\$(IcuLibOutputDir)\icuind.lib
@@ -79,81 +89,9 @@
icuuc.lib;%(AdditionalDependencies)
-
-
-
-
- .\..\..\lib\icuin.tlb
-
-
- .\x86\Release/i18n.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
-
-
- ..\..\bin\icuin64.dll
- .\..\..\lib;%(AdditionalLibraryDirectories)
- .\..\..\lib\icuin.pdb
-
-
- ..\..\lib\icuin.lib
-
-
-
-
- .\..\..\lib\icuind.tlb
-
-
- .\x86\Debug/i18n.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
- true
- EditAndContinue
-
-
- ..\..\bin\icuin64d.dll
- .\..\..\lib;%(AdditionalLibraryDirectories)
- .\..\..\lib\icuind.pdb
-
-
- ..\..\lib\icuind.lib
-
-
-
-
- .\..\..\lib64\icuin.tlb
-
-
- .\x64\Release/i18n.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
-
-
- ..\..\bin64\icuin64.dll
- .\..\..\lib64;%(AdditionalLibraryDirectories)
- .\..\..\lib64\icuin.pdb
- ..\..\lib64\icuin.lib
-
-
-
-
- .\..\..\lib64\icuind.tlb
-
-
- .\x64\Debug/i18n.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
- ProgramDatabase
-
-
- ..\..\bin64\icuin64d.dll
- .\..\..\lib64;%(AdditionalLibraryDirectories)
- .\..\..\lib64\icuind.pdb
- ..\..\lib64\icuind.lib
+ ..\..\$(IcuBinOutputDir)\icuin64.dll
+ .\..\..\$(IcuLibOutputDir)\icuin.pdb
+ ..\..\$(IcuLibOutputDir)\icuin.lib
diff --git a/icu4c/source/i18n/i18n_uwp.vcxproj b/icu4c/source/i18n/i18n_uwp.vcxproj
index dc810321760..17c58e6ff54 100644
--- a/icu4c/source/i18n/i18n_uwp.vcxproj
+++ b/icu4c/source/i18n/i18n_uwp.vcxproj
@@ -59,24 +59,14 @@
<_ProjectFileVersion>10.0.30319.1
- .\x86\ReleaseUWP\
- .\x86\ReleaseUWP\
- .\x86\DebugUWP\
- .\x86\DebugUWP\
- .\x64\ReleaseUWP\
- .\x64\ReleaseUWP\
- .\x64\DebugUWP\
- .\x64\DebugUWP\
- .\arm\ReleaseUWP\
- .\arm\ReleaseUWP\
- .\arm\DebugUWP\
- .\arm\DebugUWP\
- .\arm64\ReleaseUWP\
- .\arm64\ReleaseUWP\
- .\arm64\DebugUWP\
- .\arm64\DebugUWP\
- false
+ .\$(Platform)\$(Configuration)UWP\
+ .\$(Platform)\$(Configuration)UWP\
+
+ .\x86\$(Configuration)UWP\
+ .\x86\$(Configuration)UWP\
+
true
+ false
@@ -100,6 +90,7 @@
NotUsing
false
/utf-8 %(AdditionalOptions)
+ ProgramDatabase
0x0409
@@ -139,7 +130,6 @@
Disabled
EnableFastChecks
true
- EditAndContinue
_DEBUG;%(PreprocessorDefinitions)
@@ -302,7 +292,7 @@
.\ARM64\ReleaseUWP/
- ..\..\binARM64uwp\icuin62.dll
+ ..\..\binARM64uwp\icuin64.dll
.\..\..\libARM64uwp\icuin.pdb
..\..\libARM64uwp\icuin.lib
..\..\libARM64uwp\icuuc.lib;%(AdditionalDependencies)
@@ -319,7 +309,7 @@
.\ARM64\DebugUWP/
- ..\..\binARM64uwp\icuin62d.dll
+ ..\..\binARM64uwp\icuin64d.dll
.\..\..\libARM64uwp\icuind.pdb
..\..\libARM64uwp\icuind.lib
..\..\libARM64uwp\icuucd.lib;%(AdditionalDependencies)
diff --git a/icu4c/source/io/io.vcxproj b/icu4c/source/io/io.vcxproj
index 46e612386f6..8fa78d5ce24 100644
--- a/icu4c/source/io/io.vcxproj
+++ b/icu4c/source/io/io.vcxproj
@@ -35,121 +35,64 @@
<_ProjectFileVersion>10.0.30319.1
- .\..\..\lib\
- .\x86\Release\
- false
- .\..\..\lib\
- .\x86\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
+
+ $(OutDir)\icuio.tlb
+
..\..\include;..\common;%(AdditionalIncludeDirectories)
U_IO_IMPLEMENTATION;%(PreprocessorDefinitions)
false
Level3
+ Default
+ ProgramDatabase
+ $(OutDir)/icuio.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)/icuio.pdb
..\common;%(AdditionalIncludeDirectories)
-
-
-
- .\..\..\lib\icuio.tlb
-
-
- MultiThreadedDLL
- true
- .\x86\Release/icuio.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
- Default
-
- ..\..\bin\icuio64.dll
- icuuc.lib;icuin.lib;%(AdditionalDependencies)
- ..\..\lib;%(AdditionalLibraryDirectories)
- .\..\..\lib\icuio.pdb
-
-
- ..\..\lib\icuio.lib
+ ..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- .\..\..\lib\icuio.tlb
-
+
+
- MultiThreadedDebugDLL
- .\x86\Debug/icuio.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
true
- EditAndContinue
- Default
+ MultiThreadedDebugDLL
- ..\..\bin\icuio64d.dll
- icuucd.lib;icuind.lib;%(AdditionalDependencies)
- ..\..\lib;%(AdditionalLibraryDirectories)
true
- .\..\..\lib\icuiod.pdb
-
-
- ..\..\lib\icuiod.lib
+ ..\..\$(IcuBinOutputDir)\icuio64d.dll
+ ..\..\$(IcuLibOutputDir)\icuiod.pdb
+ ..\..\$(IcuLibOutputDir)\icuiod.lib
+ icuucd.lib;icuind.lib;%(AdditionalDependencies)
-
-
- .\..\..\lib64\icuio.tlb
-
+
+
MultiThreadedDLL
true
- .\x64\Release/icuio.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
- Default
- ..\..\bin64\icuio64.dll
+ ..\..\$(IcuBinOutputDir)\icuio64.dll
+ ..\..\$(IcuLibOutputDir)\icuio.pdb
+ ..\..\$(IcuLibOutputDir)\icuio.lib
icuuc.lib;icuin.lib;%(AdditionalDependencies)
- ..\..\lib64;%(AdditionalLibraryDirectories)
- .\..\..\lib64\icuio.pdb
- ..\..\lib64\icuio.lib
-
-
-
-
- .\..\..\lib64\icuio.tlb
-
-
- MultiThreadedDebugDLL
- .\x64\Debug/icuio.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
- true
- ProgramDatabase
- Default
-
-
- ..\..\bin64\icuio64d.dll
- icuucd.lib;icuind.lib;%(AdditionalDependencies)
- ..\..\lib64;%(AdditionalLibraryDirectories)
- true
- .\..\..\lib64\icuiod.pdb
- ..\..\lib64\icuiod.lib
diff --git a/icu4c/source/stubdata/stubdata.vcxproj b/icu4c/source/stubdata/stubdata.vcxproj
index 852b9bc1ff8..f8c8100cc32 100644
--- a/icu4c/source/stubdata/stubdata.vcxproj
+++ b/icu4c/source/stubdata/stubdata.vcxproj
@@ -13,24 +13,6 @@
-
-
- Debug
- ARM
-
-
- Debug
- ARM64
-
-
- Release
- ARM
-
-
- Release
- ARM64
-
-
@@ -53,41 +35,31 @@
<_ProjectFileVersion>10.0.30319.1
- false
false
- .\x86\Release\
- .\x86\Release\
- .\x86\Debug\
- .\x86\Debug\
- .\x64\Release\
- .\x64\Release\
- .\x64\Debug\
- .\x64\Debug\
- .\ARM\Release\
- .\ARM\Release\
- .\ARM\Debug\
- .\ARM\Debug\
- .\ARM64\Release\
- .\ARM64\Release\
- .\ARM64\Debug\
- .\ARM64\Debug\
-
-
- 10.0.16299.0
- true
-
-
- 10.0.16299.0
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
+
+ $(OutDir)\icudt.tlb
+
..\common;%(AdditionalIncludeDirectories)
STUBDATA_BUILD;%(PreprocessorDefinitions)
true
Level3
Default
+ $(OutDir)/icudt.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)/icudt.pdb
STUBDATA_BUILD;%(PreprocessorDefinitions)
@@ -99,6 +71,10 @@
true
true
true
+
+ ..\..\$(IcuBinOutputDir)\icudt64.dll
+ .\..\..\$(IcuLibOutputDir)\icudt.pdb
+ ..\..\$(IcuLibOutputDir)\icudt.lib
@@ -113,172 +89,6 @@
MultiThreadedDLL
-
-
- .\x86\Release\icudt.tlb
-
-
-
-
- .\x86\Release\stubdata.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
-
-
- ..\..\bin\icudt64.dll
- true
- .\x86\Release\icudt.pdb
-
-
- ..\..\lib\icudt.lib
-
-
-
-
- .\x86\Debug/icudt.tlb
-
-
- .\x86\Debug/stubdata.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
-
-
- ..\..\bin\icudt64.dll
- .\x86\Debug/icudt.pdb
-
-
- ..\..\lib\icudt.lib
-
-
-
-
- .\x64\Release\icudt.tlb
-
-
-
-
- .\x64\Release\stubdata.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
-
-
- ..\..\bin64\icudt64.dll
- true
- .\x64\Release\icudt.pdb
- ..\..\lib64\icudt.lib
-
-
-
-
- .\x64\Debug/icudt.tlb
-
-
- .\x64\Debug/stubdata.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
-
-
- ..\..\bin64\icudt64.dll
- .\x64\Debug/icudt.pdb
- ..\..\lib64\icudt.lib
-
-
-
-
-
- ARM
-
-
- ARM;WIN32;%(PreprocessorDefinitions)
-
-
- ..\..\binARM\icudt64.dll
- true
- MachineARM
- ..\..\libARM\icudt.lib
- kernel32.lib;%(AdditionalDependencies)
-
-
-
-
- .\ARM\Release\icudt.tlb
-
-
-
-
- .\ARM\Release\stubdata.pch
- .\ARM\Release/
- .\ARM\Release/
- .\ARM\Release/
-
-
- .\ARM\Release\icudt.pdb
-
-
-
-
- .\ARM\Debug/icudt.tlb
-
-
- .\ARM\Debug/stubdata.pch
- .\ARM\Debug/
- .\ARM\Debug/
- .\ARM\Debug/
-
-
- .\ARM\Debug/icudt.pdb
-
-
-
-
-
- ARM64
-
-
- ARM64;WIN32;%(PreprocessorDefinitions)
-
-
- ..\..\binARM64\icudt64.dll
- MachineARM64
- ..\..\libARM64\icudt.lib
- kernel32.lib;%(AdditionalDependencies)
- C:\Program Files (x86)\Windows Kits\10\Lib\10.0.16299.0\um\arm64
-
-
-
-
- .\ARM64\Release\icudt.tlb
-
-
-
-
- .\ARM64\Release\stubdata.pch
- .\ARM64\Release/
- .\ARM64\Release/
- .\ARM64\Release/
-
-
- .\ARM64\Release\icudt.pdb
-
-
-
-
- .\ARM64\Debug/icudt.tlb
-
-
- .\ARM64\Debug/stubdata.pch
- .\ARM64\Debug/
- .\ARM64\Debug/
- .\ARM64\Debug/
-
-
- .\ARM64\Debug/icudt.pdb
-
-
@@ -290,4 +100,4 @@
-
\ No newline at end of file
+
diff --git a/icu4c/source/test/cintltst/cintltst.vcxproj b/icu4c/source/test/cintltst/cintltst.vcxproj
index b706feeb90b..9444d3a634d 100644
--- a/icu4c/source/test/cintltst/cintltst.vcxproj
+++ b/icu4c/source/test/cintltst/cintltst.vcxproj
@@ -33,120 +33,55 @@
<_ProjectFileVersion>10.0.30319.1
- .\x86\Debug\
- .\x86\Debug\
- true
- .\x86\Release\
- .\x86\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
-
+
-
- ..\..\..\include;..\..\tools\ctestfw;..\..\common;..\..\i18n;..\..\tools\toolutil;%(AdditionalIncludeDirectories)
- U_ATTRIBUTE_DEPRECATED=;%(PreprocessorDefinitions)
- false
- Level3
-
-
-
-
- .\x86\Debug/cintltst.tlb
-
-
- MultiThreadedDebug
- .\x86\Debug/cintltst.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
- true
- EditAndContinue
- Default
-
-
- .\x86\Debug/cintltst.exe
- icuucd.lib;icuind.lib;icutestd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- .\x86\Debug/cintltst.pdb
- Console
-
-
-
-
-
- .\x86\Release/cintltst.tlb
+ $(OutDir)\cintltst.tlb
- MultiThreaded
- true
- true
- .\x86\Release/cintltst.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
+ Level3
Default
+ false
+ ..\..\..\include;..\..\tools\ctestfw;..\..\common;..\..\i18n;..\..\tools\toolutil;%(AdditionalIncludeDirectories)
+ U_ATTRIBUTE_DEPRECATED=;%(PreprocessorDefinitions)
+ $(OutDir)\cintltst.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)\cintltst.pdb
- .\x86\Release/cintltst.exe
- icuuc.lib;icuin.lib;icutest.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- true
- .\x86\Release/cintltst.pdb
Console
-
-
+ $(OutDir)\cintltst.exe
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- .\x64\Debug/cintltst.tlb
-
+
+
- MultiThreadedDebug
- .\x64\Debug/cintltst.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
true
- ProgramDatabase
- Default
+ MultiThreadedDebugDLL
- .\x64\Debug/cintltst.exe
icuucd.lib;icuind.lib;icutestd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\x64\Debug/cintltst.pdb
- Console
-
-
- .\x64\Release/cintltst.tlb
-
+
+
- MultiThreaded
- true
+ MultiThreadedDLL
true
- .\x64\Release/cintltst.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
- Default
- .\x64\Release/cintltst.exe
icuuc.lib;icuin.lib;icutest.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- true
- .\x64\Release/cintltst.pdb
- Console
diff --git a/icu4c/source/test/intltest/intltest.vcxproj b/icu4c/source/test/intltest/intltest.vcxproj
index 543a7798e7f..dbdb3e0f06c 100644
--- a/icu4c/source/test/intltest/intltest.vcxproj
+++ b/icu4c/source/test/intltest/intltest.vcxproj
@@ -34,117 +34,55 @@
<_ProjectFileVersion>10.0.30319.1
- .\x86\Debug\
- .\x86\Debug\
- true
- .\x64\Debug\
- .\x64\Debug\
- true
- .\x86\Release\
- .\x86\Release\
- false
- .\x64\Release\
- .\x64\Release\
- false
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
+
+ $(OutDir)\intltest.tlb
+
..\..\..\include;..\..\common;..\..\i18n;..\..\tools\toolutil;..\..\tools\ctestfw;%(AdditionalIncludeDirectories)
U_ATTRIBUTE_DEPRECATED=;%(PreprocessorDefinitions)
false
Level3
-
-
-
-
- .\x86\Debug/intltest.tlb
-
-
- MultiThreadedDebug
- .\x86\Debug/intltest.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
- true
- EditAndContinue
Default
+ $(OutDir)/intltest.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)/intltest.pdb
- .\x86\Debug/intltest.exe
- icuucd.lib;icuind.lib;icutud.lib;icutestd.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- .\x86\Debug/intltest.pdb
Console
-
-
+ $(OutDir)/intltest.exe
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- .\x64\Debug/intltest.tlb
-
+
+
- MultiThreadedDebug
- .\x64\Debug/intltest.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
true
- ProgramDatabase
- Default
+ MultiThreadedDebugDLL
- .\x64\Debug/intltest.exe
icuucd.lib;icuind.lib;icutud.lib;icutestd.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- true
- .\x64\Debug/intltest.pdb
- Console
-
-
- .\x86\Release/intltest.tlb
-
+
+
- MultiThreaded
- .\x86\Release/intltest.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
- Default
+ MultiThreadedDLL
+ true
- .\x86\Release/intltest.exe
icuuc.lib;icuin.lib;icutu.lib;icutest.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- true
- .\x86\Release/intltest.pdb
- Console
-
-
-
-
-
-
- .\x64\Release/intltest.tlb
-
-
- MultiThreaded
- .\x64\Release/intltest.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
- Default
-
-
- .\x64\Release/intltest.exe
- icuuc.lib;icuin.lib;icutu.lib;icutest.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- true
- .\x64\Release/intltest.pdb
- Console
diff --git a/icu4c/source/test/iotest/iotest.vcxproj b/icu4c/source/test/iotest/iotest.vcxproj
index b6ce25352e9..4de454058b2 100644
--- a/icu4c/source/test/iotest/iotest.vcxproj
+++ b/icu4c/source/test/iotest/iotest.vcxproj
@@ -33,121 +33,55 @@
<_ProjectFileVersion>10.0.30319.1
- .\x86\Debug\
- .\x86\Debug\
-
- .\x86\Release\
- .\x86\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
-
- .\x64\Release\
- .\x64\Release\
- false
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
-
+
+
+ $(OutDir)\iotest.tlb
+
..\..\..\include;..\..\tools\ctestfw;..\..\common;%(AdditionalIncludeDirectories)
U_ATTRIBUTE_DEPRECATED=;%(PreprocessorDefinitions)
true
Level3
-
-
-
-
- .\x86\Debug/iotest.tlb
-
-
-
-
- MultiThreadedDebugDLL
- true
- .\x86\Debug/iotest.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
- true
- EditAndContinue
- Default
-
-
- .\x86\Debug/iotest.exe
- icuucd.lib;icuind.lib;icuiod.lib;icutestd.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- true
- .\x86\Debug/iotest.pdb
- Console
-
-
-
-
-
-
- .\x86\Release/iotest.tlb
-
-
- MultiThreadedDLL
- .\x86\Release/iotest.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
Default
+ $(OutDir)\iotest.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)\iotest.pdb
- .\x86\Release/iotest.exe
- icuuc.lib;icuin.lib;icuio.lib;icutest.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- .\x86\Release/iotest.pdb
Console
-
-
+ $(OutDir)\iotest.exe
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- .\x64\Debug/iotest.tlb
-
-
-
+
+
- MultiThreadedDebugDLL
- .\x64\Debug/iotest.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
true
- ProgramDatabase
- Default
+ MultiThreadedDebugDLL
- .\x64\Debug/iotest.exe
icuucd.lib;icuind.lib;icuiod.lib;icutestd.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- true
- .\x64\Debug/iotest.pdb
- Console
-
-
- .\x64\Release/iotest.tlb
-
+
+
MultiThreadedDLL
- .\x64\Release/iotest.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
- Default
+ true
- .\x64\Release/iotest.exe
icuuc.lib;icuin.lib;icuio.lib;icutest.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\x64\Release/iotest.pdb
- Console
diff --git a/icu4c/source/tools/ctestfw/ctestfw.vcxproj b/icu4c/source/tools/ctestfw/ctestfw.vcxproj
index ee497cb859e..dd1331b31be 100644
--- a/icu4c/source/tools/ctestfw/ctestfw.vcxproj
+++ b/icu4c/source/tools/ctestfw/ctestfw.vcxproj
@@ -33,126 +33,59 @@
<_ProjectFileVersion>10.0.30319.1
- .\..\..\..\lib\
- .\x86\Release\
- false
- .\..\..\..\lib\
- .\x86\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
+
+ $(OutDir)/icutest.tlb
+
..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions)
true
Level3
-
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
- .\..\..\..\lib\icutest.tlb
-
-
- true
- MultiThreadedDLL
- true
- .\x86\Release/icutest.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
Default
+ $(OutDir)/icutest.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)/icutest.pdb
- ..\..\..\bin\icutest64.dll
- icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- .\..\..\..\lib\icutest.pdb
- UseLinkTimeCodeGeneration
-
-
- .\..\..\..\lib\icutest.lib
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- .\..\..\..\lib\icutestd.tlb
-
+
+
- MultiThreadedDebugDLL
- .\x86\Debug/icutest.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
true
- EditAndContinue
- Default
+ MultiThreadedDebugDLL
- ..\..\..\bin\icutest64d.dll
+ ..\..\..\$(IcuBinOutputDir)\icutest64d.exe
+ .\..\..\..\$(IcuLibOutputDir)\icutestd.pdb
+ .\..\..\..\$(IcuLibOutputDir)\icutestd.lib
icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- true
- .\..\..\..\lib\icutestd.pdb
-
-
- .\..\..\..\lib\icutestd.lib
-
-
- .\..\..\..\lib64\icutest.tlb
-
+
+
- true
MultiThreadedDLL
true
- .\x64\Release/icutest.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
- Default
- ..\..\..\bin64\icutest64.dll
+ ..\..\..\$(IcuBinOutputDir)\icutest64.exe
+ .\..\..\..\$(IcuLibOutputDir)\icutest.pdb
+ .\..\..\..\$(IcuLibOutputDir)\icutest.lib
icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\..\..\..\lib64\icutest.pdb
- UseLinkTimeCodeGeneration
- .\..\..\..\lib64\icutest.lib
-
-
-
-
- .\..\..\..\lib64\icutestd.tlb
-
-
- MultiThreadedDebugDLL
- .\x64\Debug/icutest.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
- true
- ProgramDatabase
- Default
-
-
- ..\..\..\bin64\icutest64d.dll
- icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- true
- .\..\..\..\lib64\icutestd.pdb
- .\..\..\..\lib64\icutestd.lib
diff --git a/icu4c/source/tools/genbrk/genbrk.vcxproj b/icu4c/source/tools/genbrk/genbrk.vcxproj
index 4e1feeb9c44..dff44bc5e27 100644
--- a/icu4c/source/tools/genbrk/genbrk.vcxproj
+++ b/icu4c/source/tools/genbrk/genbrk.vcxproj
@@ -33,193 +33,58 @@
<_ProjectFileVersion>10.0.30319.1
- .\x86\Release\
- .\x86\Release\
- false
- .\x86\Debug\
- .\x86\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
-
+
+
- .\x86\Release/genbrk.tlb
+ $(OutDir)/genbrk.tlb
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
- false
- true
- .\x86\Release/genbrk.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
Level3
- true
Default
- /utf-8 %(AdditionalOptions)
- true
+ false
+ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
+ $(OutDir)/genbrk.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)/genbrk.pdb
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x86\Release/genbrk.exe
- true
- icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- .\x86\Release/genbrk.pdb
Console
-
-
+ $(OutDir)/genbrk.exe
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
+ copy "$(TargetPath)" ..\..\..\$(IcuBinOutputDir)
+ ..\..\..\$(IcuBinOutputDir)\$(TargetFileName);%(Outputs)
-
- .\x86\Debug/genbrk.tlb
-
+
+
+
- Disabled
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- false
- true
- .\x86\Debug/genbrk.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
true
- Level3
- true
- EditAndContinue
- Default
- /utf-8 %(AdditionalOptions)
- true
+ MultiThreadedDebugDLL
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x86\Debug/genbrk.exe
- true
icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- true
- .\x86\Debug/genbrk.pdb
- Console
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- X64
- .\x64\Release/genbrk.tlb
-
+
+
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
MultiThreadedDLL
true
- false
- true
- .\x64\Release/genbrk.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
- Level3
- true
- Default
- /utf-8 %(AdditionalOptions)
- true
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x64\Release/genbrk.exe
- true
icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\x64\Release/genbrk.pdb
- Console
- MachineX64
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- X64
- .\x64\Debug/genbrk.tlb
-
-
- Disabled
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- false
- true
- .\x64\Debug/genbrk.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
- true
- Level3
- true
- ProgramDatabase
- Default
- /utf-8 %(AdditionalOptions)
- true
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- .\x64\Debug/genbrk.exe
- true
- icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- true
- .\x64\Debug/genbrk.pdb
- Console
- MachineX64
diff --git a/icu4c/source/tools/genccode/genccode.vcxproj b/icu4c/source/tools/genccode/genccode.vcxproj
index c55b2ca5d9f..f3195147b15 100644
--- a/icu4c/source/tools/genccode/genccode.vcxproj
+++ b/icu4c/source/tools/genccode/genccode.vcxproj
@@ -33,189 +33,58 @@
<_ProjectFileVersion>10.0.30319.1
- .\x86\Release\
- .\x86\Release\
- false
- .\x86\Debug\
- .\x86\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
-
+
+
- .\x86\Release/genccode.tlb
+ $(OutDir)/genccode.tlb
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
- true
- .\x86\Release/genccode.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
Level3
- true
Default
- /utf-8 %(AdditionalOptions)
- true
+ false
+ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
+ $(OutDir)/genccode.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)/genccode.pdb
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x86\Release/genccode.exe
- true
- icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- .\x86\Release/genccode.pdb
Console
-
-
+ $(OutDir)/genccode.exe
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
+ copy "$(TargetPath)" ..\..\..\$(IcuBinOutputDir)
+ ..\..\..\$(IcuBinOutputDir)\$(TargetFileName);%(Outputs)
-
- .\x86\Debug/genccode.tlb
-
+
+
+
- Disabled
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- true
- .\x86\Debug/genccode.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
true
- Level3
- true
- EditAndContinue
- Default
- /utf-8 %(AdditionalOptions)
- true
+ MultiThreadedDebugDLL
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x86\Debug/genccode.exe
- true
icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- true
- .\x86\Debug/genccode.pdb
- Console
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- X64
- .\x64\Release/genccode.tlb
-
+
+
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
MultiThreadedDLL
true
- true
- .\x64\Release/genccode.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
- Level3
- true
- Default
- /utf-8 %(AdditionalOptions)
- true
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x64\Release/genccode.exe
- true
icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\x64\Release/genccode.pdb
- Console
- MachineX64
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- X64
- .\x64\Debug/genccode.tlb
-
-
- Disabled
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- true
- .\x64\Debug/genccode.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
- true
- Level3
- true
- ProgramDatabase
- Default
- /utf-8 %(AdditionalOptions)
- true
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- .\x64\Debug/genccode.exe
- true
- icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- true
- .\x64\Debug/genccode.pdb
- Console
- MachineX64
diff --git a/icu4c/source/tools/gencfu/gencfu.vcxproj b/icu4c/source/tools/gencfu/gencfu.vcxproj
index b97fd785f7d..0627f02210d 100644
--- a/icu4c/source/tools/gencfu/gencfu.vcxproj
+++ b/icu4c/source/tools/gencfu/gencfu.vcxproj
@@ -33,174 +33,58 @@
<_ProjectFileVersion>10.0.30319.1
- .\x86\Debug\
- .\x86\Debug\
- true
- .\x86\Release\
- .\x86\Release\
- false
- .\x64\Release\
- .\x64\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
-
-
- copy "$(TargetPath)" ..\..\..\bin
- ..\..\..\bin\$(TargetFileName);%(Outputs)
-
+
+
+
+ $(OutDir)\gencfu.tlb
+
- Disabled
- ..\..\common;..\..\i18n;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- false
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- false
-
-
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
- true
Level3
- EditAndContinue
Default
- /utf-8 %(AdditionalOptions)
- true
+ false
+ ..\..\common;..\..\i18n;..\toolutil;%(AdditionalIncludeDirectories)
+ $(OutDir)\gencfu.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)\gencfu.pdb
- .\x86\Debug\gencfu.exe
- true
- icuucd.lib;icuind.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- true
Console
+ $(OutDir)\gencfu.exe
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- copy "$(TargetPath)" ..\..\..\bin
- ..\..\..\bin\$(TargetFileName);%(Outputs)
+ copy "$(TargetPath)" ..\..\..\$(IcuBinOutputDir)
+ ..\..\..\$(IcuBinOutputDir)\$(TargetFileName);%(Outputs)
+
+
+
- ..\..\common;..\..\i18n;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
- false
- MultiThreadedDLL
- true
- false
- true
-
-
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
- Level3
- ProgramDatabase
- Default
- /utf-8 %(AdditionalOptions)
- true
+ true
+ MultiThreadedDebugDLL
- .\x86\Release\gencfu.exe
- true
- true
- icuuc.lib;icuin.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- Console
-
-
+ icuucd.lib;icuind.lib;icutud.lib;%(AdditionalDependencies)
-
-
- copy "$(TargetPath)" ..\..\..\bin64%3b
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- X64
- .\x64\Release/gencfu.tlb
-
+
+
- ..\..\common;..\..\i18n;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
MultiThreadedDLL
true
- false
- true
- .\x64\Release/gencfu.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
- Level3
- true
- Default
- /utf-8 %(AdditionalOptions)
- true
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x64\Release/gencfu.exe
- true
icuuc.lib;icuin.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\x64\Release/gencfu.pdb
- Console
- MachineX64
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64%3b
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- X64
- .\x64\Debug/gencfu.tlb
-
-
- Disabled
- ..\..\common;..\..\i18n;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- false
- true
- .\x64\Debug/gencfu.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
- true
- Level3
- true
- ProgramDatabase
- Default
- /utf-8 %(AdditionalOptions)
- true
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- .\x64\Debug/gencfu.exe
- true
- icuucd.lib;icuind.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- true
- .\x64\Debug/gencfu.pdb
- Console
- MachineX64
diff --git a/icu4c/source/tools/gencmn/gencmn.vcxproj b/icu4c/source/tools/gencmn/gencmn.vcxproj
index 92c989b8dc3..dffc4199932 100644
--- a/icu4c/source/tools/gencmn/gencmn.vcxproj
+++ b/icu4c/source/tools/gencmn/gencmn.vcxproj
@@ -33,193 +33,58 @@
<_ProjectFileVersion>10.0.30319.1
- .\x86\Release\
- .\x86\Release\
- false
- .\x86\Debug\
- .\x86\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
-
+
+
- .\x86\Release/gencmn.tlb
+ $(OutDir)/gencmn.tlb
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
- true
- true
- .\x86\Release/gencmn.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
Level3
- true
Default
- /utf-8 %(AdditionalOptions)
- true
+ true
+ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
+ $(OutDir)/gencmn.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)/gencmn.pdb
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x86\Release/gencmn.exe
- true
- icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- .\x86\Release/gencmn.pdb
Console
-
-
+ $(OutDir)/gencmn.exe
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
+ copy "$(TargetPath)" ..\..\..\$(IcuBinOutputDir)
+ ..\..\..\$(IcuBinOutputDir)\$(TargetFileName);%(Outputs)
-
- .\x86\Debug/gencmn.tlb
-
+
+
+
- Disabled
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- true
- true
- .\x86\Debug/gencmn.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
true
- Level3
- true
- EditAndContinue
- Default
- /utf-8 %(AdditionalOptions)
- true
+ MultiThreadedDebugDLL
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x86\Debug/gencmn.exe
- true
icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- true
- .\x86\Debug/gencmn.pdb
- Console
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- X64
- .\x64\Release/gencmn.tlb
-
+
+
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
MultiThreadedDLL
true
- true
- true
- .\x64\Release/gencmn.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
- Level3
- true
- Default
- /utf-8 %(AdditionalOptions)
- true
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x64\Release/gencmn.exe
- true
icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\x64\Release/gencmn.pdb
- Console
- MachineX64
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- X64
- .\x64\Debug/gencmn.tlb
-
-
- Disabled
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- true
- true
- .\x64\Debug/gencmn.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
- true
- Level3
- true
- ProgramDatabase
- Default
- /utf-8 %(AdditionalOptions)
- true
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- .\x64\Debug/gencmn.exe
- true
- icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- true
- .\x64\Debug/gencmn.pdb
- Console
- MachineX64
diff --git a/icu4c/source/tools/gencnval/gencnval.vcxproj b/icu4c/source/tools/gencnval/gencnval.vcxproj
index 6e3dd0c970e..57b5f95f881 100644
--- a/icu4c/source/tools/gencnval/gencnval.vcxproj
+++ b/icu4c/source/tools/gencnval/gencnval.vcxproj
@@ -33,193 +33,58 @@
<_ProjectFileVersion>10.0.30319.1
- .\x86\Release\
- .\x86\Release\
- false
- .\x86\Debug\
- .\x86\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
-
+
+
- .\x86\Release/gencnval.tlb
+ $(OutDir)/gencnval.tlb
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
- false
- true
- .\x86\Release/gencnval.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
Level3
- true
Default
- /utf-8 %(AdditionalOptions)
- true
+ false
+ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
+ $(OutDir)/gencnval.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)/gencnval.pdb
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x86\Release/gencnval.exe
- true
- icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- .\x86\Release/gencnval.pdb
Console
-
-
+ $(OutDir)/gencnval.exe
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
+ copy "$(TargetPath)" ..\..\..\$(IcuBinOutputDir)
+ ..\..\..\$(IcuBinOutputDir)\$(TargetFileName);%(Outputs)
-
- .\x86\Debug/gencnval.tlb
-
+
+
+
- Disabled
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- false
- true
- .\x86\Debug/gencnval.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
true
- Level3
- true
- EditAndContinue
- Default
- /utf-8 %(AdditionalOptions)
- true
+ MultiThreadedDebugDLL
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x86\Debug/gencnval.exe
- true
icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- true
- .\x86\Debug/gencnval.pdb
- Console
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- X64
- .\x64\Release/gencnval.tlb
-
+
+
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
MultiThreadedDLL
true
- false
- true
- .\x64\Release/gencnval.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
- Level3
- true
- Default
- /utf-8 %(AdditionalOptions)
- true
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x64\Release/gencnval.exe
- true
icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\x64\Release/gencnval.pdb
- Console
- MachineX64
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- X64
- .\x64\Debug/gencnval.tlb
-
-
- Disabled
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- false
- true
- .\x64\Debug/gencnval.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
- true
- Level3
- true
- ProgramDatabase
- Default
- /utf-8 %(AdditionalOptions)
- true
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- .\x64\Debug/gencnval.exe
- true
- icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- true
- .\x64\Debug/gencnval.pdb
- Console
- MachineX64
diff --git a/icu4c/source/tools/gendict/gendict.vcxproj b/icu4c/source/tools/gendict/gendict.vcxproj
index 6cd26c2065e..4f369567ba1 100644
--- a/icu4c/source/tools/gendict/gendict.vcxproj
+++ b/icu4c/source/tools/gendict/gendict.vcxproj
@@ -33,193 +33,58 @@
<_ProjectFileVersion>10.0.30319.1
- .\x86\Release\
- .\x86\Release\
- false
- .\x86\Debug\
- .\x86\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
-
+
+
- .\x86\Release/gendict.tlb
+ $(OutDir)\gendict.tlb
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
- true
- true
- .\x86\Release/gendict.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
Level3
- true
Default
- /utf-8 %(AdditionalOptions)
- true
+ true
+ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
+ $(OutDir)\gendict.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)\gendict.pdb
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x86\Release/gendict.exe
- true
- icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- .\x86\Release/gendict.pdb
Console
-
-
+ $(OutDir)\gendict.exe
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
+ copy "$(TargetPath)" ..\..\..\$(IcuBinOutputDir)
+ ..\..\..\$(IcuBinOutputDir)\$(TargetFileName);%(Outputs)
-
- .\x86\Debug/gendict.tlb
-
+
+
+
- Disabled
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- true
- true
- .\x86\Debug/gendict.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
true
- Level3
- true
- EditAndContinue
- Default
- /utf-8 %(AdditionalOptions)
- true
+ MultiThreadedDebugDLL
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x86\Debug/gendict.exe
- true
icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- true
- .\x86\Debug/gendict.pdb
- Console
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- X64
- .\x64\Release/gendict.tlb
-
+
+
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
MultiThreadedDLL
true
- true
- true
- .\x64\Release/gendict.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
- Level3
- true
- Default
- /utf-8 %(AdditionalOptions)
- true
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x64\Release/gendict.exe
- true
icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\x64\Release/gendict.pdb
- Console
- MachineX64
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- X64
- .\x64\Debug/gendict.tlb
-
-
- Disabled
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- true
- true
- .\x64\Debug/gendict.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
- true
- Level3
- true
- ProgramDatabase
- Default
- /utf-8 %(AdditionalOptions)
- true
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- .\x64\Debug/gendict.exe
- true
- icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- true
- .\x64\Debug/gendict.pdb
- Console
- MachineX64
diff --git a/icu4c/source/tools/gennorm2/gennorm2.vcxproj b/icu4c/source/tools/gennorm2/gennorm2.vcxproj
index 20457f132f7..2f41299098b 100644
--- a/icu4c/source/tools/gennorm2/gennorm2.vcxproj
+++ b/icu4c/source/tools/gennorm2/gennorm2.vcxproj
@@ -32,141 +32,58 @@
<_ProjectFileVersion>10.0.30319.1
- .\x86\Release\
- .\x86\Release\
- false
- .\x86\Debug\
- .\x86\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
-
+
+
+ $(OutDir)\gennorm2.tlb
+
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- false
Level3
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
-
-
- MaxSpeed
- true
- MultiThreadedDLL
- true
- .\x86\Release\gennorm2.pch
- .\x86\Release\
- .\x86\Release\
- .\x86\Release\
- ProgramDatabase
Default
+ false
+ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
+ $(OutDir)\gennorm2.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)\gennorm2.pdb
- .\x86\Release\gennorm2.exe
- true
- icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- .\x86\Release\gennorm2.pdb
- true
Console
- true
- true
- MachineX86
- false
+ $(OutDir)\gennorm2.exe
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
+ copy "$(TargetPath)" ..\..\..\$(IcuBinOutputDir)
+ ..\..\..\$(IcuBinOutputDir)\$(TargetFileName);%(Outputs)
+
+
+
- true
- MultiThreadedDebugDLL
- .\x86\Debug\gennorm2.pch
- .\x86\Debug\
- .\x86\Debug\
- .\x86\Debug\
true
- EditAndContinue
- Default
+ MultiThreadedDebugDLL
- .\x86\Debug\gennorm2.exe
icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- true
- .\x86\Debug\gennorm2.pdb
- Console
- false
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
+
+
- MaxSpeed
- true
MultiThreadedDLL
true
- .\x64\Release\gennorm2.pch
- .\x64\Release\
- .\x64\Release\
- .\x64\Release\
- ProgramDatabase
- Default
- .\x64\Release\gennorm2.exe
icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\x64\Release\gennorm2.pdb
- true
- Console
- true
- false
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- true
- MultiThreadedDebugDLL
- .\x64\Debug\gennorm2.pch
- .\x64\Debug\
- .\x64\Debug\
- .\x64\Debug\
- true
- EditAndContinue
- Default
-
-
- .\x64\Debug\gennorm2.exe
- true
- icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- true
- .\x64\Debug\gennorm2.pdb
- Console
- false
diff --git a/icu4c/source/tools/genrb/derb.vcxproj b/icu4c/source/tools/genrb/derb.vcxproj
index 0ac383d8624..43edf4c96ef 100644
--- a/icu4c/source/tools/genrb/derb.vcxproj
+++ b/icu4c/source/tools/genrb/derb.vcxproj
@@ -33,205 +33,58 @@
<_ProjectFileVersion>10.0.30319.1
- .\x86\Release_derb\
- .\x86\Release_derb\
- false
- .\x86\Debug_derb\
- .\x86\Debug_derb\
- true
- .\x64\Release_derb\
- .\x64\Release_derb\
- false
- .\x64\Debug_derb\
- .\x64\Debug_derb\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
-
+
+
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
- .\x86\Release_derb/derb.tlb
+ $(OutDir)/derb.tlb
- ..\..\i18n;..\..\common;..\toolutil;..\..\io;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
- true
- true
- .\x86\Release_derb/derb.pch
- .\x86\Release_derb/
- .\x86\Release_derb/
- .\x86\Release_derb/
Level3
- true
Default
- /utf-8 %(AdditionalOptions)
- true
+ true
+ ..\..\i18n;..\..\common;..\toolutil;..\..\io;%(AdditionalIncludeDirectories)
+ $(OutDir)/derb.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)/derb.pdb
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x86\Release_derb/derb.exe
- true
- icuuc.lib;icuin.lib;icuio.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- .\x86\Release_derb/derb.pdb
Console
-
-
+ $(OutDir)/derb.exe
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
+ copy "$(TargetPath)" ..\..\..\$(IcuBinOutputDir)
+ ..\..\..\$(IcuBinOutputDir)\$(TargetFileName);%(Outputs)
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
- .\x86\Debug_derb/derb.tlb
-
+
+
+
- Disabled
- ..\..\i18n;..\..\common;..\toolutil;..\..\io;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
+ true
MultiThreadedDebugDLL
- true
- true
- true
- .\x86\Debug_derb/derb.pch
- .\x86\Debug_derb/
- .\x86\Debug_derb/
- .\x86\Debug_derb/
- Level3
- true
- EditAndContinue
- Default
- /utf-8 %(AdditionalOptions)
- true
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x86\Debug_derb/derb.exe
- true
icuucd.lib;icuind.lib;icuiod.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- true
- .\x86\Debug_derb/derb.pdb
- Console
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
- X64
- .\x64\Release_derb/derb.tlb
-
+
+
- ..\..\i18n;..\..\common;..\toolutil;..\..\io;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
MultiThreadedDLL
true
- true
- true
- .\x64\Release_derb/derb.pch
- .\x64\Release_derb/
- .\x64\Release_derb/
- .\x64\Release_derb/
- Level3
- true
- Default
- /utf-8 %(AdditionalOptions)
- true
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x64\Release_derb/derb.exe
- true
icuuc.lib;icuin.lib;icuio.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\x64\Release_derb/derb.pdb
- Console
- MachineX64
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
- X64
- .\x64\Debug_derb/derb.tlb
-
-
- Disabled
- ..\..\i18n;..\..\common;..\toolutil;..\..\io;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- true
- true
- .\x64\Debug_derb/derb.pch
- .\x64\Debug_derb/
- .\x64\Debug_derb/
- .\x64\Debug_derb/
- Level3
- true
- ProgramDatabase
- Default
- /utf-8 %(AdditionalOptions)
- true
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- .\x64\Debug_derb/derb.exe
- true
- icuucd.lib;icuind.lib;icuiod.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- true
- .\x64\Debug_derb/derb.pdb
- Console
- MachineX64
diff --git a/icu4c/source/tools/genrb/genrb.vcxproj b/icu4c/source/tools/genrb/genrb.vcxproj
index a7183dc6f4c..166ce733b94 100644
--- a/icu4c/source/tools/genrb/genrb.vcxproj
+++ b/icu4c/source/tools/genrb/genrb.vcxproj
@@ -33,193 +33,58 @@
<_ProjectFileVersion>10.0.30319.1
- .\x86\Release\
- .\x86\Release\
- false
- .\x86\Debug\
- .\x86\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
-
- WINVER=0x0601;_WIN32_WINNT=0x0601;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
-
- .\x86\Release/genrb.tlb
+ $(OutDir)/genrb.tlb
- ..\..\..\include;..\..\common;..\toolutil;..\..\i18n;%(AdditionalIncludeDirectories)
- true
- MultiThreadedDLL
- true
- true
- .\x86\Release/genrb.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
Level3
- true
Default
- /utf-8 %(AdditionalOptions)
- true
+ true
+ ..\..\..\include;..\..\common;..\toolutil;..\..\i18n;%(AdditionalIncludeDirectories)
+ $(OutDir)/genrb.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)/genrb.pdb
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x86\Release/genrb.exe
- true
- icuuc.lib;icuin.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- .\x86\Release/genrb.pdb
Console
-
-
+ $(OutDir)/genrb.exe
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
+ copy "$(TargetPath)" ..\..\..\$(IcuBinOutputDir)
+ ..\..\..\$(IcuBinOutputDir)\$(TargetFileName);%(Outputs)
-
- .\x86\Debug/genrb.tlb
-
+
+
+
- Disabled
- ..\..\..\include;..\..\common;..\toolutil;..\..\i18n;%(AdditionalIncludeDirectories)
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- true
- true
- .\x86\Debug/genrb.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
true
- Level3
- true
- EditAndContinue
- Default
- /utf-8 %(AdditionalOptions)
- true
+ MultiThreadedDebugDLL
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x86\Debug/genrb.exe
- true
icuucd.lib;icuind.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- true
- .\x86\Debug/genrb.pdb
- Console
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- X64
- .\x64\Release/genrb.tlb
-
+
+
- ..\..\..\include;..\..\common;..\toolutil;..\..\i18n;%(AdditionalIncludeDirectories)
- true
MultiThreadedDLL
- true
- true
- .\x64\Release/genrb.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
- Level3
- true
- Default
- /utf-8 %(AdditionalOptions)
- true
+ true
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x64\Release/genrb.exe
- true
icuuc.lib;icuin.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\x64\Release/genrb.pdb
- Console
- MachineX64
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- X64
- .\x64\Debug/genrb.tlb
-
-
- Disabled
- ..\..\..\include;..\..\common;..\toolutil;..\..\i18n;%(AdditionalIncludeDirectories)
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- true
- true
- .\x64\Debug/genrb.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
- true
- Level3
- true
- ProgramDatabase
- Default
- /utf-8 %(AdditionalOptions)
- true
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- .\x64\Debug/genrb.exe
- true
- icuucd.lib;icuind.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- true
- .\x64\Debug/genrb.pdb
- Console
- MachineX64
diff --git a/icu4c/source/tools/gensprep/gensprep.vcxproj b/icu4c/source/tools/gensprep/gensprep.vcxproj
index 1089742e04b..c771a4162a4 100644
--- a/icu4c/source/tools/gensprep/gensprep.vcxproj
+++ b/icu4c/source/tools/gensprep/gensprep.vcxproj
@@ -33,191 +33,58 @@
<_ProjectFileVersion>10.0.30319.1
- .\x86\Release\
- .\x86\Release\
- false
- .\x86\Debug\
- .\x86\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
-
+
+
- .\x86\Release/gensprep.tlb
+ $(OutDir)\gensprep.tlb
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
- false
- true
- .\x86\Release/gensprep.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
Level3
- true
Default
- /utf-8 %(AdditionalOptions)
- true
+ false
+ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
+ $(OutDir)\gensprep.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)\gensprep.pdb
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x86\Release/gensprep.exe
- true
- icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- .\x86\Release/gensprep.pdb
Console
-
-
+ $(OutDir)\gensprep.exe
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
+ copy "$(TargetPath)" ..\..\..\$(IcuBinOutputDir)
+ ..\..\..\$(IcuBinOutputDir)\$(TargetFileName);%(Outputs)
-
- .\x86\Debug/gensprep.tlb
-
+
+
+
- Disabled
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
+ true
MultiThreadedDebugDLL
- true
- false
- true
- .\x86\Debug/gensprep.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
- Level3
- true
- EditAndContinue
- Default
- /utf-8 %(AdditionalOptions)
- true
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x86\Debug/gensprep.exe
- true
icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- true
- .\x86\Debug/gensprep.pdb
- Console
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- X64
- .\x64\Release/gensprep.tlb
-
+
+
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
MultiThreadedDLL
true
- false
- true
- .\x64\Release/gensprep.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
- Level3
- true
- Default
- /utf-8 %(AdditionalOptions)
- true
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x64\Release/gensprep.exe
- true
icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\x64\Release/gensprep.pdb
- Console
- MachineX64
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- X64
- .\x64\Debug/gensprep.tlb
-
-
- Disabled
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- false
- true
- .\x64\Debug/gensprep.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
- Level3
- true
- ProgramDatabase
- Default
- /utf-8 %(AdditionalOptions)
- true
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- .\x64\Debug/gensprep.exe
- true
- icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- true
- .\x64\Debug/gensprep.pdb
- Console
- MachineX64
diff --git a/icu4c/source/tools/gentest/gentest.vcxproj b/icu4c/source/tools/gentest/gentest.vcxproj
index 6c8d7bb7e9a..2c6c7685dde 100644
--- a/icu4c/source/tools/gentest/gentest.vcxproj
+++ b/icu4c/source/tools/gentest/gentest.vcxproj
@@ -34,173 +34,55 @@
<_ProjectFileVersion>10.0.30319.1
- .\x86\Release\
- .\x86\Release\
- false
- .\x86\Debug\
- .\x86\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
-
+
+
- .\x86\Release/gentest.tlb
+ $(OutDir)/gentest.tlb
- ..\..\..\include;..\..\common;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
- true
- true
- .\x86\Release/gentest.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
Level3
- true
Default
- /utf-8 %(AdditionalOptions)
- true
+ true
+ ..\..\..\include;..\..\common;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories)
+ $(OutDir)/gentest.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)/gentest.pdb
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x86\Release/gentest.exe
- true
- icuuc.lib;icutest.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- .\x86\Release/gentest.pdb
Console
-
-
+ $(OutDir)/gentest.exe
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
+ $(OutDir)/gentest.pdb
-
-
- .\x86\Debug/gentest.tlb
-
+
+
- Disabled
- ..\..\..\include;..\..\common;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- true
- true
- .\x86\Debug/gentest.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
true
- Level3
- true
- EditAndContinue
- Default
- /utf-8 %(AdditionalOptions)
- true
+ MultiThreadedDebugDLL
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x86\Debug/gentest.exe
- true
icuucd.lib;icutestd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- true
- .\x86\Debug/gentest.pdb
- Console
-
-
-
-
- X64
- .\x64\Release/gentest.tlb
-
+
+
- ..\..\..\include;..\..\common;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- true
MultiThreadedDLL
true
- true
- true
- .\x64\Release/gentest.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
- Level3
- true
- Default
- /utf-8 %(AdditionalOptions)
- true
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- .\x64\Release/gentest.exe
- true
icuuc.lib;icutest.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\x64\Release/gentest.pdb
- Console
- MachineX64
-
-
-
-
- X64
- .\x64\Debug/gentest.tlb
-
-
- Disabled
- ..\..\..\include;..\..\common;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- true
- true
- .\x64\Debug/gentest.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
- true
- Level3
- true
- ProgramDatabase
- Default
- /utf-8 %(AdditionalOptions)
- true
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- .\x64\Debug/gentest.exe
- true
- icuucd.lib;icutestd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- true
- .\x64\Debug/gentest.pdb
- Console
- MachineX64
diff --git a/icu4c/source/tools/icuinfo/icuinfo.vcxproj b/icu4c/source/tools/icuinfo/icuinfo.vcxproj
index f77d96b4e40..78ac7fa1ef8 100644
--- a/icu4c/source/tools/icuinfo/icuinfo.vcxproj
+++ b/icu4c/source/tools/icuinfo/icuinfo.vcxproj
@@ -33,123 +33,58 @@
<_ProjectFileVersion>10.0.30319.1
- x86\Release\
- x86\Release\
- false
- x86\Debug\
- x86\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
-
+
+
+ $(OutDir)\icuinfo.tlb
+
- ..\..\common;..\..\i18n;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories)
- true
Level4
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
-
-
- MultiThreadedDLL
- true
- x86\Release/icuinfo.pch
- x86\Release/
- x86\Release/
- x86\Release/
Default
+ false
+ ..\..\common;..\..\i18n;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories)
+ $(OutDir)\icuinfo.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)\icuinfo.pdb
- $(OutDir)icuinfo.exe
- icuuc.lib;icuin.lib;icutu.lib;icutest.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- x86\Release/icuinfo.pdb
Console
-
-
+ $(OutDir)\icuinfo.exe
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
+ copy "$(TargetPath)" ..\..\..\$(IcuBinOutputDir)
+ ..\..\..\$(IcuBinOutputDir)\$(TargetFileName);%(Outputs)
+
+
+
- MultiThreadedDebugDLL
- Debug/icuinfo.pch
- Debug/
- Debug/
- Debug/
true
- EditAndContinue
- Default
+ MultiThreadedDebugDLL
- $(OutDir)icuinfo.exe
icuucd.lib;icuind.lib;icutud.lib;icutestd.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- $(OutDir)icuinfo.pdb
- Console
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
+
+
MultiThreadedDLL
true
- x64\Release/icuinfo.pch
- x64\Release/
- x64\Release/
- x64\Release/
- Default
- $(OutDir)icuinfo.exe
icuuc.lib;icuin.lib;icutu.lib;icutest.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- x64\Release/icuinfo.pdb
- Console
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- MultiThreadedDebugDLL
- Debug/icuinfo.pch
- Debug/
- Debug/
- Debug/
- true
- ProgramDatabase
- Default
-
-
- $(OutDir)icuinfo.exe
- icuucd.lib;icuind.lib;icutud.lib;icutestd.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- $(OutDir)icuinfo.pdb
- Console
diff --git a/icu4c/source/tools/icuinfo/testplug.vcxproj b/icu4c/source/tools/icuinfo/testplug.vcxproj
index 8e1c830177d..ca81f1a7698 100644
--- a/icu4c/source/tools/icuinfo/testplug.vcxproj
+++ b/icu4c/source/tools/icuinfo/testplug.vcxproj
@@ -33,193 +33,61 @@
<_ProjectFileVersion>10.0.30319.1
- .\..\..\..\lib\
- .\x86\Release-testplug\
- false
- .\..\..\..\lib\
- .\x86\Debug-testplug\
- true
- .\x64\Release-testplug\
- .\x64\Release-testplug\
- false
- .\x64\Debug-testplug\
- .\x64\Debug-testplug\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
-
+
+
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
- .\..\..\..\lib\testplug.tlb
+ $(OutDir)\testplug.tlb
- true
..\..\..\include;..\..\common;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- true
+ T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions)
true
- true
- .\x86\Release-testplug/testplug.pch
- .\x86\Release-testplug/
- .\x86\Release-testplug/
- .\x86\Release-testplug/
Level3
- true
Default
- /utf-8 %(AdditionalOptions)
- true
+ ProgramDatabase
+ $(OutDir)\testplug.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)\testplug.pdb
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- ..\..\..\bin\testplug.dll
- true
- icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- .\..\..\..\lib\testplug.pdb
- true
- UseLinkTimeCodeGeneration
-
-
- .\..\..\..\lib\testplug.lib
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
- Win32
- .\..\..\..\lib\testplugd.tlb
-
+
+
- Disabled
- ..\..\..\include;..\..\common;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- true
- true
- .\x86\Debug-testplug/testplug.pch
- .\x86\Debug-testplug/
- .\x86\Debug-testplug/
- .\x86\Debug-testplug/
true
- Level3
- true
- EditAndContinue
- Default
- /utf-8 %(AdditionalOptions)
- true
+ MultiThreadedDebugDLL
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- ..\..\..\bin\testplug.dll
- true
- icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
true
- .\..\..\..\lib\testplugd.pdb
-
-
- .\..\..\..\lib\testplugd.lib
+ ..\..\..\$(IcuBinOutputDir)\testplugd.dll
+ ..\..\..\$(IcuLibOutputDir)\testplugd.pdb
+ ..\..\..\$(IcuLibOutputDir)\testplugd.lib
+ icuucd.lib;icutud.lib;%(AdditionalDependencies)
-
-
- NDEBUG;%(PreprocessorDefinitions)
- true
- true
- X64
- .\..\..\..\lib64\testplug.tlb
-
+
+
- true
- ..\..\..\include;..\..\common;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions)
- true
MultiThreadedDLL
true
- true
- true
- .\x64\Release-testplug/testplug.pch
- .\x64\Release-testplug/
- .\x64\Release-testplug/
- .\x64\Release-testplug/
- Level3
- true
- Default
- /utf-8 %(AdditionalOptions)
- true
-
- NDEBUG;%(PreprocessorDefinitions)
- 0x0409
-
- ..\..\..\bin64\testplug.dll
- true
+ ..\..\..\$(IcuBinOutputDir)\testplug.dll
+ ..\..\..\$(IcuLibOutputDir)\testplug.pdb
+ ..\..\..\$(IcuLibOutputDir)\testplug.lib
icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\..\..\..\lib64\testplug.pdb
- true
- UseLinkTimeCodeGeneration
- .\..\..\..\lib64\testplug.lib
- MachineX64
-
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- true
- true
- X64
- .\..\..\..\lib64\testplugd.tlb
-
-
- Disabled
- ..\..\..\include;..\..\common;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories)
- WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions)
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- true
- true
- .\x64\Debug-testplug/testplug.pch
- .\x64\Debug-testplug/
- .\x64\Debug-testplug/
- .\x64\Debug-testplug/
- true
- Level3
- true
- ProgramDatabase
- Default
- /utf-8 %(AdditionalOptions)
- true
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- ..\..\..\bin64\testplug.dll
- true
- icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- true
- .\..\..\..\lib64\testplugd.pdb
- .\..\..\..\lib64\testplugd.lib
- MachineX64
diff --git a/icu4c/source/tools/icupkg/icupkg.vcxproj b/icu4c/source/tools/icupkg/icupkg.vcxproj
index ceaab592adb..1af31e079c4 100644
--- a/icu4c/source/tools/icupkg/icupkg.vcxproj
+++ b/icu4c/source/tools/icupkg/icupkg.vcxproj
@@ -33,124 +33,58 @@
<_ProjectFileVersion>10.0.30319.1
- x86\Release\
- x86\Release\
- false
- x86\Debug\
- x86\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
-
+
+
+ $(OutDir)\icupkg.tlb
+
- ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- true
Level4
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
-
-
- MultiThreadedDLL
- true
- x86\Release/icupkg.pch
- x86\Release/
- x86\Release/
- x86\Release/
Default
+ true
+ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
+ $(OutDir)\icupkg.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)\icupkg.pdb
- $(OutDir)icupkg.exe
- icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- x86\Release/icupkg.pdb
Console
-
-
+ $(OutDir)\icupkg.exe
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
+ copy "$(TargetPath)" ..\..\..\$(IcuBinOutputDir)
+ ..\..\..\$(IcuBinOutputDir)\$(TargetFileName);%(Outputs)
+
+
+
- MultiThreadedDebugDLL
- Debug/icupkg.pch
- Debug/
- Debug/
- Debug/
true
- EditAndContinue
- Default
+ MultiThreadedDebugDLL
- $(OutDir)icupkg.exe
icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- true
- $(OutDir)icupkg.pdb
- Console
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
+
+
MultiThreadedDLL
true
- x64\Release/icupkg.pch
- x64\Release/
- x64\Release/
- x64\Release/
- Default
- $(OutDir)icupkg.exe
icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- x64\Release/icupkg.pdb
- Console
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- MultiThreadedDebugDLL
- Debug/icupkg.pch
- Debug/
- Debug/
- Debug/
- true
- ProgramDatabase
- Default
-
-
- $(OutDir)icupkg.exe
- icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- $(OutDir)icupkg.pdb
- Console
diff --git a/icu4c/source/tools/makeconv/makeconv.vcxproj b/icu4c/source/tools/makeconv/makeconv.vcxproj
index 1ade1ba9f99..73c94a7c289 100644
--- a/icu4c/source/tools/makeconv/makeconv.vcxproj
+++ b/icu4c/source/tools/makeconv/makeconv.vcxproj
@@ -33,133 +33,58 @@
<_ProjectFileVersion>10.0.30319.1
- .\x86\Debug\
- .\x86\Debug\
- true
- .\x86\Release\
- .\x86\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
-
+
-
- ..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
- false
- Level3
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
-
- .\x86\Debug/makeconv.tlb
+ $(OutDir)/makeconv.tlb
- MultiThreadedDebugDLL
- .\x86\Debug/makeconv.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
- true
- EditAndContinue
+ Level3
Default
+ false
+ ..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
+ $(OutDir)/makeconv.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)/makeconv.pdb
- .\x86\Debug/makeconv.exe
- icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- .\x86\Debug/makeconv.pdb
Console
-
-
+ $(OutDir)/makeconv.exe
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
+ copy "$(TargetPath)" ..\..\..\$(IcuBinOutputDir)
+ ..\..\..\$(IcuBinOutputDir)\$(TargetFileName);%(Outputs)
-
- .\x86\Release/makeconv.tlb
-
-
- MultiThreadedDLL
- .\x86\Release/makeconv.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
- Default
-
-
- .\x86\Release/makeconv.exe
- icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- .\x86\Release/makeconv.pdb
- Console
-
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- .\x64\Debug/makeconv.tlb
-
+
+
- MultiThreadedDebugDLL
- .\x64\Debug/makeconv.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
true
- ProgramDatabase
- Default
+ MultiThreadedDebugDLL
- .\x64\Debug/makeconv.exe
icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\x64\Debug/makeconv.pdb
- Console
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- .\x64\Release/makeconv.tlb
-
+
+
MultiThreadedDLL
- .\x64\Release/makeconv.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
- Default
+ true
- .\x64\Release/makeconv.exe
icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\x64\Release/makeconv.pdb
- Console
diff --git a/icu4c/source/tools/pkgdata/pkgdata.vcxproj b/icu4c/source/tools/pkgdata/pkgdata.vcxproj
index bfd82a133d7..f2efdbd6b8f 100644
--- a/icu4c/source/tools/pkgdata/pkgdata.vcxproj
+++ b/icu4c/source/tools/pkgdata/pkgdata.vcxproj
@@ -33,149 +33,58 @@
<_ProjectFileVersion>10.0.30319.1
- .\x86\Debug\
- .\x86\Debug\
- true
- .\x86\Release\
- .\x86\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
-
+
-
- ../../../include;../../common;../toolutil;%(AdditionalIncludeDirectories)
- true
- Level3
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
-
- .\x86\Debug/pkgdata.tlb
+ $(OutDir)/pkgdata.tlb
- MultiThreadedDebugDLL
- .\x86\Debug/pkgdata.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
- true
- EditAndContinue
+ Level3
Default
+ true
+ ../../../include;../../common;../toolutil;%(AdditionalIncludeDirectories)
+ $(OutDir)/pkgdata.pch
+ $(OutDir)/
+ $(OutDir)/
+ $(OutDir)/pkgdata.pdb
-
- 0x0411
-
- .\x86\Debug/pkgdata.exe
- icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- true
- .\x86\Debug/pkgdata.pdb
Console
-
-
+ $(OutDir)/pkgdata.exe
+ ..\..\..\$(IcuLibOutputDir);%(AdditionalLibraryDirectories)
-
-
- copy "$(TargetPath)" ..\..\..\bin
-
- ..\..\..\bin\$(TargetFileName);%(Outputs)
+ copy "$(TargetPath)" ..\..\..\$(IcuBinOutputDir)
+ ..\..\..\$(IcuBinOutputDir)\$(TargetFileName);%(Outputs)
-
- .\x86\Release/pkgdata.tlb
-
-
- MultiThreadedDLL
- true
- .\x86\Release/pkgdata.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
- Default
-
-
- 0x0411
-
-
- .\x86\Release/pkgdata.exe
- icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
- .\x86\Release/pkgdata.pdb
- Console
-
-
-
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- .\x64\Debug/pkgdata.tlb
-
+
+
- MultiThreadedDebugDLL
- .\x64\Debug/pkgdata.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
true
- ProgramDatabase
- Default
+ MultiThreadedDebugDLL
-
- 0x0411
-
- .\x64\Debug/pkgdata.exe
icuucd.lib;icutud.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\x64\Debug/pkgdata.pdb
- Console
-
-
- copy "$(TargetPath)" ..\..\..\bin64
-
- ..\..\..\bin64\$(TargetFileName);%(Outputs)
-
-
- .\x64\Release/pkgdata.tlb
-
+
+
MultiThreadedDLL
true
- .\x64\Release/pkgdata.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
- true
- Default
-
- 0x0411
-
- .\x64\Release/pkgdata.exe
icuuc.lib;icutu.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
- .\x64\Release/pkgdata.pdb
- Console
diff --git a/icu4c/source/tools/toolutil/toolutil.vcxproj b/icu4c/source/tools/toolutil/toolutil.vcxproj
index bd4a7f397be..42c26adfa71 100644
--- a/icu4c/source/tools/toolutil/toolutil.vcxproj
+++ b/icu4c/source/tools/toolutil/toolutil.vcxproj
@@ -33,18 +33,14 @@
<_ProjectFileVersion>10.0.30319.1
- .\..\..\..\lib\
- .\x86\Release\
- false
- .\..\..\..\lib\
- .\x86\Debug\
- true
- .\x64\Release\
- .\x64\Release\
- false
- .\x64\Debug\
- .\x64\Debug\
- true
+ .\$(Platform)\$(Configuration)\
+ .\$(Platform)\$(Configuration)\
+
+ .\x86\$(Configuration)\
+ .\x86\$(Configuration)\
+
+ true
+ false
@@ -53,28 +49,49 @@
U_TOOLUTIL_IMPLEMENTATION;%(PreprocessorDefinitions)
false
Level3
+ Default
-
-
- .\..\..\..\lib\icutu.tlb
-
+
+
+
+ true
+ MultiThreadedDebugDLL
+ EditAndContinue
+
+
+ icuucd.lib;icuind.lib;%(AdditionalDependencies)
+
+
+
+
- true
MultiThreadedDLL
true
- .\x86\Release/toolutil.pch
- .\x86\Release/
- .\x86\Release/
- .\x86\Release/
- Default
- ..\..\..\bin\icutu64.dll
icuuc.lib;icuin.lib;%(AdditionalDependencies)
+
+
+
+
+
+ .\x86\$(Configuration)/toolutil.pch
+ .\x86\$(Configuration)/
+ .\x86\$(Configuration)/
+ .\x86\$(Configuration)/
+
+
..\..\..\lib;%(AdditionalLibraryDirectories)
+
+
+
+
+ .\..\..\..\lib\icutu.tlb
+
+
+ ..\..\..\bin\icutu64.dll
.\..\..\..\lib\icutu.pdb
- UseLinkTimeCodeGeneration
..\..\..\lib\icutu.lib
@@ -84,45 +101,36 @@
.\..\..\..\lib\icutud.tlb
-
- MultiThreadedDebugDLL
- .\x86\Debug/toolutil.pch
- .\x86\Debug/
- .\x86\Debug/
- .\x86\Debug/
- EditAndContinue
- Default
-
..\..\..\bin\icutu64d.dll
- icuucd.lib;icuind.lib;%(AdditionalDependencies)
- ..\..\..\lib;%(AdditionalLibraryDirectories)
.\..\..\..\lib\icutud.pdb
..\..\..\lib\icutud.lib
+
+
+
+ .\x64\$(Configuration)/toolutil.pch
+ .\x64\$(Configuration)/
+ .\x64\$(Configuration)/
+ .\x64\$(Configuration)/
+
+
+ ..\..\..\lib64;%(AdditionalLibraryDirectories)
+
+
.\..\..\..\lib64\icutu.tlb
true
- MultiThreadedDLL
- true
- .\x64\Release/toolutil.pch
- .\x64\Release/
- .\x64\Release/
- .\x64\Release/
- Default
..\..\..\bin64\icutu64.dll
- icuuc.lib;icuin.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
.\..\..\..\lib64\icutu.pdb
- UseLinkTimeCodeGeneration
..\..\..\lib64\icutu.lib
@@ -130,23 +138,80 @@
.\..\..\..\lib64\icutud.tlb
-
- MultiThreadedDebugDLL
- .\x64\Debug/toolutil.pch
- .\x64\Debug/
- .\x64\Debug/
- .\x64\Debug/
- ProgramDatabase
- Default
-
..\..\..\bin64\icutu64d.dll
- icuucd.lib;icuind.lib;%(AdditionalDependencies)
- ..\..\..\lib64;%(AdditionalLibraryDirectories)
.\..\..\..\lib64\icutud.pdb
..\..\..\lib64\icutud.lib
+
+
+ .\ARM\$(Configuration)/toolutil.pch
+ .\ARM\$(Configuration)/
+ .\ARM\$(Configuration)/
+ .\ARM\$(Configuration)/
+
+
+ .\..\..\..\libARM;%(AdditionalLibraryDirectories)
+
+
+
+
+ ..\..\..\libARM\icutu.tlb
+
+
+ ..\..\..\binARM\icutu64.dll
+ .\..\..\..\libARM\icutu.pdb
+ ..\..\..\libARM\icutu.lib
+
+
+
+
+ .\..\..\..\libARM\icutud.tlb
+
+
+ ProgramDatabase
+
+
+ ..\..\..\binARM\icutu64d.dll
+ .\..\..\..\libARM\icutud.pdb
+ ..\..\..\libARM\icutud.lib
+
+
+
+
+ .\ARM64\$(Configuration)/toolutil.pch
+ .\ARM64\$(Configuration)/
+ .\ARM64\$(Configuration)/
+ .\ARM64\$(Configuration)/
+
+
+ .\..\..\..\libARM64;%(AdditionalLibraryDirectories)
+
+
+
+
+ .\..\..\..\libARM64\icutu.tlb
+
+
+ ..\..\..\binARM64\icutu64.dll
+ .\..\..\..\libARM64\icutu.pdb
+ ..\..\..\libARM64\icutu.lib
+
+
+
+
+ .\..\..\..\libARM64\icutud.tlb
+
+
+ ProgramDatabase
+
+
+ ..\..\..\binARM64\icutu64d.dll
+ .\..\..\..\libARM64\icutud.pdb
+ ..\..\..\libARM64\icutud.lib
+
+
false
--
2.40.0