From ed5640d8b587fbcfed7dd7967f3de04b37a76f26 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 11:06:44 +0200 Subject: Adding upstream version 4:7.4.7. Signed-off-by: Daniel Baumann --- external/lcms2/ExternalPackage_lcms2.mk | 28 + external/lcms2/ExternalProject_lcms2.mk | 46 + external/lcms2/Makefile | 7 + external/lcms2/Module_lcms2.mk | 18 + external/lcms2/README | 3 + external/lcms2/UnpackedTarball_lcms2.mk | 27 + external/lcms2/c++17.patch.1 | 13 + external/lcms2/lcms2-2.4-windows.patch | 20 + external/lcms2/lcms2-win-arm64.patch.1 | 1537 +++++++++++++++++++++++++++++++ external/lcms2/lcms2_sln | Bin 0 -> 27136 bytes 10 files changed, 1699 insertions(+) create mode 100644 external/lcms2/ExternalPackage_lcms2.mk create mode 100644 external/lcms2/ExternalProject_lcms2.mk create mode 100644 external/lcms2/Makefile create mode 100644 external/lcms2/Module_lcms2.mk create mode 100644 external/lcms2/README create mode 100644 external/lcms2/UnpackedTarball_lcms2.mk create mode 100644 external/lcms2/c++17.patch.1 create mode 100644 external/lcms2/lcms2-2.4-windows.patch create mode 100644 external/lcms2/lcms2-win-arm64.patch.1 create mode 100644 external/lcms2/lcms2_sln (limited to 'external/lcms2') diff --git a/external/lcms2/ExternalPackage_lcms2.mk b/external/lcms2/ExternalPackage_lcms2.mk new file mode 100644 index 000000000..ede9e66ac --- /dev/null +++ b/external/lcms2/ExternalPackage_lcms2.mk @@ -0,0 +1,28 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,lcms2,lcms2)) + +$(eval $(call gb_ExternalPackage_use_external_project,lcms2,lcms2)) + +ifeq ($(DISABLE_DYNLOADING),) +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.2.dylib,src/.libs/liblcms2.2.dylib)) +else ifeq ($(OS),WNT) +ifeq ($(COM),GCC) +$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2-2.dll,src/.libs/liblcms2-2.dll)) +else ifeq ($(COM),MSC) +$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/lcms2.dll,bin/lcms2.dll)) +endif # $(COM) +else # $(OS) != WNT/MACOSX +$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.12)) +endif # $(OS) +endif # $(DISABLE_DYNLOADING) + +# vim: set noet sw=4 ts=4: diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk new file mode 100644 index 000000000..47d9089dc --- /dev/null +++ b/external/lcms2/ExternalProject_lcms2.mk @@ -0,0 +1,46 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalProject_ExternalProject,lcms2)) + +$(eval $(call gb_ExternalProject_register_targets,lcms2,\ + build \ +)) + +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 \ + /p:PlatformToolset=$(VCTOOLSET) /p:VisualStudioVersion=$(VCVER) /ToolsVersion:Current \ + $(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \ + ,Projects/VC2019/lcms2_DLL) + $(call gb_Trace_EndRange,lcms2,EXTERNAL) +else +$(call gb_ExternalProject_get_state_target,lcms2,build): + $(call gb_Trace_StartRange,lcms2,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(gb_RUN_CONFIGURE) ./configure --without-jpeg --without-tiff --with-pic \ + $(gb_CONFIGURE_PLATFORMS) \ + $(if $(CROSS_COMPILING),$(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \ + CPPFLAGS=" $(SOLARINC)" \ + CFLAGS='$(CFLAGS) $(call gb_ExternalProject_get_build_flags,lcms2)' \ + $(if $(DISABLE_DYNLOADING), \ + --enable-static --disable-shared \ + , \ + --enable-shared --disable-static \ + ) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + && cd src \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,lcms2,EXTERNAL) +endif +# vim: set noet sw=4 ts=4: diff --git a/external/lcms2/Makefile b/external/lcms2/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/lcms2/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/external/lcms2/Module_lcms2.mk b/external/lcms2/Module_lcms2.mk new file mode 100644 index 000000000..807dbae43 --- /dev/null +++ b/external/lcms2/Module_lcms2.mk @@ -0,0 +1,18 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,lcms2)) + +$(eval $(call gb_Module_add_targets,lcms2,\ + UnpackedTarball_lcms2 \ + ExternalPackage_lcms2 \ + ExternalProject_lcms2 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/lcms2/README b/external/lcms2/README new file mode 100644 index 000000000..10b18a5ad --- /dev/null +++ b/external/lcms2/README @@ -0,0 +1,3 @@ +lcms2 (little cms engine) +lcms2: Little cms is a small, speed optimized color management engine. +with the new libcdr, writerperfect will depend on lcms2 \ No newline at end of file diff --git a/external/lcms2/UnpackedTarball_lcms2.mk b/external/lcms2/UnpackedTarball_lcms2.mk new file mode 100644 index 000000000..932f8c63c --- /dev/null +++ b/external/lcms2/UnpackedTarball_lcms2.mk @@ -0,0 +1,27 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,lcms2)) + +$(eval $(call gb_UnpackedTarball_set_tarball,lcms2,$(LCMS2_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,lcms2)) + +$(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/c++17.patch.1 b/external/lcms2/c++17.patch.1 new file mode 100644 index 000000000..dc5b2ccde --- /dev/null +++ b/external/lcms2/c++17.patch.1 @@ -0,0 +1,13 @@ +diff --git a/include/lcms2.h b/include/lcms2.h +index cf52014..926e2a0 100644 +--- a/include/lcms2.h ++++ b/include/lcms2.h +@@ -62,7 +62,7 @@ + // #define CMS_RELY_ON_WINDOWS_STATIC_MUTEX_INIT + + // Uncomment this to remove the "register" storage class +-// #define CMS_NO_REGISTER_KEYWORD 1 ++#define CMS_NO_REGISTER_KEYWORD 1 + + // ********** End of configuration toggles ****************************** + diff --git a/external/lcms2/lcms2-2.4-windows.patch b/external/lcms2/lcms2-2.4-windows.patch new file mode 100644 index 000000000..749a81200 --- /dev/null +++ b/external/lcms2/lcms2-2.4-windows.patch @@ -0,0 +1,20 @@ +TODO: Is this still needed? + +--- misc/lcms2-2.4/include/lcms2.h 2011-12-15 16:45:47.000000000 +0100 ++++ misc/build/lcms2-2.4/include/lcms2.h 2012-03-17 22:53:28.731585981 +0100 +@@ -192,6 +192,15 @@ typedef int cmsBool; + #endif // CMS_USE_BIG_ENDIAN + + ++// LibreOffice always builds this as DLL and with the stdcall calling ++// convention, so make this usable from outside without having to ++// specify CMS_DLL manually whenever the library is used. ++#ifndef CMS_DLL_BUILD ++#ifndef CMS_DLL ++#define CMS_DLL ++#endif ++#endif ++ + // Calling convention -- this is hardly platform and compiler dependent + #ifdef CMS_IS_WINDOWS_ + # if defined(CMS_DLL) || defined(CMS_DLL_BUILD) diff --git a/external/lcms2/lcms2-win-arm64.patch.1 b/external/lcms2/lcms2-win-arm64.patch.1 new file mode 100644 index 000000000..fc9f0c374 --- /dev/null +++ b/external/lcms2/lcms2-win-arm64.patch.1 @@ -0,0 +1,1537 @@ +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 @@ +  + + ++ ++ Debug ++ ARM64 ++ + + Debug + Win32 +@@ -9,6 +13,10 @@ + Debug + x64 + ++ ++ Release ++ ARM64 ++ + + Release + Win32 +@@ -37,6 +45,12 @@ + true + v142 + ++ ++ Application ++ Unicode ++ true ++ v142 ++ + + Application + Unicode +@@ -47,6 +61,11 @@ + Unicode + v142 + ++ ++ Application ++ Unicode ++ v142 ++ + + + +@@ -56,12 +75,18 @@ + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + <_ProjectFileVersion>10.0.21006.1 +@@ -71,32 +96,44 @@ + $(Configuration)\ + true + true ++ true + ..\..\..\bin\ + ..\..\..\bin\ + $(Configuration)\ + $(Configuration)\ + false + false ++ false + AllRules.ruleset + AllRules.ruleset ++ AllRules.ruleset + + ++ + + ++ + AllRules.ruleset + AllRules.ruleset ++ AllRules.ruleset + + ++ + + ++ + $(IncludePath);;C:\code\jpeg-9a + $(IncludePath);;C:\code\jpeg-9a ++ $(IncludePath);;C:\code\jpeg-9a + $(LibraryPath);;C:\code\jpeg-9a + $(LibraryPath);;C:\code\jpeg-9a ++ $(LibraryPath);;C:\code\jpeg-9a + $(IncludePath);;C:\code\jpeg-9a + $(IncludePath);;C:\code\jpeg-9a ++ $(IncludePath);;C:\code\jpeg-9a + $(LibraryPath);;C:\code\jpeg-9a + $(LibraryPath);;C:\code\jpeg-9a ++ $(LibraryPath);;C:\code\jpeg-9a + + + +@@ -140,6 +177,26 @@ + false + + ++ ++ ++ Disabled ++ ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level4 ++ ProgramDatabase ++ true ++ ++ ++ libjpeg.lib;%(AdditionalDependencies) ++ true ++ Console ++ false ++ ++ + + + Full +@@ -197,6 +254,32 @@ + false + + ++ ++ ++ Full ++ true ++ ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ true ++ ++ ++ Level3 ++ ProgramDatabase ++ Speed ++ true ++ true ++ true ++ ++ ++ libjpeg.lib;%(AdditionalDependencies) ++ true ++ Console ++ true ++ true ++ false ++ ++ + + + +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 @@ +  + + ++ ++ Debug ++ ARM64 ++ + + Debug + Win32 +@@ -9,6 +13,10 @@ + Debug + x64 + ++ ++ Release ++ ARM64 ++ + + Release + Win32 +@@ -37,6 +45,12 @@ + true + v142 + ++ ++ DynamicLibrary ++ Unicode ++ true ++ v142 ++ + + DynamicLibrary + Unicode +@@ -47,6 +61,11 @@ + Unicode + v142 + ++ ++ DynamicLibrary ++ Unicode ++ v142 ++ + + + +@@ -56,12 +75,18 @@ + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + <_ProjectFileVersion>10.0.21006.1 +@@ -69,28 +94,40 @@ + <_ProjectFileVersion>10.0.21006.1 + ..\..\..\bin\ + ..\..\..\bin\ ++ ..\..\..\bin\ + $(Configuration)_$(Platform)\ + $(Configuration)_$(Platform)\ ++ $(Configuration)_$(Platform)\ + true + true ++ true + ..\..\..\bin\ + ..\..\..\bin\ ++ ..\..\..\bin\ + $(Configuration)_$(Platform)\ + $(Configuration)_$(Platform)\ ++ $(Configuration)_$(Platform)\ + false + false ++ false + AllRules.ruleset + AllRules.ruleset ++ AllRules.ruleset + + ++ + + ++ + AllRules.ruleset + AllRules.ruleset ++ AllRules.ruleset + + ++ + + ++ + + + lcms2 +@@ -99,9 +134,15 @@ + + lcms2 + ++ ++ lcms2 ++ + + lcms2 + ++ ++ lcms2 ++ + + + Disabled +@@ -144,6 +185,27 @@ + $(OutDir)$(TargetName)$(TargetExt) + + ++ ++ ++ Disabled ++ ../../../include;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_WINDOWS;_USRDLL;CMS_DLL_BUILD;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level4 ++ true ++ false ++ ++ ++ ++ ++ true ++ Windows ++ $(OutDir)$(TargetName)$(TargetExt) ++ ++ + + + Full +@@ -203,6 +265,34 @@ + true + + ++ ++ ++ Full ++ true ++ Speed ++ true ++ true ++ true ++ ../../../include;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_WINDOWS;_USRDLL;CMS_DLL_BUILD;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ MultiThreaded ++ true ++ ++ ++ Level4 ++ true ++ OnlyExplicitInline ++ true ++ ++ ++ ++ ++ true ++ Windows ++ true ++ true ++ ++ + + + +@@ -234,7 +324,9 @@ + + + true ++ true + true ++ true + + + +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 @@ +  + + ++ ++ Debug ++ ARM64 ++ + + Debug + Win32 +@@ -9,6 +13,10 @@ + Debug + x64 + ++ ++ Release ++ ARM64 ++ + + Release + Win32 +@@ -37,6 +45,12 @@ + true + v142 + ++ ++ StaticLibrary ++ Unicode ++ true ++ v142 ++ + + StaticLibrary + Unicode +@@ -47,6 +61,11 @@ + Unicode + v142 + ++ ++ StaticLibrary ++ Unicode ++ v142 ++ + + + +@@ -56,12 +75,18 @@ + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + <_ProjectFileVersion>10.0.21006.1 +@@ -69,22 +94,30 @@ + ..\..\..\Lib\MS\ + $(Configuration)_$(Platform)\ + $(Configuration)_$(Platform)\ ++ $(Configuration)_$(Platform)\ + ..\..\..\Lib\MS\ + ..\..\..\Lib\MS\ + $(Configuration)_$(Platform)\ + $(Configuration)_$(Platform)\ ++ $(Configuration)_$(Platform)\ + AllRules.ruleset + AllRules.ruleset ++ AllRules.ruleset + + ++ + + ++ + AllRules.ruleset + AllRules.ruleset ++ AllRules.ruleset + + ++ + + ++ + + + +@@ -120,6 +153,23 @@ + Default + + ++ ++ ++ Disabled ++ ../../../include;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) ++ EnableFastChecks ++ MultiThreadedDebug ++ ++ ++ Level4 ++ ProgramDatabase ++ ++ ++ true ++ Default ++ ++ + + + MaxSpeed +@@ -169,6 +219,28 @@ + true + + ++ ++ ++ MaxSpeed ++ true ++ ../../../include;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) ++ MultiThreaded ++ true ++ ++ ++ Level4 ++ ProgramDatabase ++ Speed ++ true ++ true ++ OnlyExplicitInline ++ false ++ true ++ true ++ true ++ ++ + + + +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 @@ +  + + ++ ++ Debug ++ ARM64 ++ + + Debug + Win32 +@@ -9,6 +13,10 @@ + Debug + x64 + ++ ++ Release ++ ARM64 ++ + + Release + Win32 +@@ -37,6 +45,12 @@ + true + v142 + ++ ++ Application ++ Unicode ++ true ++ v142 ++ + + Application + Unicode +@@ -47,6 +61,11 @@ + Unicode + v142 + ++ ++ Application ++ Unicode ++ v142 ++ + + + +@@ -56,12 +75,18 @@ + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + <_ProjectFileVersion>10.0.21006.1 +@@ -69,26 +94,36 @@ + ..\..\..\bin\ + $(Configuration)_$(Platform)\ + $(Configuration)_$(Platform)\ ++ $(Configuration)_$(Platform)\ + true + true ++ true + ..\..\..\bin\ + ..\..\..\bin\ + $(Configuration)_$(Platform)\ + $(Configuration)_$(Platform)\ ++ $(Configuration)_$(Platform)\ + false + false ++ false + AllRules.ruleset + AllRules.ruleset ++ AllRules.ruleset + + ++ + + ++ + AllRules.ruleset + AllRules.ruleset ++ AllRules.ruleset + + ++ + + ++ + + + +@@ -128,6 +163,24 @@ + Console + + ++ ++ ++ Disabled ++ ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ EnableFastChecks ++ MultiThreadedDebug ++ ++ ++ Level4 ++ ProgramDatabase ++ true ++ ++ ++ true ++ Console ++ ++ + + + MaxSpeed +@@ -175,6 +228,27 @@ + true + + ++ ++ ++ MaxSpeed ++ true ++ ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ true ++ ++ ++ Level4 ++ ProgramDatabase ++ true ++ ++ ++ true ++ Console ++ true ++ true ++ ++ + + + +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 @@ +  + + ++ ++ Debug ++ ARM64 ++ + + Debug + Win32 +@@ -9,6 +13,10 @@ + Debug + x64 + ++ ++ Release ++ ARM64 ++ + + Release + Win32 +@@ -37,6 +45,12 @@ + true + v142 + ++ ++ Application ++ Unicode ++ true ++ v142 ++ + + Application + Unicode +@@ -47,6 +61,11 @@ + Unicode + v142 + ++ ++ Application ++ Unicode ++ v142 ++ + + + +@@ -56,12 +75,18 @@ + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + <_ProjectFileVersion>10.0.21006.1 +@@ -69,26 +94,36 @@ + ..\..\..\bin\ + $(Configuration)_$(Platform)\ + $(Configuration)_$(Platform)\ ++ $(Configuration)_$(Platform)\ + true + true ++ true + ..\..\..\bin\ + ..\..\..\bin\ + $(Configuration)_$(Platform)\ + $(Configuration)_$(Platform)\ ++ $(Configuration)_$(Platform)\ + false + false ++ false + AllRules.ruleset + AllRules.ruleset ++ AllRules.ruleset + + ++ + + ++ + AllRules.ruleset + AllRules.ruleset ++ AllRules.ruleset + + ++ + + ++ + + + +@@ -128,6 +163,24 @@ + Console + + ++ ++ ++ Disabled ++ ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level4 ++ ProgramDatabase ++ true ++ ++ ++ true ++ Console ++ ++ + + + MaxSpeed +@@ -175,6 +228,27 @@ + true + + ++ ++ ++ MaxSpeed ++ true ++ ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ MultiThreaded ++ true ++ ++ ++ Level4 ++ ProgramDatabase ++ true ++ ++ ++ true ++ Console ++ true ++ true ++ ++ + + + +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 @@ +  + + ++ ++ Debug ++ ARM64 ++ + + Debug + Win32 +@@ -9,6 +13,10 @@ + Debug + x64 + ++ ++ Release ++ ARM64 ++ + + Release + Win32 +@@ -37,6 +45,12 @@ + true + v142 + ++ ++ Application ++ Unicode ++ true ++ v142 ++ + + Application + Unicode +@@ -47,6 +61,11 @@ + Unicode + v142 + ++ ++ Application ++ Unicode ++ v142 ++ + + + +@@ -56,37 +75,53 @@ + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + <_ProjectFileVersion>10.0.21006.1 + $(Configuration)_$(Platform)\ + $(Configuration)_$(Platform)\ ++ $(Configuration)_$(Platform)\ + true + true ++ true + ..\..\..\testbed\ + ..\..\..\testbed\ + $(Configuration)_$(Platform)\ + $(Configuration)_$(Platform)\ ++ $(Configuration)_$(Platform)\ + false + false ++ false + AllRules.ruleset + AllRules.ruleset ++ AllRules.ruleset + + ++ + + ++ + AllRules.ruleset + AllRules.ruleset ++ AllRules.ruleset + + ++ + + ++ + ..\..\..\testbed\ + ..\..\..\testbed\ + +@@ -130,6 +165,25 @@ + false + + ++ ++ ++ Disabled ++ ../../../include;../../../src;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ EnableFastChecks ++ MultiThreadedDebug ++ ++ ++ Level3 ++ ProgramDatabase ++ true ++ ++ ++ true ++ Console ++ false ++ ++ + + + Full +@@ -191,6 +245,34 @@ + false + + ++ ++ ++ Full ++ true ++ Speed ++ true ++ true ++ ../../../include;../../../src;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ MultiThreaded ++ false ++ true ++ NotSet ++ ++ ++ Level3 ++ ProgramDatabase ++ Cdecl ++ true ++ ++ ++ true ++ Console ++ true ++ true ++ false ++ ++ + + + {71dede59-3f1e-486b-a899-4283000f76b5} +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 @@ +  + + ++ ++ Debug ++ ARM64 ++ + + Debug + Win32 +@@ -9,6 +13,10 @@ + Debug + x64 + ++ ++ Release ++ ARM64 ++ + + Release + Win32 +@@ -37,6 +45,12 @@ + true + v142 + ++ ++ Application ++ Unicode ++ true ++ v142 ++ + + Application + Unicode +@@ -47,6 +61,11 @@ + Unicode + v142 + ++ ++ Application ++ Unicode ++ v142 ++ + + + +@@ -56,12 +75,18 @@ + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + <_ProjectFileVersion>10.0.21006.1 +@@ -69,34 +94,48 @@ + ..\..\..\bin\ + $(Configuration)_$(Platform)\ + $(Configuration)_$(Platform)\ ++ $(Configuration)_$(Platform)\ + true + true ++ true + ..\..\..\bin\ + ..\..\..\bin\ + $(Configuration)_$(Platform)\ + $(Configuration)_$(Platform)\ ++ $(Configuration)_$(Platform)\ + false + false ++ false + AllRules.ruleset + AllRules.ruleset ++ AllRules.ruleset + + ++ + + ++ + AllRules.ruleset + AllRules.ruleset ++ AllRules.ruleset + + ++ + + ++ + C:\jpeg-8d;$(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + C:\jpeg-8d;$(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff ++ C:\jpeg-8d;$(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + C:\jpeg-8d;$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + C:\jpeg-8d;$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff ++ C:\jpeg-8d;$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + C:\jpeg-8d;$(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + C:\jpeg-8d;$(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff ++ C:\jpeg-8d;$(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + C:\jpeg-8d;$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + C:\jpeg-8d;$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff ++ C:\jpeg-8d;$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + + + +@@ -140,6 +179,26 @@ + false + + ++ ++ ++ Disabled ++ ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ EnableFastChecks ++ MultiThreadedDebug ++ ++ ++ Level4 ++ ProgramDatabase ++ true ++ ++ ++ libtiff.lib;%(AdditionalDependencies) ++ true ++ Console ++ false ++ ++ + + + MaxSpeed +@@ -193,6 +252,30 @@ + false + + ++ ++ ++ MaxSpeed ++ true ++ ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ true ++ ++ ++ Level4 ++ ProgramDatabase ++ true ++ ++ ++ libtiff.lib;%(AdditionalDependencies) ++ true ++ Console ++ true ++ true ++ $(OutDir)$(TargetName)$(TargetExt) ++ false ++ ++ + + + +@@ -207,4 +290,4 @@ + + + +- +\ No newline at end of file ++ +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 @@ +  + + ++ ++ Debug ++ ARM64 ++ + + Debug + Win32 +@@ -9,6 +13,10 @@ + Debug + x64 + ++ ++ Release ++ ARM64 ++ + + Release + Win32 +@@ -37,6 +45,12 @@ + true + v142 + ++ ++ Application ++ Unicode ++ true ++ v142 ++ + + Application + Unicode +@@ -47,6 +61,11 @@ + Unicode + v142 + ++ ++ Application ++ Unicode ++ v142 ++ + + + +@@ -56,12 +75,18 @@ + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + <_ProjectFileVersion>10.0.21006.1 +@@ -69,34 +94,48 @@ + ..\..\..\bin\ + $(Configuration)_$(Platform)\ + $(Configuration)_$(Platform)\ ++ $(Configuration)_$(Platform)\ + true + true ++ true + ..\..\..\bin\ + ..\..\..\bin\ + $(Configuration)_$(Platform)\ + $(Configuration)_$(Platform)\ ++ $(Configuration)_$(Platform)\ + false + false ++ false + AllRules.ruleset + AllRules.ruleset ++ AllRules.ruleset + + ++ + + ++ + AllRules.ruleset + AllRules.ruleset ++ AllRules.ruleset + + ++ + + ++ + $(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + $(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff ++ $(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + $(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + $(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff ++ $(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + $(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + $(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff ++ $(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + $(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + $(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff ++ $(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + + + +@@ -140,6 +179,26 @@ + false + + ++ ++ ++ Disabled ++ ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ true ++ ++ ++ libtiff.lib;%(AdditionalDependencies) ++ true ++ Console ++ false ++ ++ + + + MaxSpeed +@@ -191,6 +250,29 @@ + false + + ++ ++ ++ MaxSpeed ++ true ++ ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ true ++ ++ ++ Level4 ++ ProgramDatabase ++ true ++ ++ ++ libtiff.lib;%(AdditionalDependencies) ++ true ++ Console ++ true ++ true ++ false ++ ++ + + + +@@ -208,4 +290,4 @@ + + + +- +\ No newline at end of file ++ +diff -urbaN lcms2-2.11.orig/Projects/VC2019/transicc/transicc.vcxproj lcms2-2.11/Projects/VC2019/transicc/transicc.vcxproj +--- lcms2-2.11.orig/Projects/VC2019/transicc/transicc.vcxproj 2020-06-16 19:10:37.000000000 +0200 ++++ lcms2-2.11/Projects/VC2019/transicc/transicc.vcxproj 2020-07-09 18:28:38.945719719 +0200 +@@ -1,6 +1,10 @@ +  + + ++ ++ Debug ++ ARM64 ++ + + Debug + Win32 +@@ -9,6 +13,10 @@ + Debug + x64 + ++ ++ Release ++ ARM64 ++ + + Release + Win32 +@@ -37,6 +45,12 @@ + true + v142 + ++ ++ Application ++ Unicode ++ true ++ v142 ++ + + Application + Unicode +@@ -47,6 +61,11 @@ + Unicode + v142 + ++ ++ Application ++ Unicode ++ v142 ++ + + + +@@ -56,12 +75,18 @@ + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + <_ProjectFileVersion>10.0.21006.1 +@@ -69,26 +94,36 @@ + ..\..\..\bin\ + $(Configuration)_$(Platform)\ + $(Configuration)_$(Platform)\ ++ $(Configuration)_$(Platform)\ + true + true ++ true + ..\..\..\bin\ + ..\..\..\bin\ + $(Configuration)_$(Platform)\ + $(Configuration)_$(Platform)\ ++ $(Configuration)_$(Platform)\ + false + false ++ false + AllRules.ruleset + AllRules.ruleset ++ AllRules.ruleset + + ++ + + ++ + AllRules.ruleset + AllRules.ruleset ++ AllRules.ruleset + + ++ + + ++ + + + +@@ -128,6 +163,24 @@ + Console + + ++ ++ ++ Disabled ++ ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level4 ++ ProgramDatabase ++ true ++ ++ ++ true ++ Console ++ ++ + + + MaxSpeed +@@ -175,9 +228,31 @@ + true + + ++ ++ ++ MaxSpeed ++ true ++ ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ MultiThreaded ++ true ++ ++ ++ Level4 ++ ProgramDatabase ++ true ++ ++ ++ true ++ Console ++ true ++ true ++ ++ + + + false ++ false + + + diff --git a/external/lcms2/lcms2_sln b/external/lcms2/lcms2_sln new file mode 100644 index 000000000..6a3d35afa Binary files /dev/null and b/external/lcms2/lcms2_sln differ -- cgit v1.2.3