[Libreoffice-commits] core.git: Branch 'private/jmux/win-arm64' - 1448 commits - accessibility/inc accessibility/source android/source animations/source avmedia/inc avmedia/source basctl/inc basctl/Library_basctl.mk basctl/sdi basctl/source basctl/uiconfig basegfx/source basegfx/test basic/inc basic/qa basic/source binaryurp/source bin/find-can-be-private-symbols.classes.results bin/find-mergedlib-can-be-private.classes.results bin/find-unneeded-includes bin/get_config_variables bin/gla11y bin/update_pch bridges/inc bridges/Library_cpp_uno.mk bridges/source canvas/inc canvas/source canvas/workben chart2/inc chart2/Library_chartcore.mk chart2/qa chart2/source chart2/uiconfig chart2/workbench cli_ure/Module_cli_ure.mk codemaker/source comphelper/inc comphelper/source compilerplugins/clang compilerplugins/.gitignore config_host/config_global.h.in config_host/config_skia.h.in config_host.mk.in configmgr/source configure.ac connectivity/inc connectivity/source cppcanvas/inc cppcanvas/source cppuhelper /inc cppuhelper/source cppu/source cui/inc cui/IwyuFilter_cui.yaml cui/source cui/uiconfig dbaccess/inc dbaccess/Library_dbu.mk dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk desktop/inc desktop/qa desktop/source desktop/uiconfig desktop/unx desktop/win32 distro-configs/Jenkins distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeWin64.conf download.lst drawinglayer/inc drawinglayer/source dtrans/source dtrans/test editeng/inc editeng/source embeddedobj/source embeddedobj/test embedserv/source emfio/inc emfio/source extensions/source extensions/uiconfig external/apache-commons external/beanshell external/cppunit external/curl external/gpgmepp external/hsqldb external/icu external/jfreereport external/languagetool external/lcms2 external/libassuan external/libgpg-error external/libjpeg-turbo external/liblangtag external/liborcus external/libpng external/mdds external/nss external/pdfium external/python3 external/redland external/rhino external/skia extras/s ource filter/qa filter/source filter/uiconfig forms/inc forms/source formula/source formula/uiconfig fpicker/source fpicker/uiconfig framework/inc framework/Library_fwk.mk framework/qa framework/source framework/util .git-hooks/pre-commit .git-hooks/README helpcontent2 hwpfilter/source i18npool/Library_localedata_others.mk i18npool/source i18npool/util icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/colibre icon-themes/colibre_svg icon-themes/elementary icon-themes/elementary_svg icon-themes/karasa_jaga icon-themes/karasa_jaga_svg icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-themes/sifr_svg icon-themes/sukapura icon-themes/sukapura_svg idlc/inc idlc/source idl/inc idl/source include/avmedia include/basegfx include/codemaker include/com include/comphelper include/cppuhelper include/dbaccess include/drawinglayer include/editeng include/framework include/o3tl include/oox include/osl include/registry incl ude/rtl include/sfx2 include/svl include/svtools include/svx include/test include/toolkit include/tools include/typelib include/ucbhelper include/uno include/unotools include/vcl include/xmloff instsetoo_native/CustomTarget_setup.mk ios/CustomTarget_iOS_setup.mk ios/LibreOfficeLight javaunohelper/test jvmfwk/inc jvmfwk/plugins jvmfwk/source l10ntools/source librelogo/Package_librelogo.mk librelogo/source libreofficekit/qa libreofficekit/source linguistic/source lotuswordpro/inc lotuswordpro/source Makefile.gbuild Makefile.in odk/examples odk/source offapi/com offapi/type_reference offapi/UnoApi_offapi.mk officecfg/Configuration_officecfg.mk officecfg/registry oovbaapi/ooo oox/inc oox/qa oox/source opencl/source package/inc package/source postprocess/CustomTarget_images.mk postprocess/CustomTarget_registry.mk postprocess/Module_postprocess.mk postprocess/Rdb_services.mk pyuno/demo pyuno/IwyuFilter_pyuno.yaml qadevOOo/runner qadevOOo/tests readlicense_oo/docs readlicense_oo/license re gistry/source reportbuilder/java reportdesign/inc reportdesign/source RepositoryExternal.mk Repository.mk RepositoryModule_build.mk ridljar/com sal/CompilerTest_sal_rtl_oustring.mk sal/CppunitTest_sal_rtl.mk sal/Library_sal.mk sal/Module_sal.mk sal/osl sal/qa sal/rtl sal/util sax/qa sax/source scaddins/source schema/libreoffice schema/mathml2 sc/inc sc/IwyuFilter_sc.yaml sc/Library_scui.mk sc/Module_sc.mk scp2/AutoInstall.mk scp2/inc scp2/source sc/qa scripting/java scripting/source sc/sdi sc/source sc/uiconfig sc/UITest_options.mk sc/UITest_sc_options.mk sdext/inc sdext/source sd/inc sd/qa sd/sdi sd/source sd/uiconfig sd/xml sfx2/CppunitTest_sfx2_view.mk sfx2/inc sfx2/Module_sfx2.mk sfx2/qa sfx2/sdi sfx2/source sfx2/uiconfig shell/Module_shell.mk shell/source slideshow/inc slideshow/README slideshow/source solenv/bin solenv/clang-format solenv/CompilerTest_compilerplugins_clang.mk solenv/flatpak-manifest.in solenv/gbuild solenv/gcc-wrappers solenv/gdb solenv/sanitizers sot/inc sot/ source starmath/inc starmath/Library_sm.mk starmath/qa starmath/sdi starmath/source starmath/uiconfig stoc/source svgio/inc svgio/source svl/inc svl/qa svl/source svtools/inc svtools/Library_svt.mk svtools/qa svtools/source svtools/uiconfig svtools/UIConfig_svt.mk svx/inc svx/IwyuFilter_svx.yaml svx/Library_svxcore.mk svx/Library_svx.mk svx/Module_svx.mk svx/qa svx/sdi svx/source svx/uiconfig sw/CppunitTest_sw_core_draw.mk sw/CppunitTest_sw_core_layout.mk sw/CppunitTest_sw_core_undo.mk sw/CppunitTest_sw_uibase_uiview.mk sw/CppunitTest_sw_ww8export.mk sw/inc sw/IwyuFilter_sw.yaml sw/Library_msword.mk sw/Module_sw.mk sw/PythonTest_sw_python.mk sw/qa sw/sdi sw/source sw/uiconfig sw/UITest_options.mk sw/UITest_sw_options.mk sysui/desktop test/source testtools/source toolkit/inc toolkit/Library_tk.mk toolkit/source tools/source translations ucbhelper/IwyuFilter_ucbhelper.yaml ucbhelper/Library_ucbhelper.mk ucbhelper/source ucb/qa ucb/source udkapi/type_reference uitest/libreoffice uitest /ui_logger_dsl unodevtools/source unoidl/source unoil/Module_unoil.mk unotest/Module_unotest.mk unotest/source unotools/inc unotools/source unoxml/Module_unoxml.mk uui/inc uui/source uui/uiconfig vbahelper/inc vbahelper/source vcl/headless vcl/inc vcl/jsdialog vcl/Library_vcl.mk vcl/Library_vclplug_win.mk vcl/opengl vcl/osx vcl/qa vcl/qt5 vcl/quartz vcl/skia vcl/source vcl/StaticLibrary_fuzzerstubs.mk vcl/uiconfig vcl/unx vcl/win vcl/workben winaccessibility/inc winaccessibility/source wizards/com wizards/source writerfilter/documentation writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/qa writerfilter/source writerperfect/source xmlhelp/source xmloff/CppunitTest_xmloff_draw.mk xmloff/inc xmloff/IwyuFilter_xmloff.yaml xmloff/Library_xo.mk xmloff/Module_xmloff.mk xmloff/qa xmloff/source xmloff/util xmlscript/source xmlsecurity/inc xmlsecurity/Library_xmlsecurity.mk xmlsecurity/qa xmlsecurity/source xmlsecurity/uiconfig xmlsecurity/workben

[Jan-Marek Glogowski (via logerrit)]

Rebased ref, commits from common ancestor:
commit 5e454ce1ba8a93b9d17f3b7d38b4339ff0f2339b
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Sat Sep 12 18:17:08 2020 +0200
Commit:     Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Tue Sep 15 20:51:58 2020 +0200

    basic: use dummy DLL mgr for Windows Arm64 build
    
    This will need a real implementation to do system calls, but for
    the initial compilation the dummy is sufficient.
    
    Change-Id: Ia16e47fdb8fbf4855f7c5abb0d36d9c922cd1de7

diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx
index 08927843a98d..368fa3d10a2f 100644
--- a/basic/source/runtime/dllmgr.hxx
+++ b/basic/source/runtime/dllmgr.hxx
@@ -42,7 +42,7 @@ public:
     void FreeDll(OUString const & library);
 
 private:
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_ARM64_)
     struct Impl;
 
     std::unique_ptr< Impl > impl_;
commit e477dd05b8bf34accba7d58ffbc47ada529fc4f7
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Wed Sep 2 15:32:44 2020 +0200
Commit:     Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Tue Sep 15 20:51:58 2020 +0200

    twain32shim: disable for Windows Arm64 build
    
    I know the platform can emulate x86 code, but have no idea, if
    this would include x86 TWAIN32 drivers, so disable the build
    for now.
    
    Change-Id: I22cb2ab81ade9f91097586f382cdd4855e27d827

diff --git a/Repository.mk b/Repository.mk
index de0c26140fa3..3cc82b017463 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -151,7 +151,7 @@ $(eval $(call 
gb_Helper_register_executables_for_install,OOO,brand, \
                unoinfo \
                unopkg \
                unopkg_com \
-               twain32shim \
+               $(if $(filter-out ARM64,$(CPUNAME)),twain32shim) \
        ) \
 ))
 
diff --git a/configure.ac b/configure.ac
index be73281b3e05..bacae1c9a9b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3814,7 +3814,8 @@ if test "$_os" = "WINNT"; then
     # Check for 32-bit compiler to use to build the 32-bit TWAIN shim
     # needed to support TWAIN scan on both 32- and 64-bit systems
 
-    if test "$WIN_HOST_ARCH" = "x64"; then
+    case "$WIN_HOST_ARCH" in
+    x64)
         AC_MSG_CHECKING([for a x86 compiler and libraries for 32-bit binaries 
required for TWAIN support])
         if test -n "$WIN_MULTI_ARCH"; then
             BUILD_X86=TRUE
@@ -3825,10 +3826,12 @@ if test "$_os" = "WINNT"; then
             AC_MSG_RESULT([not found])
             AC_MSG_WARN([Installation set will not contain 32-bit binaries 
required for TWAIN support])
         fi
-    else
+        ;;
+    x86)
         BUILD_X86=TRUE
         CXX_X86_BINARY=$MSVC_CXX
-    fi
+        ;;
+    esac
     AC_SUBST(BUILD_X86)
     AC_SUBST(CXX_X86_BINARY)
 fi
commit a6893e150164e100e7fb52703bf29aae97bf8b15
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Mon Aug 3 07:08:56 2020 +0200
Commit:     Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Tue Sep 15 20:51:57 2020 +0200

    jvmfwk: add vendorbase entry for Windows Arm64
    
    Change-Id: Iea89befded02ecfd7513cc3d8f116dd6ac2913be

diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx
index df536bc3477e..7e98a2409c35 100644
--- a/jvmfwk/inc/vendorbase.hxx
+++ b/jvmfwk/inc/vendorbase.hxx
@@ -39,6 +39,8 @@ namespace jfw_plugin
 #define JFW_PLUGIN_ARCH "sparc"
 #elif defined X86_64
 #define JFW_PLUGIN_ARCH "amd64"
+#elif defined ARM64
+#define JFW_PLUGIN_ARCH "arm64"
 #elif defined INTEL
 #define JFW_PLUGIN_ARCH "i386"
 #elif defined POWERPC64
commit e2a4303d72d7643ff4cab699a7f9f6584fc84f14
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Mon Aug 3 07:06:36 2020 +0200
Commit:     Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Tue Sep 15 20:51:57 2020 +0200

    cli_ure: Disable .NET for Windows Arm64 build
    
    The current .NET 5.0 Arm64 preview doesn't have a mscoree.lib,
    so linking the climaker isn't possible.
    
    Change-Id: Ibbac88aa465a9ca2eb8fb0efaad91d20f358229b

diff --git a/Repository.mk b/Repository.mk
index 1443003e99f3..de0c26140fa3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -546,7 +546,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
 
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
        affine_uno_uno \
-       $(if $(filter MSC,$(COM)),cli_uno) \
+       $(if $(filter MSC,$(COM)),$(if $(filter-out ARM64,$(CPUNAME)),cli_uno)) 
\
        i18nlangtag \
        $(if $(ENABLE_JAVA), \
                java_uno \
diff --git a/cli_ure/Module_cli_ure.mk b/cli_ure/Module_cli_ure.mk
index d1ff09073a18..91863abb59c9 100644
--- a/cli_ure/Module_cli_ure.mk
+++ b/cli_ure/Module_cli_ure.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_Module_Module,cli_ure))
 
 ifeq ($(COM),MSC)
+ifneq ($(CPUNAME),ARM64)
 $(eval $(call gb_Module_add_targets,cli_ure,\
        CliLibrary_cli_basetypes \
        CliLibrary_cli_ure \
@@ -22,5 +23,6 @@ $(eval $(call gb_Module_add_targets,cli_ure,\
        Package_cli_basetypes_copy \
 ))
 endif
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 350b0363a763..f1ddc7c62977 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -26,7 +26,7 @@
  ************************************************************************/
 #include "macros.inc"
 
-#if defined _MSC_VER
+#if defined _MSC_VER && ! defined _ARM64_
 
 File gid_File_Lib_Cli_Oootypes_Assembly
     TXT_FILE_BODY;
@@ -41,9 +41,6 @@ File gid_File_Lib_Cli_Oootypes_Assembly
     ProcessorArchitecture = "MSIL";
 End
 
-#endif
-
-#if defined _MSC_VER
 File gid_File_Lib_Policy_Cli_Oootypes_Assembly
     TXT_FILE_BODY;
     Styles = (PACKED, ASSEMBLY);
@@ -57,10 +54,6 @@ File gid_File_Lib_Policy_Cli_Oootypes_Assembly
     ProcessorArchitecture = "MSIL";
 End
 
-#endif
-
-#if defined _MSC_VER
-
 File gid_File_Lib_Policy_Cli_Oootypes_Config
     TXT_FILE_BODY;
     Styles = (PACKED, ASSIGNCOMPONENT);
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 09109ebc41e6..30e06e4942f9 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -81,7 +81,7 @@ End
 
 // Private Dynamic Libraries:
 
-#if defined _MSC_VER
+#if defined _MSC_VER && ! defined _ARM64_
 File gid_File_Dl_Cli_Ure_Assembly
     TXT_FILE_BODY;
     Styles = (PACKED, ASSEMBLY);
diff --git a/unoil/Module_unoil.mk b/unoil/Module_unoil.mk
index 5977368f2dab..6b1cb5fd064f 100644
--- a/unoil/Module_unoil.mk
+++ b/unoil/Module_unoil.mk
@@ -17,9 +17,11 @@ $(eval $(call gb_Module_add_targets,unoil,\
 endif
 
 ifeq ($(COM),MSC)
+ifneq ($(CPUNAME),ARM64)
 $(eval $(call gb_Module_add_targets,unoil,\
     CliUnoApi_oootypes \
 ))
 endif
+endif
 
 # vim:set noet sw=4 ts=4:
commit c7e8d5ccbf5132f8e7b4f25ee7cd0d4ec3bb8557
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Mon Aug 3 06:49:32 2020 +0200
Commit:     Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Tue Sep 15 20:51:57 2020 +0200

    cppunit: fix Windows Arm64 build
    
    Change-Id: I75b169362ed703bcae0720aeac0602f389435317

diff --git a/external/cppunit/UnpackedTarball_cppunit.mk 
b/external/cppunit/UnpackedTarball_cppunit.mk
index c645c2bf4db3..10063d2aa104 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
        external/cppunit/enable-win32-debug.patch \
        external/cppunit/rtti.patch.0 \
        external/cppunit/order.patch.0 \
+       external/cppunit/windows-arm64.patch.1 \
 ))
 ifeq ($(DISABLE_DYNLOADING),TRUE)
 $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
diff --git a/external/cppunit/windows-arm64.patch.1 
b/external/cppunit/windows-arm64.patch.1
new file mode 100644
index 000000000000..0e41fa005d81
--- /dev/null
+++ b/external/cppunit/windows-arm64.patch.1
@@ -0,0 +1,786 @@
+diff -ur cppunit-1.15.1.orig/src/cppunit/cppunit_dll.vcxproj 
cppunit-1.15.1/src/cppunit/cppunit_dll.vcxproj
+--- cppunit-1.15.1.orig/src/cppunit/cppunit_dll.vcxproj        2019-11-28 
20:35:43.000000000 +0100
++++ cppunit-1.15.1/src/cppunit/cppunit_dll.vcxproj     2020-08-03 
03:04:20.181281900 +0200
+@@ -1,6 +1,10 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+   <ItemGroup Label="ProjectConfigurations">
++    <ProjectConfiguration Include="Debug|ARM64">
++      <Configuration>Debug</Configuration>
++      <Platform>ARM64</Platform>
++    </ProjectConfiguration>
+     <ProjectConfiguration Include="Debug|Win32">
+       <Configuration>Debug</Configuration>
+       <Platform>Win32</Platform>
+@@ -9,6 +13,10 @@
+       <Configuration>Debug</Configuration>
+       <Platform>x64</Platform>
+     </ProjectConfiguration>
++    <ProjectConfiguration Include="Release|ARM64">
++      <Configuration>Release</Configuration>
++      <Platform>ARM64</Platform>
++    </ProjectConfiguration>
+     <ProjectConfiguration Include="Release|Win32">
+       <Configuration>Release</Configuration>
+       <Platform>Win32</Platform>
+@@ -34,6 +42,11 @@
+     <UseOfMfc>false</UseOfMfc>
+     <CharacterSet>MultiByte</CharacterSet>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" 
Label="Configuration">
++    <ConfigurationType>DynamicLibrary</ConfigurationType>
++    <UseOfMfc>false</UseOfMfc>
++    <CharacterSet>MultiByte</CharacterSet>
++  </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" 
Label="Configuration">
+     <ConfigurationType>DynamicLibrary</ConfigurationType>
+     <UseOfMfc>false</UseOfMfc>
+@@ -44,6 +57,11 @@
+     <UseOfMfc>false</UseOfMfc>
+     <CharacterSet>MultiByte</CharacterSet>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" 
Label="Configuration">
++    <ConfigurationType>DynamicLibrary</ConfigurationType>
++    <UseOfMfc>false</UseOfMfc>
++    <CharacterSet>MultiByte</CharacterSet>
++  </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+   <ImportGroup Label="ExtensionSettings">
+   </ImportGroup>
+@@ -55,6 +73,10 @@
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
+     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+   </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" 
Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
++    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
++  </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" 
Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
+     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+@@ -63,6 +85,10 @@
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
+     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+   </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" 
Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
++    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
++  </ImportGroup>
+   <PropertyGroup Label="UserMacros" />
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+     <OutDir>.\DebugDll\</OutDir>
+@@ -76,6 +102,12 @@
+     <LinkIncremental>true</LinkIncremental>
+     <TargetName>cppunitd_dll</TargetName>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
++    <OutDir>.\DebugDll\</OutDir>
++    <IntDir>.\DebugDll\</IntDir>
++    <LinkIncremental>true</LinkIncremental>
++    <TargetName>cppunitd_dll</TargetName>
++  </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+     <OutDir>.\ReleaseDll\</OutDir>
+     <IntDir>.\ReleaseDll\</IntDir>
+@@ -86,6 +116,11 @@
+     <IntDir>.\ReleaseDll\</IntDir>
+     <LinkIncremental>false</LinkIncremental>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
++    <OutDir>.\ReleaseDll\</OutDir>
++    <IntDir>.\ReleaseDll\</IntDir>
++    <LinkIncremental>false</LinkIncremental>
++  </PropertyGroup>
+   <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+     <ClCompile>
+       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+@@ -180,6 +213,52 @@
+       
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
++  <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
++    <ClCompile>
++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
++      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
++      <FunctionLevelLinking>false</FunctionLevelLinking>
++      <Optimization>Disabled</Optimization>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <WarningLevel>Level3</WarningLevel>
++      <RuntimeTypeInfo>true</RuntimeTypeInfo>
++      
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <AssemblerListingLocation>.\DebugDll\</AssemblerListingLocation>
++      
<PrecompiledHeaderOutputFile>.\DebugDll\cppunit_dll.pch</PrecompiledHeaderOutputFile>
++      <ObjectFileName>.\DebugDll\</ObjectFileName>
++      <ProgramDataBaseFileName>.\DebugDll\</ProgramDataBaseFileName>
++      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
++    </ClCompile>
++    <PostBuildEvent>
++      <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).dll
++copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib</Command>
++      <Message>Copying target to lib/</Message>
++    </PostBuildEvent>
++    <Midl>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <TypeLibraryName>.\DebugDll\cppunit_dll.tlb</TypeLibraryName>
++      <MkTypLibCompatible>true</MkTypLibCompatible>
++    </Midl>
++    <ResourceCompile>
++      <Culture>0x040c</Culture>
++      
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++    </ResourceCompile>
++    <Bscmake>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <OutputFile>.\DebugDll\cppunit_dll.bsc</OutputFile>
++    </Bscmake>
++    <Link>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <LinkDLL>true</LinkDLL>
++      <GenerateDebugInformation>true</GenerateDebugInformation>
++      <SubSystem>Console</SubSystem>
++      <OutputFile>DebugDll\cppunitd_dll.dll</OutputFile>
++      <ImportLibrary>.\DebugDll\cppunitd_dll.lib</ImportLibrary>
++      
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++    </Link>
++  </ItemDefinitionGroup>
+   <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+     <ClCompile>
+       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+@@ -267,6 +345,52 @@
+       <SuppressStartupBanner>true</SuppressStartupBanner>
+       <LinkDLL>true</LinkDLL>
+       <GenerateDebugInformation>true</GenerateDebugInformation>
++      <SubSystem>Console</SubSystem>
++      <OutputFile>.\ReleaseDll\cppunit_dll.dll</OutputFile>
++      <ImportLibrary>.\ReleaseDll\cppunit_dll.lib</ImportLibrary>
++      
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++    </Link>
++  </ItemDefinitionGroup>
++  <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
++    <ClCompile>
++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
++      <StringPooling>true</StringPooling>
++      <FunctionLevelLinking>true</FunctionLevelLinking>
++      <Optimization>MaxSpeed</Optimization>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <WarningLevel>Level3</WarningLevel>
++      <RuntimeTypeInfo>true</RuntimeTypeInfo>
++      
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <AssemblerListingLocation>.\ReleaseDll\</AssemblerListingLocation>
++      
<PrecompiledHeaderOutputFile>.\ReleaseDll\cppunit_dll.pch</PrecompiledHeaderOutputFile>
++      <ObjectFileName>.\ReleaseDll\</ObjectFileName>
++      <ProgramDataBaseFileName>.\ReleaseDll\</ProgramDataBaseFileName>
++    </ClCompile>
++    <PostBuildEvent>
++      <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).dll
++copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib</Command>
++      <Message>Copying target to lib/</Message>
++    </PostBuildEvent>
++    <Midl>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <TypeLibraryName>.\ReleaseDll\cppunit_dll.tlb</TypeLibraryName>
++      <MkTypLibCompatible>true</MkTypLibCompatible>
++    </Midl>
++    <ResourceCompile>
++      <Culture>0x040c</Culture>
++      
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++    </ResourceCompile>
++    <Bscmake>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <OutputFile>.\ReleaseDll\cppunit_dll.bsc</OutputFile>
++    </Bscmake>
++    <Link>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <LinkDLL>true</LinkDLL>
++      <GenerateDebugInformation>true</GenerateDebugInformation>
+       <SubSystem>Console</SubSystem>
+       <OutputFile>.\ReleaseDll\cppunit_dll.dll</OutputFile>
+       <ImportLibrary>.\ReleaseDll\cppunit_dll.lib</ImportLibrary>
+diff -ur cppunit-1.15.1.orig/src/DllPlugInTester/DllPlugInTester.vcxproj 
cppunit-1.15.1/src/DllPlugInTester/DllPlugInTester.vcxproj
+--- cppunit-1.15.1.orig/src/DllPlugInTester/DllPlugInTester.vcxproj    
2019-11-28 20:35:43.000000000 +0100
++++ cppunit-1.15.1/src/DllPlugInTester/DllPlugInTester.vcxproj 2020-08-03 
03:05:06.310642100 +0200
+@@ -1,6 +1,10 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+   <ItemGroup Label="ProjectConfigurations">
++    <ProjectConfiguration Include="Debug Static|ARM64">
++      <Configuration>Debug Static</Configuration>
++      <Platform>ARM64</Platform>
++    </ProjectConfiguration>
+     <ProjectConfiguration Include="Debug Static|Win32">
+       <Configuration>Debug Static</Configuration>
+       <Platform>Win32</Platform>
+@@ -9,6 +13,10 @@
+       <Configuration>Debug Static</Configuration>
+       <Platform>x64</Platform>
+     </ProjectConfiguration>
++    <ProjectConfiguration Include="Debug Unicode|ARM64">
++      <Configuration>Debug Unicode</Configuration>
++      <Platform>ARM64</Platform>
++    </ProjectConfiguration>
+     <ProjectConfiguration Include="Debug Unicode|Win32">
+       <Configuration>Debug Unicode</Configuration>
+       <Platform>Win32</Platform>
+@@ -17,6 +25,10 @@
+       <Configuration>Debug Unicode</Configuration>
+       <Platform>x64</Platform>
+     </ProjectConfiguration>
++    <ProjectConfiguration Include="Debug|ARM64">
++      <Configuration>Debug</Configuration>
++      <Platform>ARM64</Platform>
++    </ProjectConfiguration>
+     <ProjectConfiguration Include="Debug|Win32">
+       <Configuration>Debug</Configuration>
+       <Platform>Win32</Platform>
+@@ -25,6 +37,10 @@
+       <Configuration>Debug</Configuration>
+       <Platform>x64</Platform>
+     </ProjectConfiguration>
++    <ProjectConfiguration Include="Release Static|ARM64">
++      <Configuration>Release Static</Configuration>
++      <Platform>ARM64</Platform>
++    </ProjectConfiguration>
+     <ProjectConfiguration Include="Release Static|Win32">
+       <Configuration>Release Static</Configuration>
+       <Platform>Win32</Platform>
+@@ -33,6 +49,10 @@
+       <Configuration>Release Static</Configuration>
+       <Platform>x64</Platform>
+     </ProjectConfiguration>
++    <ProjectConfiguration Include="Release Unicode|ARM64">
++      <Configuration>Release Unicode</Configuration>
++      <Platform>ARM64</Platform>
++    </ProjectConfiguration>
+     <ProjectConfiguration Include="Release Unicode|Win32">
+       <Configuration>Release Unicode</Configuration>
+       <Platform>Win32</Platform>
+@@ -41,6 +61,10 @@
+       <Configuration>Release Unicode</Configuration>
+       <Platform>x64</Platform>
+     </ProjectConfiguration>
++    <ProjectConfiguration Include="Release|ARM64">
++      <Configuration>Release</Configuration>
++      <Platform>ARM64</Platform>
++    </ProjectConfiguration>
+     <ProjectConfiguration Include="Release|Win32">
+       <Configuration>Release</Configuration>
+       <Platform>Win32</Platform>
+@@ -66,6 +90,11 @@
+     <UseOfMfc>false</UseOfMfc>
+     <CharacterSet>MultiByte</CharacterSet>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 
Unicode|ARM64'" Label="Configuration">
++    <ConfigurationType>Application</ConfigurationType>
++    <UseOfMfc>false</UseOfMfc>
++    <CharacterSet>MultiByte</CharacterSet>
++  </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 
Label="Configuration">
+     <ConfigurationType>Application</ConfigurationType>
+     <UseOfMfc>false</UseOfMfc>
+@@ -76,6 +105,11 @@
+     <UseOfMfc>false</UseOfMfc>
+     <CharacterSet>MultiByte</CharacterSet>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" 
Label="Configuration">
++    <ConfigurationType>Application</ConfigurationType>
++    <UseOfMfc>false</UseOfMfc>
++    <CharacterSet>MultiByte</CharacterSet>
++  </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" 
Label="Configuration">
+     <ConfigurationType>Application</ConfigurationType>
+     <UseOfMfc>false</UseOfMfc>
+@@ -86,6 +120,11 @@
+     <UseOfMfc>false</UseOfMfc>
+     <CharacterSet>MultiByte</CharacterSet>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" 
Label="Configuration">
++    <ConfigurationType>Application</ConfigurationType>
++    <UseOfMfc>false</UseOfMfc>
++    <CharacterSet>MultiByte</CharacterSet>
++  </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 
Static|Win32'" Label="Configuration">
+     <ConfigurationType>Application</ConfigurationType>
+     <UseOfMfc>false</UseOfMfc>
+@@ -96,6 +135,11 @@
+     <UseOfMfc>false</UseOfMfc>
+     <CharacterSet>MultiByte</CharacterSet>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 
Static|ARM64'" Label="Configuration">
++    <ConfigurationType>Application</ConfigurationType>
++    <UseOfMfc>false</UseOfMfc>
++    <CharacterSet>MultiByte</CharacterSet>
++  </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 
Static|Win32'" Label="Configuration">
+     <ConfigurationType>Application</ConfigurationType>
+     <UseOfMfc>false</UseOfMfc>
+@@ -106,6 +150,11 @@
+     <UseOfMfc>false</UseOfMfc>
+     <CharacterSet>MultiByte</CharacterSet>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 
Static|ARM64'" Label="Configuration">
++    <ConfigurationType>Application</ConfigurationType>
++    <UseOfMfc>false</UseOfMfc>
++    <CharacterSet>MultiByte</CharacterSet>
++  </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 
Unicode|Win32'" Label="Configuration">
+     <ConfigurationType>Application</ConfigurationType>
+     <UseOfMfc>false</UseOfMfc>
+@@ -116,6 +165,11 @@
+     <UseOfMfc>false</UseOfMfc>
+     <CharacterSet>MultiByte</CharacterSet>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 
Unicode|ARM64'" Label="Configuration">
++    <ConfigurationType>Application</ConfigurationType>
++    <UseOfMfc>false</UseOfMfc>
++    <CharacterSet>MultiByte</CharacterSet>
++  </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+   <ImportGroup Label="ExtensionSettings">
+   </ImportGroup>
+@@ -127,6 +181,10 @@
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
+     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+   </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug 
Unicode|ARM64'" Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
++    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
++  </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 
Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
+     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+@@ -135,6 +193,10 @@
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
+     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+   </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" 
Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
++    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
++  </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" 
Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
+     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+@@ -143,6 +205,10 @@
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
+     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+   </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" 
Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
++    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
++  </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 
Static|Win32'" Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
+     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+@@ -151,6 +217,10 @@
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
+     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+   </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 
Static|ARM64'" Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
++    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
++  </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug 
Static|Win32'" Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
+     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+@@ -159,6 +229,10 @@
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
+     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+   </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug 
Static|ARM64'" Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
++    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
++  </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 
Unicode|Win32'" Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
+     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+@@ -167,6 +241,10 @@
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
+     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+   </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 
Unicode|ARM64'" Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
++    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
++  </ImportGroup>
+   <PropertyGroup Label="UserMacros" />
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 
Unicode|Win32'">
+     <OutDir>.\ReleaseUnicode\</OutDir>
+@@ -180,6 +258,12 @@
+     <LinkIncremental>false</LinkIncremental>
+     <TargetName>$(ProjectName)u</TargetName>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 
Unicode|ARM64'">
++    <OutDir>.\Release\</OutDir>
++    <IntDir>.\Release\</IntDir>
++    <LinkIncremental>false</LinkIncremental>
++    <TargetName>$(ProjectName)u</TargetName>
++  </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 
Static|Win32'">
+     <OutDir>.\Debug\</OutDir>
+     <IntDir>.\Debug\</IntDir>
+@@ -192,6 +274,12 @@
+     <LinkIncremental>false</LinkIncremental>
+     <TargetName>$(ProjectName)d</TargetName>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 
Static|ARM64'">
++    <OutDir>.\DebugDll\</OutDir>
++    <IntDir>.\DebugDll\</IntDir>
++    <LinkIncremental>false</LinkIncremental>
++    <TargetName>$(ProjectName)d</TargetName>
++  </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 
Static|Win32'">
+     <OutDir>.\Release\</OutDir>
+     <IntDir>.\Release\</IntDir>
+@@ -202,6 +288,11 @@
+     <IntDir>.\Release\</IntDir>
+     <LinkIncremental>false</LinkIncremental>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 
Static|ARM64'">
++    <OutDir>.\Release\</OutDir>
++    <IntDir>.\Release\</IntDir>
++    <LinkIncremental>false</LinkIncremental>
++  </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+     <OutDir>.\DebugDll\</OutDir>
+     <IntDir>.\DebugDll\</IntDir>
+@@ -214,6 +303,12 @@
+     <LinkIncremental>false</LinkIncremental>
+     <TargetName>DllPlugInTesterd_dll</TargetName>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
++    <OutDir>.\DebugDll\</OutDir>
++    <IntDir>.\DebugDll\</IntDir>
++    <LinkIncremental>false</LinkIncremental>
++    <TargetName>DllPlugInTesterd_dll</TargetName>
++  </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+     <OutDir>.\ReleaseDll\</OutDir>
+     <IntDir>.\ReleaseDll\</IntDir>
+@@ -226,6 +319,12 @@
+     <LinkIncremental>false</LinkIncremental>
+     <TargetName>$(ProjectName)_dll</TargetName>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
++    <OutDir>.\ReleaseDll\</OutDir>
++    <IntDir>.\ReleaseDll\</IntDir>
++    <LinkIncremental>false</LinkIncremental>
++    <TargetName>$(ProjectName)_dll</TargetName>
++  </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 
Unicode|Win32'">
+     <OutDir>.\DebugUnicode\</OutDir>
+     <IntDir>.\DebugUnicode\</IntDir>
+@@ -238,6 +335,12 @@
+     <LinkIncremental>false</LinkIncremental>
+     <TargetName>$(ProjectName)ud</TargetName>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 
Unicode|ARM64'">
++    <OutDir>.\DebugDll\</OutDir>
++    <IntDir>.\DebugDll\</IntDir>
++    <LinkIncremental>false</LinkIncremental>
++    <TargetName>$(ProjectName)ud</TargetName>
++  </PropertyGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 
Unicode|Win32'">
+     <ClCompile>
+       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+@@ -324,6 +425,49 @@
+       
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
++  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 
Unicode|ARM64'">
++    <ClCompile>
++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
++      <StringPooling>true</StringPooling>
++      <FunctionLevelLinking>true</FunctionLevelLinking>
++      <Optimization>MinSpace</Optimization>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <WarningLevel>Level3</WarningLevel>
++      <RuntimeTypeInfo>true</RuntimeTypeInfo>
++      <DebugInformationFormat>OldStyle</DebugInformationFormat>
++      
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <AssemblerListingLocation>.\ReleaseUnicode\</AssemblerListingLocation>
++      
<PrecompiledHeaderOutputFile>.\ReleaseUnicode\DllPlugInTester.pch</PrecompiledHeaderOutputFile>
++      <PrecompiledHeader>
++      </PrecompiledHeader>
++      <ObjectFileName>.\ReleaseUnicode\</ObjectFileName>
++      <ProgramDataBaseFileName>.\ReleaseUnicode\</ProgramDataBaseFileName>
++    </ClCompile>
++    <PostBuildEvent>
++      <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).exe</Command>
++      <Message>Copying target to lib/</Message>
++    </PostBuildEvent>
++    <Midl>
++      <TypeLibraryName>.\ReleaseUnicode\DllPlugInTester.tlb</TypeLibraryName>
++    </Midl>
++    <ResourceCompile>
++      <Culture>0x040c</Culture>
++      
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++    </ResourceCompile>
++    <Bscmake>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <OutputFile>.\ReleaseUnicode\DllPlugInTester.bsc</OutputFile>
++    </Bscmake>
++    <Link>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <SubSystem>Console</SubSystem>
++      <OutputFile>ReleaseUnicode\DllPlugInTesteru.exe</OutputFile>
++      
<AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
++      
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
++    </Link>
++  </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 
Static|Win32'">
+     <ClCompile>
+       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+@@ -411,6 +555,49 @@
+       
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
++  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 
Static|ARM64'">
++    <ClCompile>
++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
++      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
++      <FunctionLevelLinking>false</FunctionLevelLinking>
++      <Optimization>Disabled</Optimization>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <WarningLevel>Level3</WarningLevel>
++      <RuntimeTypeInfo>true</RuntimeTypeInfo>
++      
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
++      
<PrecompiledHeaderOutputFile>.\Debug\DllPlugInTester.pch</PrecompiledHeaderOutputFile>
++      <PrecompiledHeader>
++      </PrecompiledHeader>
++      <ObjectFileName>.\Debug\</ObjectFileName>
++      <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>
++      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
++    </ClCompile>
++    <PostBuildEvent>
++      <Command>copy $(TargetPath) ..\..\lib\$(TargetName).exe</Command>
++      <Message>Copying target to lib/</Message>
++    </PostBuildEvent>
++    <Midl>
++      <TypeLibraryName>.\Debug\DllPlugInTester.tlb</TypeLibraryName>
++    </Midl>
++    <ResourceCompile>
++      <Culture>0x040c</Culture>
++      
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++    </ResourceCompile>
++    <Bscmake>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <OutputFile>.\Debug\DllPlugInTester.bsc</OutputFile>
++    </Bscmake>
++    <Link>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <GenerateDebugInformation>true</GenerateDebugInformation>
++      <SubSystem>Console</SubSystem>
++      <OutputFile>Debug\DllPlugInTesterd.exe</OutputFile>
++      
<AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
++      
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
++    </Link>
++  </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 
Static|Win32'">
+     <ClCompile>
+       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+@@ -497,6 +684,49 @@
+       
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
++  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 
Static|ARM64'">
++    <ClCompile>
++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
++      <StringPooling>true</StringPooling>
++      <FunctionLevelLinking>true</FunctionLevelLinking>
++      <Optimization>MinSpace</Optimization>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <WarningLevel>Level3</WarningLevel>
++      <RuntimeTypeInfo>true</RuntimeTypeInfo>
++      <DebugInformationFormat>OldStyle</DebugInformationFormat>
++      
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <AssemblerListingLocation>.\Release\</AssemblerListingLocation>
++      
<PrecompiledHeaderOutputFile>.\Release\DllPlugInTester.pch</PrecompiledHeaderOutputFile>
++      <PrecompiledHeader>
++      </PrecompiledHeader>
++      <ObjectFileName>.\Release\</ObjectFileName>
++      <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
++    </ClCompile>
++    <PostBuildEvent>
++      <Command>copy $(TargetPath) ..\..\lib\$(TargetName).exe</Command>
++      <Message>Copying target to lib/</Message>
++    </PostBuildEvent>
++    <Midl>
++      <TypeLibraryName>.\Release\DllPlugInTester.tlb</TypeLibraryName>
++    </Midl>
++    <ResourceCompile>
++      <Culture>0x040c</Culture>
++      
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++    </ResourceCompile>
++    <Bscmake>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <OutputFile>.\Release\DllPlugInTester.bsc</OutputFile>
++    </Bscmake>
++    <Link>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <SubSystem>Console</SubSystem>
++      <OutputFile>.\Release\DllPlugInTester.exe</OutputFile>
++      
<AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
++      
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
++    </Link>
++  </ItemDefinitionGroup>
+   <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+     <ClCompile>
+       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+@@ -584,6 +814,49 @@
+       
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
++  <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
++    <ClCompile>
++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
++      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
++      <FunctionLevelLinking>false</FunctionLevelLinking>
++      <Optimization>Disabled</Optimization>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <WarningLevel>Level3</WarningLevel>
++      <RuntimeTypeInfo>true</RuntimeTypeInfo>
++      
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;CPPUNIT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <AssemblerListingLocation>.\DebugDll\</AssemblerListingLocation>
++      
<PrecompiledHeaderOutputFile>.\DebugDll\DllPlugInTester.pch</PrecompiledHeaderOutputFile>
++      <PrecompiledHeader>
++      </PrecompiledHeader>
++      <ObjectFileName>.\DebugDll\</ObjectFileName>
++      <ProgramDataBaseFileName>.\DebugDll\</ProgramDataBaseFileName>
++      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
++    </ClCompile>
++    <PostBuildEvent>
++      <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).exe</Command>
++      <Message>Copying target to lib/</Message>
++    </PostBuildEvent>
++    <Midl>
++      <TypeLibraryName>.\DebugDll\DllPlugInTester.tlb</TypeLibraryName>
++    </Midl>
++    <ResourceCompile>
++      <Culture>0x040c</Culture>
++      
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++    </ResourceCompile>
++    <Bscmake>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <OutputFile>.\DebugDll\DllPlugInTester.bsc</OutputFile>
++    </Bscmake>
++    <Link>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <GenerateDebugInformation>true</GenerateDebugInformation>
++      <SubSystem>Console</SubSystem>
++      <OutputFile>DebugDll\DllPlugInTesterd_dll.exe</OutputFile>
++      
<AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
++      
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
++    </Link>
++  </ItemDefinitionGroup>
+   <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+     <ClCompile>
+       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+@@ -670,6 +943,49 @@
+       
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
++  <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
++    <ClCompile>
++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
++      <StringPooling>true</StringPooling>
++      <FunctionLevelLinking>true</FunctionLevelLinking>
++      <Optimization>MinSpace</Optimization>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <WarningLevel>Level3</WarningLevel>
++      <RuntimeTypeInfo>true</RuntimeTypeInfo>
++      <DebugInformationFormat>OldStyle</DebugInformationFormat>
++      
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;CPPUNIT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <AssemblerListingLocation>.\ReleaseDll\</AssemblerListingLocation>
++      
<PrecompiledHeaderOutputFile>.\ReleaseDll\DllPlugInTester.pch</PrecompiledHeaderOutputFile>
++      <PrecompiledHeader>
++      </PrecompiledHeader>
++      <ObjectFileName>.\ReleaseDll\</ObjectFileName>
++      <ProgramDataBaseFileName>.\ReleaseDll\</ProgramDataBaseFileName>
++    </ClCompile>
++    <PostBuildEvent>
++      <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).exe</Command>
++      <Message>Copying target to lib/</Message>
++    </PostBuildEvent>
++    <Midl>
++      <TypeLibraryName>.\ReleaseDll\DllPlugInTester.tlb</TypeLibraryName>
++    </Midl>
++    <ResourceCompile>
++      <Culture>0x040c</Culture>
++      
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++    </ResourceCompile>
++    <Bscmake>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <OutputFile>.\ReleaseDll\DllPlugInTester.bsc</OutputFile>
++    </Bscmake>
++    <Link>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <SubSystem>Console</SubSystem>
++      <OutputFile>ReleaseDll\DllPlugInTester_dll.exe</OutputFile>
++      
<AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
++      
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunit_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
++    </Link>
++  </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 
Unicode|Win32'">
+     <ClCompile>
+       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+@@ -718,6 +1034,49 @@
+     <ClCompile>
+       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
++      <FunctionLevelLinking>false</FunctionLevelLinking>
++      <Optimization>Disabled</Optimization>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <WarningLevel>Level3</WarningLevel>
++      <RuntimeTypeInfo>true</RuntimeTypeInfo>
++      
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <AssemblerListingLocation>.\DebugUnicode\</AssemblerListingLocation>
++      
<PrecompiledHeaderOutputFile>.\DebugUnicode\DllPlugInTester.pch</PrecompiledHeaderOutputFile>
++      <PrecompiledHeader>
++      </PrecompiledHeader>
++      <ObjectFileName>.\DebugUnicode\</ObjectFileName>
++      <ProgramDataBaseFileName>.\DebugUnicode\</ProgramDataBaseFileName>
++      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
++    </ClCompile>
++    <PostBuildEvent>
++      <Command>copy "$(TargetPath)" ..\..\lib\$(TargetName).exe</Command>
++      <Message>Copying target to lib/</Message>
++    </PostBuildEvent>
++    <Midl>
++      <TypeLibraryName>.\DebugUnicode\DllPlugInTester.tlb</TypeLibraryName>
++    </Midl>
++    <ResourceCompile>
++      <Culture>0x040c</Culture>
++      
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++    </ResourceCompile>
++    <Bscmake>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <OutputFile>.\DebugUnicode\DllPlugInTester.bsc</OutputFile>
++    </Bscmake>
++    <Link>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <GenerateDebugInformation>true</GenerateDebugInformation>
++      <SubSystem>Console</SubSystem>
++      <OutputFile>DebugUnicode\DllPlugInTesterud.exe</OutputFile>
++      
<AdditionalLibraryDirectories>../../lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
++      
<AdditionalDependencies>odbc32.lib;odbccp32.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
++    </Link>
++  </ItemDefinitionGroup>
++  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 
Unicode|ARM64'">
++    <ClCompile>
++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
++      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+       <FunctionLevelLinking>false</FunctionLevelLinking>
+       <Optimization>Disabled</Optimization>
+       <SuppressStartupBanner>true</SuppressStartupBanner>
commit 154bd02998e100ac919d4e73efdc712676da3bb8
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Sat Jul 18 03:58:37 2020 +0200
Commit:     Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Tue Sep 15 20:51:57 2020 +0200

    pdfium: fix Windows Arm64 build
    
    Change-Id: Ie8698bd51b897ba8d07c278cbbd9ad2d3caa4bb3

diff --git a/external/pdfium/configs/build_config.h 
b/external/pdfium/configs/build_config.h
index edd70af53034..c6b9e08d6f13 100644
--- a/external/pdfium/configs/build_config.h
+++ b/external/pdfium/configs/build_config.h
@@ -114,7 +114,7 @@
 #elif defined(__alpha__)
 #define ARCH_CPU_ALPHA 1
 #define ARCH_CPU_64_BITS 1
-#elif defined(__aarch64__)
+#elif defined(__aarch64__) || defined(_M_ARM64)
 #define ARCH_CPU_ARM_FAMILY 1
 #define ARCH_CPU_ARM64 1
 #define ARCH_CPU_64_BITS 1
commit d6f41afb47f14b51d5f05d3ee544353c06019242
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Sat Jul 18 03:57:58 2020 +0200
Commit:     Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Tue Sep 15 20:51:57 2020 +0200

    lcms2: fix Windows Arm64 build
    
    Adds the ARM64 platform to the VC2019 MSBuild solution. This turned
    out to be tricky, because - for whatever reason - diff couldn't
    detect the solution file as text, so I added the whole file to
    replace it. And "-a" would just generate a UTF-16 diff, which is
    not applyable, so this just adds the new file and copies it.
    
    Change-Id: I538610bed071fd45dc107f405056f23e1bff7a09

diff --git a/external/lcms2/UnpackedTarball_lcms2.mk 
b/external/lcms2/UnpackedTarball_lcms2.mk
index 1aae4c3db254..932f8c63c81c 100644
--- a/external/lcms2/UnpackedTarball_lcms2.mk
+++ b/external/lcms2/UnpackedTarball_lcms2.mk
@@ -18,6 +18,10 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,lcms2,3))
 $(eval $(call gb_UnpackedTarball_add_patches,lcms2,\
        external/lcms2/lcms2-2.4-windows.patch \
        external/lcms2/c++17.patch.1 \
+       external/lcms2/lcms2-win-arm64.patch.1 \
 ))
 
+# Can't include in ARM64 patch, as diff fails to detect text in it
+$(eval $(call 
gb_UnpackedTarball_add_file,lcms2,Projects/VC2019/lcms2.sln,external/lcms2/lcms2_sln))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/lcms2/lcms2-win-arm64.patch.1 
b/external/lcms2/lcms2-win-arm64.patch.1
new file mode 100644
index 000000000000..42244b742797
--- /dev/null
+++ b/external/lcms2/lcms2-win-arm64.patch.1
@@ -0,0 +1,1523 @@
+diff -urbaN lcms2-2.11.orig/Projects/VC2019/jpegicc/jpegicc.vcxproj 
lcms2-2.11/Projects/VC2019/jpegicc/jpegicc.vcxproj
+--- lcms2-2.11.orig/Projects/VC2019/jpegicc/jpegicc.vcxproj    2020-06-16 
19:10:37.000000000 +0200
++++ lcms2-2.11/Projects/VC2019/jpegicc/jpegicc.vcxproj 2020-07-09 
18:28:37.881727697 +0200
+@@ -1,6 +1,10 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <Project DefaultTargets="Build" ToolsVersion="15.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+   <ItemGroup Label="ProjectConfigurations">
++    <ProjectConfiguration Include="Debug|ARM64">
++      <Configuration>Debug</Configuration>
++      <Platform>ARM64</Platform>
++    </ProjectConfiguration>
+     <ProjectConfiguration Include="Debug|Win32">
+       <Configuration>Debug</Configuration>
+       <Platform>Win32</Platform>
+@@ -9,6 +13,10 @@
+       <Configuration>Debug</Configuration>
+       <Platform>x64</Platform>
+     </ProjectConfiguration>
++    <ProjectConfiguration Include="Release|ARM64">
++      <Configuration>Release</Configuration>
++      <Platform>ARM64</Platform>
++    </ProjectConfiguration>
+     <ProjectConfiguration Include="Release|Win32">
+       <Configuration>Release</Configuration>
+       <Platform>Win32</Platform>
+@@ -37,6 +45,12 @@
+     <WholeProgramOptimization>true</WholeProgramOptimization>
+     <PlatformToolset>v142</PlatformToolset>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" 
Label="Configuration">
++    <ConfigurationType>Application</ConfigurationType>
++    <CharacterSet>Unicode</CharacterSet>
++    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v142</PlatformToolset>
++  </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" 
Label="Configuration">
+     <ConfigurationType>Application</ConfigurationType>
+     <CharacterSet>Unicode</CharacterSet>
+@@ -47,6 +61,11 @@
+     <CharacterSet>Unicode</CharacterSet>
+     <PlatformToolset>v142</PlatformToolset>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" 
Label="Configuration">
++    <ConfigurationType>Application</ConfigurationType>
++    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v142</PlatformToolset>
++  </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+   <ImportGroup Label="ExtensionSettings">
+   </ImportGroup>
+@@ -56,12 +75,18 @@
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" 
Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+   </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" 
Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
++  </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" 
Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+   </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" 
Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+   </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" 
Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
++  </ImportGroup>
+   <PropertyGroup Label="UserMacros" />
+   <PropertyGroup>
+     <_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
+@@ -71,32 +96,44 @@
+     <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>
+     <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+     <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
++    <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</LinkIncremental>
+     <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\bin\</OutDir>
+     <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\bin\</OutDir>
+     <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+     <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>
+     <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+     <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
++    <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</LinkIncremental>
+     <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+     <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
++    <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">AllRules.ruleset</CodeAnalysisRuleSet>
+     <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+     <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
++    <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
+     <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+     <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
++    <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
+     <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+     <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
++    <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">AllRules.ruleset</CodeAnalysisRuleSet>
+     <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+     <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
++    <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
+     <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+     <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
++    <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
+     <IncludePath 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IncludePath);;C:\code\jpeg-9a</IncludePath>
+     <IncludePath 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IncludePath);;C:\code\jpeg-9a</IncludePath>
++    <IncludePath 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(IncludePath);;C:\code\jpeg-9a</IncludePath>
+     <LibraryPath 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LibraryPath);;C:\code\jpeg-9a</LibraryPath>
+     <LibraryPath 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LibraryPath);;C:\code\jpeg-9a</LibraryPath>
++    <LibraryPath 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(LibraryPath);;C:\code\jpeg-9a</LibraryPath>
+     <IncludePath 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IncludePath);;C:\code\jpeg-9a</IncludePath>
+     <IncludePath 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IncludePath);;C:\code\jpeg-9a</IncludePath>
++    <IncludePath 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(IncludePath);;C:\code\jpeg-9a</IncludePath>
+     <LibraryPath 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LibraryPath);;C:\code\jpeg-9a</LibraryPath>
+     <LibraryPath 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LibraryPath);;C:\code\jpeg-9a</LibraryPath>
++    <LibraryPath 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(LibraryPath);;C:\code\jpeg-9a</LibraryPath>
+   </PropertyGroup>
+   <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+     <ClCompile>
+@@ -140,6 +177,26 @@
+       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+     </Link>
+   </ItemDefinitionGroup>
++  <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
++    <ClCompile>
++      <Optimization>Disabled</Optimization>
++      
<AdditionalIncludeDirectories>../../../include;../../../utils/common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
++      <PrecompiledHeader>
++      </PrecompiledHeader>
++      <WarningLevel>Level4</WarningLevel>
++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++      <MultiProcessorCompilation>true</MultiProcessorCompilation>
++    </ClCompile>
++    <Link>
++      
<AdditionalDependencies>libjpeg.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <GenerateDebugInformation>true</GenerateDebugInformation>
++      <SubSystem>Console</SubSystem>
++      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
++    </Link>
++  </ItemDefinitionGroup>
+   <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+     <ClCompile>
+       <Optimization>Full</Optimization>
+@@ -197,6 +254,32 @@
+       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+     </Link>
+   </ItemDefinitionGroup>
++  <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
++    <ClCompile>
++      <Optimization>Full</Optimization>
++      <IntrinsicFunctions>true</IntrinsicFunctions>
++      
<AdditionalIncludeDirectories>../../../include;../../../utils/common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
++      <FunctionLevelLinking>true</FunctionLevelLinking>
++      <PrecompiledHeader>
++      </PrecompiledHeader>
++      <WarningLevel>Level3</WarningLevel>
++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
++      <OmitFramePointers>true</OmitFramePointers>
++      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
++      <MultiProcessorCompilation>true</MultiProcessorCompilation>
++    </ClCompile>
++    <Link>
++      
<AdditionalDependencies>libjpeg.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <GenerateDebugInformation>true</GenerateDebugInformation>
++      <SubSystem>Console</SubSystem>
++      <OptimizeReferences>true</OptimizeReferences>
++      <EnableCOMDATFolding>true</EnableCOMDATFolding>
++      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
++    </Link>
++  </ItemDefinitionGroup>
+   <ItemGroup>
+     <ClCompile Include="..\..\..\utils\common\vprf.c" />
+     <ClCompile Include="..\..\..\utils\common\xgetopt.c" />
+diff -urbaN lcms2-2.11.orig/Projects/VC2019/lcms2_DLL/lcms2_DLL.vcxproj 
lcms2-2.11/Projects/VC2019/lcms2_DLL/lcms2_DLL.vcxproj
+--- lcms2-2.11.orig/Projects/VC2019/lcms2_DLL/lcms2_DLL.vcxproj        
2020-06-16 19:10:37.000000000 +0200
++++ lcms2-2.11/Projects/VC2019/lcms2_DLL/lcms2_DLL.vcxproj     2020-07-09 
18:28:38.049726437 +0200
+@@ -1,6 +1,10 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <Project DefaultTargets="Build" ToolsVersion="15.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+   <ItemGroup Label="ProjectConfigurations">
++    <ProjectConfiguration Include="Debug|ARM64">
++      <Configuration>Debug</Configuration>
++      <Platform>ARM64</Platform>
++    </ProjectConfiguration>
+     <ProjectConfiguration Include="Debug|Win32">
+       <Configuration>Debug</Configuration>
+       <Platform>Win32</Platform>
+@@ -9,6 +13,10 @@
+       <Configuration>Debug</Configuration>
+       <Platform>x64</Platform>
+     </ProjectConfiguration>
++    <ProjectConfiguration Include="Release|ARM64">
++      <Configuration>Release</Configuration>
++      <Platform>ARM64</Platform>
++    </ProjectConfiguration>
+     <ProjectConfiguration Include="Release|Win32">
+       <Configuration>Release</Configuration>
+       <Platform>Win32</Platform>
+@@ -37,6 +45,12 @@
+     <WholeProgramOptimization>true</WholeProgramOptimization>
+     <PlatformToolset>v142</PlatformToolset>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" 
Label="Configuration">
++    <ConfigurationType>DynamicLibrary</ConfigurationType>
++    <CharacterSet>Unicode</CharacterSet>
++    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v142</PlatformToolset>
++  </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" 
Label="Configuration">
+     <ConfigurationType>DynamicLibrary</ConfigurationType>
+     <CharacterSet>Unicode</CharacterSet>
+@@ -47,6 +61,11 @@
+     <CharacterSet>Unicode</CharacterSet>
+     <PlatformToolset>v142</PlatformToolset>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" 
Label="Configuration">
++    <ConfigurationType>DynamicLibrary</ConfigurationType>
++    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v142</PlatformToolset>
++  </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+   <ImportGroup Label="ExtensionSettings">
+   </ImportGroup>
+@@ -56,12 +75,18 @@
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" 
Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+   </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" 
Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
++  </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" 
Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+   </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" 
Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+   </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" 
Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
++  </ImportGroup>
+   <PropertyGroup Label="UserMacros" />
+   <PropertyGroup>
+     <_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
+@@ -69,28 +94,40 @@
+     <_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
+     <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\bin\</OutDir>
+     <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\bin\</OutDir>
++    <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">..\..\..\bin\</OutDir>
+     <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)_$(Platform)\</IntDir>
+     <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)_$(Platform)\</IntDir>
++    <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(Configuration)_$(Platform)\</IntDir>
+     <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+     <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
++    <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</LinkIncremental>
+     <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\bin\</OutDir>
+     <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\bin\</OutDir>
++    <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">..\..\..\bin\</OutDir>
+     <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)_$(Platform)\</IntDir>
+     <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)_$(Platform)\</IntDir>
++    <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(Configuration)_$(Platform)\</IntDir>
+     <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+     <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
++    <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</LinkIncremental>
+     <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+     <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
++    <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">AllRules.ruleset</CodeAnalysisRuleSet>
+     <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+     <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
++    <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
+     <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+     <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
++    <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
+     <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+     <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
++    <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">AllRules.ruleset</CodeAnalysisRuleSet>
+     <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+     <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
++    <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
+     <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+     <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
++    <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+     <TargetName>lcms2</TargetName>
+@@ -99,9 +134,15 @@
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+     <TargetName>lcms2</TargetName>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
++    <TargetName>lcms2</TargetName>
++  </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+     <TargetName>lcms2</TargetName>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
++    <TargetName>lcms2</TargetName>
++  </PropertyGroup>
+   <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+     <ClCompile>
+       <Optimization>Disabled</Optimization>
+@@ -144,6 +185,27 @@
+       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+     </Link>
+   </ItemDefinitionGroup>
++  <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
++    <ClCompile>
++      <Optimization>Disabled</Optimization>
++      
<AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CMS_DLL_BUILD;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
++      <PrecompiledHeader>
++      </PrecompiledHeader>
++      <WarningLevel>Level4</WarningLevel>
++      <MultiProcessorCompilation>true</MultiProcessorCompilation>
++      <StringPooling>false</StringPooling>
++    </ClCompile>
++    <Link>
++      <ModuleDefinitionFile>
++      </ModuleDefinitionFile>
++      <GenerateDebugInformation>true</GenerateDebugInformation>
++      <SubSystem>Windows</SubSystem>
++      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
++    </Link>
++  </ItemDefinitionGroup>
+   <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+     <ClCompile>
+       <Optimization>Full</Optimization>
+@@ -203,6 +265,34 @@
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+     </Link>
+   </ItemDefinitionGroup>
++  <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
++    <ClCompile>
++      <Optimization>Full</Optimization>
++      <IntrinsicFunctions>true</IntrinsicFunctions>
++      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
++      <OmitFramePointers>true</OmitFramePointers>
++      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
++      <WholeProgramOptimization>true</WholeProgramOptimization>
++      
<AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CMS_DLL_BUILD;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
++      <FunctionLevelLinking>true</FunctionLevelLinking>
++      <PrecompiledHeader>
++      </PrecompiledHeader>
++      <WarningLevel>Level4</WarningLevel>
++      <StringPooling>true</StringPooling>
++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
++      <MultiProcessorCompilation>true</MultiProcessorCompilation>
++    </ClCompile>
++    <Link>
++      <ModuleDefinitionFile>
++      </ModuleDefinitionFile>
++      <GenerateDebugInformation>true</GenerateDebugInformation>
++      <SubSystem>Windows</SubSystem>
++      <OptimizeReferences>true</OptimizeReferences>
++      <EnableCOMDATFolding>true</EnableCOMDATFolding>
++    </Link>
++  </ItemDefinitionGroup>
+   <ItemGroup>
+     <ClCompile Include="..\..\..\src\cmsalpha.c" />
+     <ClCompile Include="..\..\..\src\cmscam02.c" />
+@@ -234,7 +324,9 @@
+   <ItemGroup>
+     <CustomBuild Include="..\..\..\src\lcms2.def">
+       <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
++      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+       <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
++      <ExcludedFromBuild 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+     </CustomBuild>
+   </ItemGroup>
+   <ItemGroup>
+diff -urbaN lcms2-2.11.orig/Projects/VC2019/lcms2_static/lcms2_static.vcxproj 
lcms2-2.11/Projects/VC2019/lcms2_static/lcms2_static.vcxproj
+--- lcms2-2.11.orig/Projects/VC2019/lcms2_static/lcms2_static.vcxproj  
2020-06-16 19:10:37.000000000 +0200
++++ lcms2-2.11/Projects/VC2019/lcms2_static/lcms2_static.vcxproj       
2020-07-09 18:28:38.173725507 +0200
+@@ -1,6 +1,10 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <Project DefaultTargets="Build" ToolsVersion="15.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+   <ItemGroup Label="ProjectConfigurations">
++    <ProjectConfiguration Include="Debug|ARM64">
++      <Configuration>Debug</Configuration>
++      <Platform>ARM64</Platform>
++    </ProjectConfiguration>
+     <ProjectConfiguration Include="Debug|Win32">
+       <Configuration>Debug</Configuration>
+       <Platform>Win32</Platform>
+@@ -9,6 +13,10 @@
+       <Configuration>Debug</Configuration>
+       <Platform>x64</Platform>
+     </ProjectConfiguration>
++    <ProjectConfiguration Include="Release|ARM64">
++      <Configuration>Release</Configuration>
++      <Platform>ARM64</Platform>
++    </ProjectConfiguration>
+     <ProjectConfiguration Include="Release|Win32">
+       <Configuration>Release</Configuration>
+       <Platform>Win32</Platform>
+@@ -37,6 +45,12 @@
+     <WholeProgramOptimization>true</WholeProgramOptimization>
+     <PlatformToolset>v142</PlatformToolset>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" 
Label="Configuration">
++    <ConfigurationType>StaticLibrary</ConfigurationType>
++    <CharacterSet>Unicode</CharacterSet>
++    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v142</PlatformToolset>
++  </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" 
Label="Configuration">
+     <ConfigurationType>StaticLibrary</ConfigurationType>
+     <CharacterSet>Unicode</CharacterSet>
+@@ -47,6 +61,11 @@
+     <CharacterSet>Unicode</CharacterSet>
+     <PlatformToolset>v142</PlatformToolset>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" 
Label="Configuration">
++    <ConfigurationType>StaticLibrary</ConfigurationType>
++    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v142</PlatformToolset>
++  </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+   <ImportGroup Label="ExtensionSettings">
+   </ImportGroup>
+@@ -56,12 +75,18 @@
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" 
Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+   </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" 
Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
++  </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" 
Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+   </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" 
Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+   </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" 
Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
++  </ImportGroup>
+   <PropertyGroup Label="UserMacros" />
+   <PropertyGroup>
+     <_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
+@@ -69,22 +94,30 @@
+     <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\Lib\MS\</OutDir>
+     <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)_$(Platform)\</IntDir>
+     <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)_$(Platform)\</IntDir>
++    <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(Configuration)_$(Platform)\</IntDir>
+     <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Lib\MS\</OutDir>
+     <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\Lib\MS\</OutDir>
+     <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)_$(Platform)\</IntDir>
+     <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)_$(Platform)\</IntDir>
++    <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(Configuration)_$(Platform)\</IntDir>
+     <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+     <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
++    <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">AllRules.ruleset</CodeAnalysisRuleSet>
+     <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+     <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
++    <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
+     <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+     <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
++    <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
+     <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+     <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
++    <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">AllRules.ruleset</CodeAnalysisRuleSet>
+     <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+     <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
++    <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
+     <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+     <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
++    <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
+   </PropertyGroup>
+   <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+     <ClCompile>
+@@ -120,6 +153,23 @@
+       <CompileAs>Default</CompileAs>
+     </ClCompile>
+   </ItemDefinitionGroup>
++  <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
++    <ClCompile>
++      <Optimization>Disabled</Optimization>
++      
<AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
++      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
++      <PrecompiledHeader>
++      </PrecompiledHeader>
++      <WarningLevel>Level4</WarningLevel>
++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++      <FunctionLevelLinking>
++      </FunctionLevelLinking>
++      <MultiProcessorCompilation>true</MultiProcessorCompilation>
++      <CompileAs>Default</CompileAs>
++    </ClCompile>
++  </ItemDefinitionGroup>
+   <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+     <ClCompile>
+       <Optimization>MaxSpeed</Optimization>
+@@ -169,6 +219,28 @@
+       <StringPooling>true</StringPooling>
+     </ClCompile>
+   </ItemDefinitionGroup>
++  <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
++    <ClCompile>
++      <Optimization>MaxSpeed</Optimization>
++      <IntrinsicFunctions>true</IntrinsicFunctions>
++      
<AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
++      <FunctionLevelLinking>true</FunctionLevelLinking>
++      <PrecompiledHeader>
++      </PrecompiledHeader>
++      <WarningLevel>Level4</WarningLevel>
++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
++      <OmitFramePointers>true</OmitFramePointers>
++      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
++      <ExceptionHandling>false</ExceptionHandling>
++      <MultiProcessorCompilation>true</MultiProcessorCompilation>
++      <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
++      <StringPooling>true</StringPooling>
++    </ClCompile>
++  </ItemDefinitionGroup>
+   <ItemGroup>
+     <ClCompile Include="..\..\..\src\cmsalpha.c" />
+     <ClCompile Include="..\..\..\src\cmscam02.c" />
+diff -urbaN lcms2-2.11.orig/Projects/VC2019/linkicc/linkicc.vcxproj 
lcms2-2.11/Projects/VC2019/linkicc/linkicc.vcxproj
+--- lcms2-2.11.orig/Projects/VC2019/linkicc/linkicc.vcxproj    2020-06-16 
19:10:37.000000000 +0200
++++ lcms2-2.11/Projects/VC2019/linkicc/linkicc.vcxproj 2020-07-09 
18:28:38.297724577 +0200
+@@ -1,6 +1,10 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <Project DefaultTargets="Build" ToolsVersion="15.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+   <ItemGroup Label="ProjectConfigurations">
++    <ProjectConfiguration Include="Debug|ARM64">
++      <Configuration>Debug</Configuration>
++      <Platform>ARM64</Platform>
++    </ProjectConfiguration>
+     <ProjectConfiguration Include="Debug|Win32">
+       <Configuration>Debug</Configuration>
+       <Platform>Win32</Platform>
+@@ -9,6 +13,10 @@
+       <Configuration>Debug</Configuration>
+       <Platform>x64</Platform>
+     </ProjectConfiguration>
++    <ProjectConfiguration Include="Release|ARM64">
++      <Configuration>Release</Configuration>
++      <Platform>ARM64</Platform>
++    </ProjectConfiguration>
+     <ProjectConfiguration Include="Release|Win32">
+       <Configuration>Release</Configuration>
+       <Platform>Win32</Platform>
+@@ -37,6 +45,12 @@
+     <WholeProgramOptimization>true</WholeProgramOptimization>
+     <PlatformToolset>v142</PlatformToolset>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" 
Label="Configuration">
++    <ConfigurationType>Application</ConfigurationType>
++    <CharacterSet>Unicode</CharacterSet>
++    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v142</PlatformToolset>
++  </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" 
Label="Configuration">
+     <ConfigurationType>Application</ConfigurationType>
+     <CharacterSet>Unicode</CharacterSet>
+@@ -47,6 +61,11 @@
+     <CharacterSet>Unicode</CharacterSet>
+     <PlatformToolset>v142</PlatformToolset>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" 
Label="Configuration">
++    <ConfigurationType>Application</ConfigurationType>
++    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v142</PlatformToolset>
++  </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+   <ImportGroup Label="ExtensionSettings">
+   </ImportGroup>
+@@ -56,12 +75,18 @@
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" 
Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+   </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" 
Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
++  </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" 
Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+   </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" 
Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+   </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" 
Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
++  </ImportGroup>
+   <PropertyGroup Label="UserMacros" />
+   <PropertyGroup>
+     <_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
+@@ -69,26 +94,36 @@
+     <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\bin\</OutDir>
+     <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)_$(Platform)\</IntDir>
+     <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)_$(Platform)\</IntDir>
++    <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(Configuration)_$(Platform)\</IntDir>
+     <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+     <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
++    <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</LinkIncremental>
+     <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\bin\</OutDir>
+     <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\bin\</OutDir>
+     <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)_$(Platform)\</IntDir>
+     <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)_$(Platform)\</IntDir>
++    <IntDir 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(Configuration)_$(Platform)\</IntDir>
+     <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+     <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
++    <LinkIncremental 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</LinkIncremental>
+     <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+     <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
++    <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">AllRules.ruleset</CodeAnalysisRuleSet>
+     <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+     <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
++    <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
+     <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+     <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
++    <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
+     <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+     <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
++    <CodeAnalysisRuleSet 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">AllRules.ruleset</CodeAnalysisRuleSet>
+     <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+     <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
++    <CodeAnalysisRules 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
+     <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+     <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
++    <CodeAnalysisRuleAssemblies 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
+   </PropertyGroup>
+   <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+     <ClCompile>
+@@ -128,6 +163,24 @@
+       <SubSystem>Console</SubSystem>
+     </Link>
+   </ItemDefinitionGroup>
++  <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
++    <ClCompile>
++      <Optimization>Disabled</Optimization>
++      
<AdditionalIncludeDirectories>../../../include;../../../utils/common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
++      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
++      <PrecompiledHeader>
++      </PrecompiledHeader>
++      <WarningLevel>Level4</WarningLevel>
++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++      <MultiProcessorCompilation>true</MultiProcessorCompilation>
++    </ClCompile>
++    <Link>
++      <GenerateDebugInformation>true</GenerateDebugInformation>
++      <SubSystem>Console</SubSystem>
++    </Link>
++  </ItemDefinitionGroup>
+   <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+     <ClCompile>
+       <Optimization>MaxSpeed</Optimization>
+@@ -175,6 +228,27 @@
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+     </Link>
+   </ItemDefinitionGroup>
++  <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
++    <ClCompile>
++      <Optimization>MaxSpeed</Optimization>
++      <IntrinsicFunctions>true</IntrinsicFunctions>
++      
<AdditionalIncludeDirectories>../../../include;../../../utils/common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
++      <FunctionLevelLinking>true</FunctionLevelLinking>
++      <PrecompiledHeader>
++      </PrecompiledHeader>
++      <WarningLevel>Level4</WarningLevel>
++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++      <MultiProcessorCompilation>true</MultiProcessorCompilation>
++    </ClCompile>
++    <Link>
++      <GenerateDebugInformation>true</GenerateDebugInformation>
++      <SubSystem>Console</SubSystem>
++      <OptimizeReferences>true</OptimizeReferences>
++      <EnableCOMDATFolding>true</EnableCOMDATFolding>
++    </Link>
++  </ItemDefinitionGroup>
+   <ItemGroup>
+     <ClCompile Include="..\..\..\utils\linkicc\linkicc.c" />
+     <ClCompile Include="..\..\..\utils\common\vprf.c" />
+diff -urbaN lcms2-2.11.orig/Projects/VC2019/psicc/psicc.vcxproj 
lcms2-2.11/Projects/VC2019/psicc/psicc.vcxproj
+--- lcms2-2.11.orig/Projects/VC2019/psicc/psicc.vcxproj        2020-06-16 
19:10:37.000000000 +0200
++++ lcms2-2.11/Projects/VC2019/psicc/psicc.vcxproj     2020-07-09 
18:28:38.421723648 +0200
+@@ -1,6 +1,10 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <Project DefaultTargets="Build" ToolsVersion="15.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+   <ItemGroup Label="ProjectConfigurations">
++    <ProjectConfiguration Include="Debug|ARM64">
++      <Configuration>Debug</Configuration>
++      <Platform>ARM64</Platform>
++    </ProjectConfiguration>
+     <ProjectConfiguration Include="Debug|Win32">
+       <Configuration>Debug</Configuration>
+       <Platform>Win32</Platform>
+@@ -9,6 +13,10 @@
+       <Configuration>Debug</Configuration>
+       <Platform>x64</Platform>
+     </ProjectConfiguration>
++    <ProjectConfiguration Include="Release|ARM64">
++      <Configuration>Release</Configuration>
++      <Platform>ARM64</Platform>
++    </ProjectConfiguration>
+     <ProjectConfiguration Include="Release|Win32">
+       <Configuration>Release</Configuration>
+       <Platform>Win32</Platform>
+@@ -37,6 +45,12 @@
+     <WholeProgramOptimization>true</WholeProgramOptimization>
+     <PlatformToolset>v142</PlatformToolset>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" 
Label="Configuration">
++    <ConfigurationType>Application</ConfigurationType>
++    <CharacterSet>Unicode</CharacterSet>
++    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v142</PlatformToolset>
++  </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" 
Label="Configuration">
+     <ConfigurationType>Application</ConfigurationType>
+     <CharacterSet>Unicode</CharacterSet>
+@@ -47,6 +61,11 @@
+     <CharacterSet>Unicode</CharacterSet>
+     <PlatformToolset>v142</PlatformToolset>
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" 
Label="Configuration">
++    <ConfigurationType>Application</ConfigurationType>
++    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v142</PlatformToolset>
++  </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+   <ImportGroup Label="ExtensionSettings">
+   </ImportGroup>
+@@ -56,12 +75,18 @@
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" 
Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+   </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" 
Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
++  </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" 
Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+   </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" 
Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+   </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" 
Label="PropertySheets">

... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits