[Libreoffice-commits] core.git: Branch 'private/jmux/win-arm64' - 398 commits - accessibility/inc accessibility/IwyuFilter_accessibility.yaml accessibility/source android/Bootstrap android/.gitignore android/source avmedia/IwyuFilter_avmedia.yaml avmedia/Library_avmediawin.mk avmedia/source basctl/inc basctl/IwyuFilter_basctl.yaml basegfx/CppunitTest_basegfx.mk basegfx/IwyuFilter_basegfx.yaml basegfx/source basegfx/test basic/inc basic/IwyuFilter_basic.yaml basic/source binaryurp/IwyuFilter_binaryurp.yaml bin/check-elf-dynamic-objects bin/check-implementer-notes.py bin/extract-tooltip.py bin/find-clang-format.py bin/find-duplicated-sids.py bin/find-german-comments bin/find-unneeded-includes bin/find-unused-defines.py bin/find-unused-sid-commands.py bin/find-unused-typedefs.py bin/gbuild-to-ide bin/get-bugzilla-attachments-by-mimetype bin/get_config_variables bin/gla11y bin/oss-fuzz-build.sh bin/sanitize-blacklist.txt bin/sanitize-excludelist.txt bin/symbolstore.py bin/symstore.sh bin/test-hid-vs- ui.py bin/update bin/update_pch bridges/Library_cpp_uno.mk bridges/source canvas/IwyuFilter_canvas.yaml canvas/source chart2/inc chart2/IwyuFilter_chart2.yaml chart2/qa chart2/source comphelper/inc comphelper/IwyuFilter_comphelper.yaml comphelper/source compilerplugins/clang config_host.mk.in configmgr/IwyuFilter_configmgr.yaml configure.ac connectivity/inc connectivity/IwyuFilter_connectivity.yaml connectivity/Library_calc.mk connectivity/Library_dbase.mk connectivity/Library_dbpool2.mk connectivity/Library_evoab.mk connectivity/Library_firebird_sdbc.mk connectivity/Library_flat.mk connectivity/Library_hsqldb.mk connectivity/Library_jdbc.mk connectivity/Library_macab1.mk connectivity/Library_mysql_jdbc.mk connectivity/Library_writer.mk connectivity/Module_connectivity.mk connectivity/source cppcanvas/inc cppcanvas/IwyuFilter_cppcanvas.yaml cppcanvas/source cppuhelper/inc cppuhelper/IwyuFilter_cppuhelper.yaml cppu/IwyuFilter_cppu.yaml cui/inc cui/IwyuFilter_cui.yaml cui/source cui/u iconfig dbaccess/inc dbaccess/IwyuFilter_dbaccess.yaml dbaccess/Library_dbaxml.mk dbaccess/Library_dbu.mk dbaccess/Library_sdbt.mk dbaccess/source dbaccess/util desktop/Executable_soffice_safe.mk desktop/inc desktop/IwyuFilter_desktop.yaml desktop/Library_deployment.mk desktop/Library_migrationoo2.mk desktop/Library_migrationoo3.mk desktop/Library_spl.mk desktop/Module_desktop.mk desktop/qa desktop/source desktop/win32 distro-configs/LibreOfficeWinArm64.conf download.lst drawinglayer/inc drawinglayer/IwyuFilter_drawinglayer.yaml drawinglayer/source dtrans/Library_mcnttype.mk dtrans/source dtrans/util editeng/IwyuFilter_editeng.yaml editeng/README editeng/source embeddedobj/IwyuFilter_embeddedobj.yaml emfio/inc emfio/IwyuFilter_emfio.yaml emfio/qa eventattacher/source extensions/IwyuFilter_extensions.yaml extensions/source external/curl external/gpgmepp external/icu external/lcms2 external/libffi external/libgpg-error external/libjpeg-turbo external/nss external/openssl external/pdfi um external/postgresql external/python3 external/skia extras/CustomTarget_gallsystem.mk extras/Module_extras.mk extras/Package_gallsystem.mk extras/Package_gallsystemstr.mk extras/source filter/IwyuFilter_filter.yaml filter/Library_graphicfilter.mk filter/Library_msfilter.mk filter/Library_pdffilter.mk filter/Library_storagefd.mk filter/Library_t602filter.mk filter/Library_xmlfa.mk filter/Library_xmlfd.mk filter/Module_filter.mk filter/qa filter/source forms/inc forms/IwyuFilter_forms.yaml forms/source fpicker/Library_fps_aqua.mk fpicker/Library_fps_office.mk fpicker/source framework/inc framework/IwyuFilter_framework.yaml framework/Library_fwk.mk framework/source framework/util .git-hooks/pre-commit helpcompiler/IwyuFilter_helpcompiler.yaml helpcontent2 hwpfilter/source i18npool/IwyuFilter_i18npool.yaml i18npool/source 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/sukapura icon-themes/sukapura_svg include/basegfx include/canvas include/codemaker include/comphelper include/connectivity include/drawinglayer include/editeng include/filter include/formula include/framework include/IwyuFilter_include.yaml include/LibreOfficeKit include/onlineupdate include/oox include/opencl include/osl include/sax include/sfx2 include/svtools include/svx include/toolkit include/ucbhelper include/vcl io/IwyuFilter_io.yaml io/Library_io.mk io/source javaunohelper/IwyuFilter_javaunohelper.yaml jvmaccess/IwyuFilter_jvmaccess.yaml jvmfwk/IwyuFilter_jvmfwk.yaml librelogo/source libreofficekit/qa lingucomponent/source linguistic/IwyuFilter_linguistic.yaml linguistic/Library_lng.mk linguistic/source lotuswordpro/inc lotuswordpro/IwyuFilter_lotuswordpro.yaml Makefile.gbuild Makefile.in offapi/com offapi/util officecfg/registry oox/inc oox/IwyuFilter_oox.yaml oox/qa oox/README oox/source opencl/IwyuFilter_opencl.yaml opencl/source package/inc package/Library_package2.mk package/source package/util postprocess/CustomTarget_registry.mk postprocess/qa postprocess/Rdb_services.mk pyuno/IwyuFilter_pyuno.yaml pyuno/source qadevOOo/tests registry/IwyuFilter_registry.yaml remotebridges/source reportdesign/inc reportdesign/IwyuFilter_reportdesign.yaml RepositoryExternal.mk Repository.mk RepositoryModule_build.mk sanitize-ubsan-blacklist sanitize-ubsan-excludelist scaddins/IwyuFilter_scaddins.yaml sccomp/IwyuFilter_sccomp.yaml sc/inc sc/IwyuFilter_sc.yaml sc/qa scripting/IwyuFilter_scripting.yaml scripting/source scripting/util sc/sdi sc/source sc/uiconfig sc/UIConfig_scalc.mk sdext/inc sdext/IwyuFilter_sdext.yaml sdext/Library_pdfimport.mk sdext/Library_PresentationMinimizer.mk sdext/Library_PresenterScreen.mk sdext/source sd/inc sd/IwyuFilter_sd.yaml sd/qa sd/sdi sd/source setup_native/source sfx2/inc sfx2/IwyuFilter_sfx2.yaml sfx2/source sfx2/uiconfig shell/IwyuFilter_she ll.yaml shell/Library_cmdmail.mk shell/Library_localebe.mk shell/Library_losessioninstall.mk shell/Library_macbe.mk shell/Library_syssh.mk shell/Module_shell.mk shell/source slideshow/inc slideshow/IwyuFilter_slideshow.yaml slideshow/source slideshow/util solenv/bin solenv/clang-format solenv/gbuild solenv/gcc-wrappers solenv/gdb solenv/sanitizers sot/inc sot/IwyuFilter_sot.yaml starmath/inc starmath/IwyuFilter_starmath.yaml stoc/IwyuFilter_stoc.yaml stoc/source store/IwyuFilter_store.yaml svgio/inc svgio/Library_svgio.mk svgio/qa svgio/source svgio/svgio.component svl/inc svl/IwyuFilter_svl.yaml svl/source svtools/inc svtools/IwyuFilter_svtools.yaml svtools/Library_svt.mk svtools/source svtools/uiconfig svtools/UIConfig_svt.mk svx/inc svx/IwyuFilter_svx.yaml svx/Library_textconversiondlgs.mk svx/Module_svx.mk svx/qa svx/sdi svx/source svx/uiconfig svx/UIConfig_svx.mk svx/util sw/CppunitTest_sw_ooxmlexport4.mk sw/inc sw/IwyuFilter_sw.yaml sw/qa sw/source sw/uiconfig test/IwyuFilter_ test.yaml test/source toolkit/inc toolkit/IwyuFilter_toolkit.yaml toolkit/source tools/IwyuFilter_tools.yaml translations ucbhelper/IwyuFilter_ucbhelper.yaml ucb/IwyuFilter_ucb.yaml ucb/Library_cached1.mk ucb/Library_ucphier1.mk ucb/Library_ucptdoc1.mk ucb/source UnoControls/IwyuFilter_UnoControls.yaml unoidl/IwyuFilter_unoidl.yaml unotest/Module_unotest.mk unotools/inc unotools/IwyuFilter_unotools.yaml unotools/Library_utl.mk unotools/source unotools/util unoxml/inc unoxml/IwyuFilter_unoxml.yaml unoxml/Library_unordf.mk unoxml/Library_unoxml.mk unoxml/Module_unoxml.mk unoxml/source uui/inc uui/IwyuFilter_uui.yaml uui/Library_uui.mk uui/source uui/util vbahelper/inc vbahelper/IwyuFilter_vbahelper.yaml vbahelper/Library_msforms.mk vbahelper/source vbahelper/util vcl/backendtest vcl/headless vcl/inc vcl/IwyuFilter_vcl.yaml vcl/jsdialog vcl/Library_vcl.mk vcl/Module_vcl.mk vcl/opengl vcl/osx vcl/Package_opengl_blacklist.mk vcl/Package_opengl_denylist.mk vcl/Package_skia_blacklist.mk vc l/Package_skia_denylist.mk vcl/qa vcl/README.vars vcl/skia vcl/source vcl/unx vcl/workben winaccessibility/source writerfilter/inc writerfilter/IwyuFilter_writerfilter.yaml writerfilter/source writerperfect/IwyuFilter_writerperfect.yaml xmlhelp/IwyuFilter_xmlhelp.yaml xmloff/inc xmloff/IwyuFilter_xmloff.yaml xmloff/Module_xmloff.mk xmloff/source xmloff/util xmlsecurity/inc xmlsecurity/IwyuFilter_xmlsecurity.yaml xmlsecurity/source

Fri, 17 Jul 2020 19:16:27 -0700 

Rebased ref, commits from common ancestor:
commit 72b6586373065b28330d4f74fb2f19757b329c5e
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Sat Jul 18 04:01:32 2020 +0200
Commit:     Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Sat Jul 18 04:12:17 2020 +0200

    Add my current Windows Arm64 build config
    
    Change-Id: I762049d34e6a00fec0960395f94d6537047f6061

diff --git a/distro-configs/LibreOfficeWinArm64.conf 
b/distro-configs/LibreOfficeWinArm64.conf
new file mode 100644
index 000000000000..05a526a8786f
--- /dev/null
+++ b/distro-configs/LibreOfficeWinArm64.conf
@@ -0,0 +1,25 @@
+--host=aarch64-pc-cygwin
+--disable-ccache
+--disable-coinmp
+--disable-ext-nlpsolver
+--disable-ext-wiki-publisher
+--disable-firebird-sdbc
+--disable-gpgmepp
+--disable-odk
+--disable-online-update
+--disable-skia
+--disable-werror
+--enable-assert-always-abort
+--enable-debug
+--enable-extension-integration
+--enable-pch
+--enable-scripting-beanshell
+--enable-scripting-javascript
+--with-ant-home=/cygdrive/c/lode/packages/apache-ant-1.9.4
+--with-jdk-home=/cygdrive/c/Program Files/Java/jdk-14.0.1 
+--with-junit=/cygdrive/c/lode/opt/share/java/junit.jar
+--with-theme=colibre colibre_svg
+--without-doxygen
+--without-help
+--without-helppack-integration
+--without-java
commit 91305ab2225050e3f2210c59c5c7e7113ad93fcb
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Sat Jul 18 04:00:51 2020 +0200
Commit:     Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Sat Jul 18 04:12:16 2020 +0200

    gbuild WIN: add and apply default msbuild platform and config
    
    Adds three Windows gb_* variables:
    
    - gb_MSBUILD_CONFIG_AND_PLATFORM can be passed as msbuild flags
    - gb_MSBUILD_PLATFORM maps debug / release settings
    - gb_MSBUILD_CONFIG maps the CPUTYPE to the default msbuild names
    
    and converts users, like python3 and lcms2.
    
    Change-Id: I4c24d912cfcd2b616c5fdd050af8e24786d16bd3

diff --git a/external/lcms2/ExternalProject_lcms2.mk 
b/external/lcms2/ExternalProject_lcms2.mk
index 6c30d6958f89..4bed4a5b705d 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -14,15 +14,13 @@ $(eval $(call gb_ExternalProject_register_targets,lcms2,\
 ))
 
 ifeq ($(COM),MSC)
-
 $(call gb_ExternalProject_get_state_target,lcms2,build):
        $(call gb_Trace_StartRange,lcms2,EXTERNAL)
        $(call gb_ExternalProject_run,build,\
                MSBuild.exe lcms2_DLL.vcxproj \
+                       $(gb_MSBUILD_CONFIG_AND_PLATFORM) /p:TargetName=lcms2 \
                        $(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 
/p:VisualStudioVersion=16.0 /ToolsVersion:Current) \
                        $(if $(filter 
10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
-                       /p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
-                       /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) 
/p:TargetName=lcms2 \
        ,Projects/VC2019/lcms2_DLL)
        $(call gb_Trace_EndRange,lcms2,EXTERNAL)
 else
diff --git a/external/python3/ExternalProject_python3.mk 
b/external/python3/ExternalProject_python3.mk
index 2bc7d86c0678..ad110bbbc817 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -30,20 +30,12 @@ ifeq ($(OS),WNT)
 
 # TODO: using Debug configuration and related mangling of pyconfig.h
 
-python3_WIN_PLATFORM_MSBUILD := $(strip \
-       $(if $(filter INTEL,$(CPUNAME)),Win32) \
-       $(if $(filter X86_64,$(CPUNAME)),x64) \
-       $(if $(filter ARM64,$(CPUNAME)),arm64) \
-       )
-
 # at least for MSVC 2008 it is necessary to clear MAKEFLAGS because
 # nmake is invoked
 $(call gb_ExternalProject_get_state_target,python3,build) :
        $(call gb_Trace_StartRange,python3,EXTERNAL)
        $(call gb_ExternalProject_run,build,\
-               MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build \
-                       /p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
-                       /p:Platform=$(python3_WIN_PLATFORM_MSBUILD) \
+               MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build 
$(gb_MSBUILD_CONFIG_AND_PLATFORM) \
                        /p:opensslIncludeDir=$(call 
gb_UnpackedTarball_get_dir,openssl)/include \
                        /p:opensslOutDir=$(call 
gb_UnpackedTarball_get_dir,openssl) \
                        /p:zlibDir=$(call gb_UnpackedTarball_get_dir,zlib) \
diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index b2de9e2a993d..9de71c1bf5ae 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -42,4 +42,16 @@ gb_Executable_LAYER := \
 # empty to avoid --warn-undefined-functions
 gb_Library__set_soversion_script_platform =
 
+# default platform and configuration values used by msbuild
+gb_MSBUILD_CONFIG := $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)
+gb_MSBUILD_PLATFORM := $(strip \
+       $(if $(filter INTEL,$(CPUNAME)),Win32) \
+       $(if $(filter X86_64,$(CPUNAME)),x64) \
+       $(if $(filter ARM64,$(CPUNAME)),ARM64) \
+       )
+
+gb_MSBUILD_CONFIG_AND_PLATFORM := \
+       /p:Configuration=$(gb_MSBUILD_CONFIG) \
+       /p:Platform=$(gb_MSBUILD_PLATFORM)
+
 # vim:set noexpandtab:
commit 46363b53ca320de0b5f9bfde06ae559f56d42292
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Fri Jul 17 22:16:56 2020 +0200
Commit:     Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Sat Jul 18 04:12:16 2020 +0200

    gpg: currently broken
    
    libgpg-error tries to build a build tool during the host build.
    This would requires two independent wrappers for the native and
    the host compilers, so the wrappers env variable is made
    configurable.
    
    But the tool also needs the build libraries, which is a whole
    new problem.
    
    Change-Id: I4dbae907f78962be004eac77040a54f875375dbb

diff --git a/config_host.mk.in b/config_host.mk.in
index f0383acb318d..05ba2a2f93dc 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -63,6 +63,7 @@ export BZIP2_LIBS=$(gb_SPACE)@BZIP2_LIBS@
 export CAIRO_CFLAGS=$(gb_SPACE)@CAIRO_CFLAGS@
 export CAIRO_LIBS=$(gb_SPACE)@CAIRO_LIBS@
 export CC=@CC@
+export CC_FOR_BUILD=@CC_FOR_BUILD@
 export CCACHE_DEPEND_MODE=@CCACHE_DEPEND_MODE@
 export CDR_CFLAGS=$(gb_SPACE)@CDR_CFLAGS@
 export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@
@@ -120,6 +121,7 @@ export CXXFLAGS_INTRINSICS_AVX=@CXXFLAGS_INTRINSICS_AVX@
 export CXXFLAGS_INTRINSICS_AVX2=@CXXFLAGS_INTRINSICS_AVX2@
 export CXXFLAGS_INTRINSICS_F16C=@CXXFLAGS_INTRINSICS_F16C@
 export CXXFLAGS_INTRINSICS_FMA=@CXXFLAGS_INTRINSICS_FMA@
+export CXX_FOR_BUILD=@CXX_FOR_BUILD@
 export DATADIR=@DATADIR@
 export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
 export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
diff --git a/configure.ac b/configure.ac
index c80a4ab66ae0..d160fba64980 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5028,6 +5028,8 @@ AC_SUBST(LIBO_URE_LIB_FOLDER_FOR_BUILD)
 AC_SUBST(LIBO_URE_MISC_FOLDER_FOR_BUILD)
 AC_SUBST(SDKDIRNAME_FOR_BUILD)
 AC_SUBST(WORKDIR_FOR_BUILD)
+AC_SUBST(CC_FOR_BUILD)
+AC_SUBST(CXX_FOR_BUILD)
 
 dnl ===================================================================
 dnl Check for syslog header
diff --git a/external/gpgmepp/ExternalPackage_gpgmepp.mk 
b/external/gpgmepp/ExternalPackage_gpgmepp.mk
index f8d19f39a067..a69eba84b32b 100644
--- a/external/gpgmepp/ExternalPackage_gpgmepp.mk
+++ b/external/gpgmepp/ExternalPackage_gpgmepp.mk
@@ -27,8 +27,10 @@ else ifeq ($(OS),WNT)
 
 $(eval $(call 
gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/gpgme-w32spawn.exe,src/gpgme-w32spawn.exe))
 
+ifeq (,$(CROSS_COMPILING))
 $(call gb_Package_get_target_for_build,gpgmepp):
        cp $(call gb_UnpackedTarball_get_dir,gpgmepp)/src/gpgme-w32spawn.exe 
$(call gb_Executable__get_dir_for_exe,cppunittester)/gpgme-w32spawn.exe
+endif
 
 endif
 
diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk 
b/external/libgpg-error/ExternalProject_libgpg-error.mk
index cf0b594dca24..914e4f8fc286 100644
--- a/external/libgpg-error/ExternalProject_libgpg-error.mk
+++ b/external/libgpg-error/ExternalProject_libgpg-error.mk
@@ -17,8 +17,8 @@ $(eval $(call 
gb_ExternalProject_use_autoconf,libgpg-error,build))
 
 ifeq ($(COM),MSC)
 gb_ExternalProject_libgpg-error_host := $(if $(filter 
INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32)
-gb_ExternalProject_libgpg-error_target := $(if $(filter 
INTEL,$(CPUNAME)),pe-i386,pe-x86-64)
-$(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call 
gb_Executable_get_target,cpp)
+gb_ExternalProject_libgpg-error_target := $(if $(filter 
INTEL,$(CPUNAME)),pe-i386,$(if $(filter ARM64,$(CPUNAME)),pe-arm64,pe-x86-64))
+$(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call 
gb_Executable_get_target_for_build,cpp)
        $(call gb_Trace_StartRange,libgpg-error,EXTERNAL)
        $(call gb_ExternalProject_run,build,\
                MAKE=$(MAKE) ./configure \
@@ -28,8 +28,14 @@ $(call 
gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Execut
                        --disable-languages \
                        --disable-doc \
                        --disable-tests \
-                       --host=$(gb_ExternalProject_libgpg-error_host) \
-                       RC='windres -O COFF 
--target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call 
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
+                       $(if $(CROSS_COMPILING), \
+                   --build=$(BUILD_PLATFORM) \
+                               --host=$(HOST_PLATFORM) \
+                               REAL_BUILD_CC="$(CC_FOR_BUILD)" \
+                               CC_FOR_BUILD="$(call 
gb_Executable_get_target_for_build,gcc-wrapper) 
--wrapper-env-prefix=REAL_BUILD_ $(SOLARINC)" \
+                       , \
+                   --host=$(gb_ExternalProject_libgpg-error_host)) \
+                       RC='windres -O COFF 
--target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call 
gb_Executable_get_target_for_build,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 
$(SOLARINC)'\' \
            && $(MAKE) \
        )
        $(call gb_Trace_EndRange,libgpg-error,EXTERNAL)
diff --git a/solenv/gcc-wrappers/g++.cxx b/solenv/gcc-wrappers/g++.cxx
index 626b1643590c..1021df3b81d2 100644
--- a/solenv/gcc-wrappers/g++.cxx
+++ b/solenv/gcc-wrappers/g++.cxx
@@ -9,14 +9,16 @@
 
 #include "wrapper.hxx"
 
-int main(int argc, char *argv[]) {
+int main(int argc, char *argv[])
+{
     vector<string> rawargs(argv + 1, argv + argc);
 
-    string command=getexe("REAL_CXX");
-    string flags=getexe("REAL_CXX_FLAGS", true);
+    string env_prefix; // defaults to REAL_
+    string args = processccargs(rawargs, env_prefix);
 
-    string args=flags.empty() ? string() : flags + " ";
-    args += processccargs(rawargs);
+    string command = getexe(env_prefix + "CXX");
+    string flags = getexe(env_prefix + "CXX_FLAGS", true);
+    args.insert(0, flags.empty() ? string() : flags + " ");
 
     setupccenv();
 
diff --git a/solenv/gcc-wrappers/gcc.cxx b/solenv/gcc-wrappers/gcc.cxx
index f34c2dba8c99..2612493ad0b5 100644
--- a/solenv/gcc-wrappers/gcc.cxx
+++ b/solenv/gcc-wrappers/gcc.cxx
@@ -9,14 +9,16 @@
 
 #include "wrapper.hxx"
 
-int main(int argc, char *argv[]) {
+int main(int argc, char *argv[])
+{
     vector<string> rawargs(argv + 1, argv + argc);
 
-    string command=getexe("REAL_CC");
-    string flags=getexe("REAL_CC_FLAGS", true);
+    string env_prefix; // defaults to REAL_
+    string args = processccargs(rawargs, env_prefix);
 
-    string args=flags.empty() ? string() : flags + " ";
-    args += processccargs(rawargs);
+    string command = getexe(env_prefix + "CC");
+    string flags = getexe(env_prefix + "CC_FLAGS", true);
+    args.insert(0, flags.empty() ? string() : flags + " ");
 
     setupccenv();
 
diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
old mode 100644
new mode 100755
index b156c89dc220..f43b900948cc
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -82,7 +82,12 @@ void setupccenv() {
     }
 }
 
-string processccargs(vector<string> rawargs) {
+string processccargs(vector<string> rawargs, string &env_prefix)
+{
+    // default env var prefix
+    env_prefix = "REAL_";
+    bool env_prefix_next_arg = false;
+
     // suppress the msvc banner
     string args=" -nologo";
     // TODO: should these options be enabled globally?
@@ -101,6 +106,13 @@ string processccargs(vector<string> rawargs) {
     string linkargs(" -link -debug");
 
     for(vector<string>::iterator i = rawargs.begin(); i != rawargs.end(); ++i) 
{
+        if (env_prefix_next_arg)
+        {
+            env_prefix = *i;
+            env_prefix_next_arg = false;
+            continue;
+        }
+
         args.append(" ");
         if(*i == "-o") {
             // TODO: handle more than just exe output
@@ -121,10 +133,15 @@ string processccargs(vector<string> rawargs) {
                 linkargs.append(" -dll -out:");
                 linkargs.append(*i);
             }
+            else if (dot == string::npos)
+            {
+                args.append("-Fe");
+                args.append(*i + ".exe");
+            }
             else
             {
                 cerr << "unknown -o argument - please adapt gcc-wrapper for \""
-                     << (*i) << "\"";
+                     << (*i) << "\"" << endl;
                 exit(1);
             }
         }
@@ -160,8 +177,32 @@ string processccargs(vector<string> rawargs) {
         else if(*i == "-Werror")
             args.append("-WX");
         else
-            args.append(*i);
+        {
+            size_t pos = i->find("=");
+            if (0 == i->compare(0, pos, "--wrapper-env-prefix"))
+            {
+                if (pos == string::npos)
+                    env_prefix_next_arg = true;
+                else if (pos + 1 == i->length())
+                {
+                    // bailout - missing arg
+                    env_prefix_next_arg = true;
+                    break;
+                }
+                else
+                    env_prefix = i->substr(pos + 1);
+            }
+            else
+                args.append(*i);
+        }
     }
+
+    if (env_prefix_next_arg)
+    {
+        cerr << "wrapper-env-prefix needs an argument!" << endl;
+        exit(1);
+    }
+
     args.append(linkargs);
     return args;
 }
diff --git a/solenv/gcc-wrappers/wrapper.hxx b/solenv/gcc-wrappers/wrapper.hxx
index 789bc9280267..20fbfbdee31a 100644
--- a/solenv/gcc-wrappers/wrapper.hxx
+++ b/solenv/gcc-wrappers/wrapper.hxx
@@ -20,7 +20,7 @@ string getexe(string exename, bool maybeempty = false);
 
 void setupccenv();
 
-string processccargs(vector<string> rawargs);
+string processccargs(vector<string> rawargs, string &env_prefix);
 
 int startprocess(string command, string args);
 
commit b109bf14f2c9a05c60f89315326ec994971119b6
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Sat Jul 18 04:00:00 2020 +0200
Commit:     Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Sat Jul 18 04:12:16 2020 +0200

    libjpeg-turbo: fix Windows Arm64 build
    
    Change-Id: Iae4696df714ba27c0053f7ca3eb485816e8e58c7

diff --git a/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk 
b/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
index a6c8f0d77a2f..a5cd4c57ddc7 100644
--- a/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
+++ b/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
@@ -28,8 +28,8 @@ $(call 
gb_ExternalProject_get_state_target,libjpeg-turbo,configure) :
        $(call gb_Trace_StartRange,libjpeg-turbo,EXTERNAL)
        $(call gb_ExternalProject_run,configure,\
                MAKE=$(MAKE) ./configure \
-                       --build=$(if $(filter WNT,$(OS)),$(if $(filter 
INTEL,$(CPUNAME)),i686-pc-cygwin,x86_64-pc-cygwin),$(BUILD_PLATFORM)) \
-                       --host=$(if $(filter WNT,$(OS)),$(if $(filter 
INTEL,$(CPUNAME)),i686-pc-cygwin,x86_64-pc-cygwin),$(HOST_PLATFORM)) \
+                       --build=$(BUILD_PLATFORM) \
+                       --host=$(HOST_PLATFORM) \
                        --with-pic \
                        --enable-static \
                        --disable-shared \
commit af44b697b1a9f1484aeacdf7fac48a99a7105310
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Sat Jul 18 03:59:24 2020 +0200
Commit:     Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Sat Jul 18 04:12:16 2020 +0200

    curl: fix Windows Arm64 build
    
    Change-Id: Id238e2b04a3c6dda4f1a97cf20154b44c1d689b5

diff --git a/external/curl/ExternalPackage_curl.mk 
b/external/curl/ExternalPackage_curl.mk
index 8da569e3e0cf..79a89a24a52c 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -14,7 +14,7 @@ $(eval $(call 
gb_ExternalPackage_use_external_project,curl,curl))
 ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).dll,builds/libcurl-vc12-$(if $(filter 
X86_64,$(CPUNAME)),x64,x86)-$(if 
$(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-winssl/bin/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).dll))
+$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).dll,builds/libcurl-vc12-$(gb_MSBUILD_PLATFORM)-$(gb_MSBUILD_CONFIG)-dll-ipv6-sspi-winssl/bin/libcurl$(if
 $(MSVC_USE_DEBUG_RUNTIME),_debug).dll))
 else ifeq ($(OS),MACOSX)
 $(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dylib,lib/.libs/libcurl.4.dylib))
 else ifeq ($(OS),AIX)
diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index f6eb073f5d39..138b50afd0e0 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -81,7 +81,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
                nmake -f Makefile.vc \
                        mode=dll \
                        VC=12 \
-                       $(if $(filter 
X86_64,$(CPUNAME)),MACHINE=x64,MACHINE=x86) \
+                       MACHINE=$(gb_MSBUILD_PLATFORM) \
                        GEN_PDB=$(if $(call 
gb_Module__symbols_enabled,curl),yes,no) \
                        DEBUG=$(if $(MSVC_USE_DEBUG_RUNTIME),yes,no) \
                        ENABLE_IPV6=yes \
commit 649b210bb8216de701b1dd50ec3568d49e6a6954
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Sat Jul 18 03:58:37 2020 +0200
Commit:     Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Sat Jul 18 04:12:16 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 5c9852b821ce5b6c82a1861e766608919e2d0552
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Sat Jul 18 03:57:58 2020 +0200
Commit:     Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Sat Jul 18 04:12:16 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">
++    <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>MultiThreadedDebugDLL</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>MultiThreaded</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\psicc\psicc.c" />
+     <ClCompile Include="..\..\..\utils\common\vprf.c" />
+diff -urbaN lcms2-2.11.orig/Projects/VC2019/testbed/testbed.vcxproj 
lcms2-2.11/Projects/VC2019/testbed/testbed.vcxproj
+--- lcms2-2.11.orig/Projects/VC2019/testbed/testbed.vcxproj    2020-06-16 
19:10:37.000000000 +0200
++++ lcms2-2.11/Projects/VC2019/testbed/testbed.vcxproj 2020-07-09 
18:28:38.577722478 +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,37 +75,53 @@
+   <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>
+     <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'">..\..\..\testbed\</OutDir>
+     <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\testbed\</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'" />
+     <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\testbed\</OutDir>
+     <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\testbed\</OutDir>
+   </PropertyGroup>
+@@ -130,6 +165,25 @@
+       <Profile>false</Profile>
+     </Link>
+   </ItemDefinitionGroup>
++  <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
++    <ClCompile>
++      <Optimization>Disabled</Optimization>
++      
<AdditionalIncludeDirectories>../../../include;../../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
++      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
++      <PrecompiledHeader>
++      </PrecompiledHeader>
++      <WarningLevel>Level3</WarningLevel>
++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++      <MultiProcessorCompilation>true</MultiProcessorCompilation>
++    </ClCompile>
++    <Link>
++      <GenerateDebugInformation>true</GenerateDebugInformation>
++      <SubSystem>Console</SubSystem>
++      <Profile>false</Profile>
++    </Link>
++  </ItemDefinitionGroup>
+   <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+     <ClCompile>
+       <Optimization>Full</Optimization>
+@@ -191,6 +245,34 @@
+       <Profile>false</Profile>
+     </Link>
+   </ItemDefinitionGroup>
++  <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
++    <ClCompile>
++      <Optimization>Full</Optimization>
++      <IntrinsicFunctions>true</IntrinsicFunctions>
++      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
++      <OmitFramePointers>true</OmitFramePointers>
++      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
++      
<AdditionalIncludeDirectories>../../../include;../../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
++      <BufferSecurityCheck>false</BufferSecurityCheck>
++      <FunctionLevelLinking>true</FunctionLevelLinking>
++      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
++      <PrecompiledHeader>
++      </PrecompiledHeader>
++      <WarningLevel>Level3</WarningLevel>
++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++      <CallingConvention>Cdecl</CallingConvention>
++      <MultiProcessorCompilation>true</MultiProcessorCompilation>
++    </ClCompile>
++    <Link>
++      <GenerateDebugInformation>true</GenerateDebugInformation>
++      <SubSystem>Console</SubSystem>
++      <OptimizeReferences>true</OptimizeReferences>
++      <EnableCOMDATFolding>true</EnableCOMDATFolding>
++      <Profile>false</Profile>
++    </Link>
++  </ItemDefinitionGroup>
+   <ItemGroup>
+     <ProjectReference Include="..\lcms2_static\lcms2_static.vcxproj">
+       <Project>{71dede59-3f1e-486b-a899-4283000f76b5}</Project>
+diff -urbaN lcms2-2.11.orig/Projects/VC2019/tiffdiff/tiffdiff.vcxproj 
lcms2-2.11/Projects/VC2019/tiffdiff/tiffdiff.vcxproj
+--- lcms2-2.11.orig/Projects/VC2019/tiffdiff/tiffdiff.vcxproj  2020-06-16 
19:10:37.000000000 +0200
++++ lcms2-2.11/Projects/VC2019/tiffdiff/tiffdiff.vcxproj       2020-07-09 
18:28:38.701721548 +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,34 +94,48 @@
+     <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'" />
+     <IncludePath 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\jpeg-8d;c:\tiff-4.0.2\libtiff;$(IncludePath)</IncludePath>
+     <IncludePath 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\jpeg-8d;c:\tiff-4.0.2\libtiff;$(IncludePath)</IncludePath>
++    <IncludePath 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">C:\jpeg-8d;c:\tiff-4.0.2\libtiff;$(IncludePath)</IncludePath>
+     <LibraryPath 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\jpeg-8d;C:\tiff-4.0.2\libtiff;$(LibraryPath)</LibraryPath>
+     <LibraryPath 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\jpeg-8d;C:\tiff-4.0.2\libtiff;$(LibraryPath)</LibraryPath>
++    <LibraryPath 
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">C:\jpeg-8d;C:\tiff-4.0.2\libtiff;$(LibraryPath)</LibraryPath>
+     <IncludePath 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\jpeg-8d;c:\tiff-4.0.2\libtiff;$(IncludePath)</IncludePath>
+     <IncludePath 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\jpeg-8d;c:\tiff-4.0.2\libtiff;$(IncludePath)</IncludePath>
++    <IncludePath 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">C:\jpeg-8d;c:\tiff-4.0.2\libtiff;$(IncludePath)</IncludePath>
+     <LibraryPath 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\jpeg-8d;C:\tiff-4.0.2\libtiff;$(LibraryPath)</LibraryPath>
+     <LibraryPath 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\jpeg-8d;C:\tiff-4.0.2\libtiff;$(LibraryPath)</LibraryPath>
++    <LibraryPath 
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">C:\jpeg-8d;C:\tiff-4.0.2\libtiff;$(LibraryPath)</LibraryPath>
+   </PropertyGroup>
+   <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+     <ClCompile>
+@@ -140,6 +179,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>MultiThreadedDebug</RuntimeLibrary>
++      <PrecompiledHeader>
++      </PrecompiledHeader>
++      <WarningLevel>Level4</WarningLevel>
++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++      <MultiProcessorCompilation>true</MultiProcessorCompilation>
++    </ClCompile>
++    <Link>
++      
<AdditionalDependencies>libtiff.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <GenerateDebugInformation>true</GenerateDebugInformation>
++      <SubSystem>Console</SubSystem>
++      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
++    </Link>
++  </ItemDefinitionGroup>
+   <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+     <ClCompile>
+       <Optimization>MaxSpeed</Optimization>
+@@ -193,6 +252,30 @@
+       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+     </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>
++      
<AdditionalDependencies>libtiff.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <GenerateDebugInformation>true</GenerateDebugInformation>
++      <SubSystem>Console</SubSystem>
++      <OptimizeReferences>true</OptimizeReferences>
++      <EnableCOMDATFolding>true</EnableCOMDATFolding>
++      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
++      <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/tifficc/tifficc.vcxproj 
lcms2-2.11/Projects/VC2019/tifficc/tifficc.vcxproj
+--- lcms2-2.11.orig/Projects/VC2019/tifficc/tifficc.vcxproj    2020-06-16 
19:10:37.000000000 +0200
++++ lcms2-2.11/Projects/VC2019/tifficc/tifficc.vcxproj 2020-07-09 
18:28:38.821720648 +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')" />

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

Reply via email to