diff --git a/Projects/BorlandC_5.5/lcms2.rc b/Projects/BorlandC_5.5/lcms2.rc index 1e1005222..0b1590a30 100644 --- a/Projects/BorlandC_5.5/lcms2.rc +++ b/Projects/BorlandC_5.5/lcms2.rc @@ -1,8 +1,8 @@ 1 VERSIONINFO -FILEVERSION 2, 16, 0, 0 -PRODUCTVERSION 2, 16, 0, 0 +FILEVERSION 2, 17, 0, 0 +PRODUCTVERSION 2, 17, 0, 0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL { @@ -12,9 +12,9 @@ FILETYPE VFT_DLL { VALUE "CompanyName", "Marti Maria\000\000" VALUE "FileDescription", "lcms color engine\000" - VALUE "FileVersion", "2.16\000\000" + VALUE "FileVersion", "2.17\000\000" VALUE "InternalName", "lcms2\000" - VALUE "LegalCopyright", "Copyright © Marti Maria 2023\000\000" + VALUE "LegalCopyright", "Copyright © Marti Maria 2024\000\000" VALUE "OriginalFilename", "lcms2.dll\000" } diff --git a/Projects/VC2015/jpegicc/jpegicc.vcxproj b/Projects/VC2015/jpegicc/jpegicc.vcxproj deleted file mode 100644 index ebe1e2919..000000000 --- a/Projects/VC2015/jpegicc/jpegicc.vcxproj +++ /dev/null @@ -1,214 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {62812507-F926-4968-96A9-17678460AD90} - jpegicc - Win32Proj - - - - Application - Unicode - true - v140 - - - Application - Unicode - true - v140 - - - Application - Unicode - v140 - - - Application - Unicode - v140 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.21006.1 - ..\..\..\bin\ - ..\..\..\bin\ - $(Configuration)\ - $(Configuration)\ - true - true - ..\..\..\bin\ - ..\..\..\bin\ - $(Configuration)\ - $(Configuration)\ - false - false - AllRules.ruleset - AllRules.ruleset - - - - - AllRules.ruleset - AllRules.ruleset - - - - - $(IncludePath);;C:\code\jpeg-9a - $(IncludePath);;C:\code\jpeg-9a - $(LibraryPath);;C:\code\jpeg-9a - $(LibraryPath);;C:\code\jpeg-9a - $(IncludePath);;C:\code\jpeg-9a - $(IncludePath);;C:\code\jpeg-9a - $(LibraryPath);;C:\code\jpeg-9a - $(LibraryPath);;C:\code\jpeg-9a - - - - Disabled - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - EditAndContinue - true - - - libjpeg.lib;%(AdditionalDependencies) - true - Console - MachineX86 - false - - - - - Disabled - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - ProgramDatabase - true - - - libjpeg.lib;%(AdditionalDependencies) - true - Console - false - - - - - Full - true - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - Speed - true - true - true - true - - - libjpeg.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX86 - false - - - true - - - - - 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 - - - - - - - - - - - {71dede59-3f1e-486b-a899-4283000f76b5} - false - - - - - - \ No newline at end of file diff --git a/Projects/VC2015/jpegicc/jpegicc.vcxproj.filters b/Projects/VC2015/jpegicc/jpegicc.vcxproj.filters deleted file mode 100644 index a05c36d6d..000000000 --- a/Projects/VC2015/jpegicc/jpegicc.vcxproj.filters +++ /dev/null @@ -1,31 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/Projects/VC2015/lcms2.rc b/Projects/VC2015/lcms2.rc deleted file mode 100644 index 52c7a46a6..000000000 --- a/Projects/VC2015/lcms2.rc +++ /dev/null @@ -1,104 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Spanish (Spain, International Sort) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN -#pragma code_page(1252) - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -1 VERSIONINFO - FILEVERSION 2,16,0,0 - PRODUCTVERSION 2,16,0,0 - FILEFLAGSMASK 0x0L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "Marti Maria" - VALUE "FileDescription", "lcms color engine" - VALUE "FileVersion", "2.16.0.0" - VALUE "InternalName", "lcms2" - VALUE "LegalCopyright", "Copyright © Marti Maria 2023" - VALUE "OriginalFilename", "lcms2.dll" - VALUE "ProductName", "LittleCMS color engine" - VALUE "ProductVersion", "2.16.0.0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // Spanish (Spain, International Sort) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/Projects/VC2015/lcms2.sln b/Projects/VC2015/lcms2.sln deleted file mode 100644 index b48c204a9..000000000 Binary files a/Projects/VC2015/lcms2.sln and /dev/null differ diff --git a/Projects/VC2015/lcms2_DLL/lcms2_DLL.vcxproj b/Projects/VC2015/lcms2_DLL/lcms2_DLL.vcxproj deleted file mode 100644 index 8ea37b97d..000000000 --- a/Projects/VC2015/lcms2_DLL/lcms2_DLL.vcxproj +++ /dev/null @@ -1,251 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {8C51BE48-ADB8-4089-A9EC-F6BF993A0548} - lcms2_DLL - Win32Proj - 8.1 - - - - DynamicLibrary - Unicode - true - v140 - - - DynamicLibrary - Unicode - true - v140 - - - DynamicLibrary - Unicode - v140 - - - DynamicLibrary - Unicode - v140 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.21006.1 - ..\..\..\bin\ - ..\..\..\bin\ - $(Configuration)_$(Platform)\ - $(Configuration)_$(Platform)\ - true - true - ..\..\..\bin\ - ..\..\..\bin\ - $(Configuration)_$(Platform)\ - $(Configuration)_$(Platform)\ - false - false - AllRules.ruleset - AllRules.ruleset - - - - - AllRules.ruleset - AllRules.ruleset - - - - - - - lcms2 - - - lcms2 - - - lcms2 - - - lcms2 - - - - Disabled - ../../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;CMS_DLL_BUILD;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - true - false - - - ..\..\..\src\lcms2.def - true - Windows - MachineX86 - - - - - 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 - 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 - - - ..\..\..\src\lcms2.def - true - Windows - true - true - MachineX86 - - - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Projects/VC2015/lcms2_DLL/lcms2_DLL.vcxproj.filters b/Projects/VC2015/lcms2_DLL/lcms2_DLL.vcxproj.filters deleted file mode 100644 index 255a14707..000000000 --- a/Projects/VC2015/lcms2_DLL/lcms2_DLL.vcxproj.filters +++ /dev/null @@ -1,121 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Source Files - - - Resource Files - - - - - Resource Files - - - - - Source Files - - - \ No newline at end of file diff --git a/Projects/VC2015/lcms2_static/lcms2_static.vcxproj b/Projects/VC2015/lcms2_static/lcms2_static.vcxproj deleted file mode 100644 index bcfb7db62..000000000 --- a/Projects/VC2015/lcms2_static/lcms2_static.vcxproj +++ /dev/null @@ -1,208 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {71DEDE59-3F1E-486B-A899-4283000F76B5} - lcms2_static - Win32Proj - 8.1 - - - - StaticLibrary - Unicode - true - v140 - - - StaticLibrary - Unicode - true - v140 - - - StaticLibrary - Unicode - v140 - - - StaticLibrary - Unicode - v140 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.21006.1 - ..\..\..\Lib\MS\ - ..\..\..\Lib\MS\ - $(Configuration)_$(Platform)\ - $(Configuration)_$(Platform)\ - ..\..\..\Lib\MS\ - ..\..\..\Lib\MS\ - $(Configuration)_$(Platform)\ - $(Configuration)_$(Platform)\ - AllRules.ruleset - AllRules.ruleset - - - - - AllRules.ruleset - AllRules.ruleset - - - - - - - - Disabled - ../../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - EnableFastChecks - - - Level4 - EditAndContinue - - - true - MultiThreadedDebugDLL - - - - - Disabled - ../../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level4 - ProgramDatabase - - - true - Default - - - - - MaxSpeed - true - ../../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level4 - ProgramDatabase - Speed - true - false - OnlyExplicitInline - false - true - Precise - false - false - true - - - true - - - - - MaxSpeed - true - ../../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level4 - ProgramDatabase - Speed - true - true - OnlyExplicitInline - false - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Projects/VC2015/lcms2_static/lcms2_static.vcxproj.filters b/Projects/VC2015/lcms2_static/lcms2_static.vcxproj.filters deleted file mode 100644 index 58d3cb7ee..000000000 --- a/Projects/VC2015/lcms2_static/lcms2_static.vcxproj.filters +++ /dev/null @@ -1,108 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Source Files - - - \ No newline at end of file diff --git a/Projects/VC2015/linkicc/linkicc.vcxproj b/Projects/VC2015/linkicc/linkicc.vcxproj deleted file mode 100644 index 18ee95568..000000000 --- a/Projects/VC2015/linkicc/linkicc.vcxproj +++ /dev/null @@ -1,192 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {FBFBE1DC-DB84-4BA1-9552-B4780F457849} - linkicc - Win32Proj - 8.1 - - - - Application - Unicode - true - v140 - - - Application - Unicode - true - v140 - - - Application - Unicode - v140 - - - Application - Unicode - v140 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.21006.1 - ..\..\..\bin\ - ..\..\..\bin\ - $(Configuration)_$(Platform)\ - $(Configuration)_$(Platform)\ - true - true - ..\..\..\bin\ - ..\..\..\bin\ - $(Configuration)_$(Platform)\ - $(Configuration)_$(Platform)\ - false - false - AllRules.ruleset - AllRules.ruleset - - - - - AllRules.ruleset - AllRules.ruleset - - - - - - - - Disabled - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDLL - - - Level4 - EditAndContinue - true - - - true - Console - MachineX86 - - - - - Disabled - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level4 - ProgramDatabase - true - - - true - Console - - - - - MaxSpeed - true - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level4 - ProgramDatabase - true - true - - - true - Console - true - true - MachineX86 - - - true - - - - - MaxSpeed - true - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level4 - ProgramDatabase - true - - - true - Console - true - true - - - - - - - - - - {71dede59-3f1e-486b-a899-4283000f76b5} - false - - - - - - \ No newline at end of file diff --git a/Projects/VC2015/linkicc/linkicc.vcxproj.filters b/Projects/VC2015/linkicc/linkicc.vcxproj.filters deleted file mode 100644 index 95c77cdbe..000000000 --- a/Projects/VC2015/linkicc/linkicc.vcxproj.filters +++ /dev/null @@ -1,28 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/Projects/VC2015/psicc/psicc.vcxproj b/Projects/VC2015/psicc/psicc.vcxproj deleted file mode 100644 index 938c31264..000000000 --- a/Projects/VC2015/psicc/psicc.vcxproj +++ /dev/null @@ -1,192 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {EF6A8851-65FE-46F5-B9EF-14F0B671F693} - psicc - Win32Proj - 8.1 - - - - Application - Unicode - true - v140 - - - Application - Unicode - true - v140 - - - Application - Unicode - v140 - - - Application - Unicode - v140 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.21006.1 - ..\..\..\bin\ - ..\..\..\bin\ - $(Configuration)_$(Platform)\ - $(Configuration)_$(Platform)\ - true - true - ..\..\..\bin\ - ..\..\..\bin\ - $(Configuration)_$(Platform)\ - $(Configuration)_$(Platform)\ - false - false - AllRules.ruleset - AllRules.ruleset - - - - - AllRules.ruleset - AllRules.ruleset - - - - - - - - Disabled - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - EditAndContinue - true - - - true - Console - MachineX86 - - - - - Disabled - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - ProgramDatabase - true - - - true - Console - - - - - MaxSpeed - true - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level4 - ProgramDatabase - true - true - - - true - Console - true - true - MachineX86 - - - true - - - - - MaxSpeed - true - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level4 - ProgramDatabase - true - - - true - Console - true - true - - - - - - - - - - {71dede59-3f1e-486b-a899-4283000f76b5} - false - - - - - - \ No newline at end of file diff --git a/Projects/VC2015/psicc/psicc.vcxproj.filters b/Projects/VC2015/psicc/psicc.vcxproj.filters deleted file mode 100644 index c42429d8b..000000000 --- a/Projects/VC2015/psicc/psicc.vcxproj.filters +++ /dev/null @@ -1,28 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/Projects/VC2015/resource.h b/Projects/VC2015/resource.h deleted file mode 100644 index 7655978dd..000000000 --- a/Projects/VC2015/resource.h +++ /dev/null @@ -1,16 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by lcms2.rc -// - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NO_MFC 1 -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/Projects/VC2015/testbed/testbed.vcxproj b/Projects/VC2015/testbed/testbed.vcxproj deleted file mode 100644 index 63e979457..000000000 --- a/Projects/VC2015/testbed/testbed.vcxproj +++ /dev/null @@ -1,208 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {928A3A2B-46EF-4279-959C-513B3652FF0E} - testbed - Win32Proj - 8.1 - - - - Application - Unicode - true - v140 - - - Application - Unicode - true - v140 - - - Application - Unicode - v140 - - - Application - Unicode - v140 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.21006.1 - $(Configuration)_$(Platform)\ - $(Configuration)_$(Platform)\ - true - true - ..\..\..\testbed\ - ..\..\..\testbed\ - $(Configuration)_$(Platform)\ - $(Configuration)_$(Platform)\ - false - false - AllRules.ruleset - AllRules.ruleset - - - - - AllRules.ruleset - AllRules.ruleset - - - - - ..\..\..\testbed\ - ..\..\..\testbed\ - - - - Disabled - ../../../include;../../../src;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - true - - - true - Console - MachineX86 - false - - - - - Disabled - ../../../include;../../../src;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - true - - - true - Console - false - - - - - Full - true - Speed - true - false - ../../../include;../../../src;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - false - true - NotSet - - - Level3 - ProgramDatabase - Cdecl - true - true - - - true - Console - true - true - MachineX86 - false - - - true - - - - - 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} - false - - - - - - - - - - - \ No newline at end of file diff --git a/Projects/VC2015/testbed/testbed.vcxproj.filters b/Projects/VC2015/testbed/testbed.vcxproj.filters deleted file mode 100644 index 993ee1511..000000000 --- a/Projects/VC2015/testbed/testbed.vcxproj.filters +++ /dev/null @@ -1,28 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/Projects/VC2015/tiffdiff/tiffdiff.vcxproj b/Projects/VC2015/tiffdiff/tiffdiff.vcxproj deleted file mode 100644 index 63a5eef0c..000000000 --- a/Projects/VC2015/tiffdiff/tiffdiff.vcxproj +++ /dev/null @@ -1,210 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {75B91835-CCD7-48BE-A606-A9C997D5DBEE} - tiffdiff - Win32Proj - 8.1 - - - - Application - Unicode - true - v140 - - - Application - Unicode - true - v140 - - - Application - Unicode - v140 - - - Application - Unicode - v140 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.21006.1 - ..\..\..\bin\ - ..\..\..\bin\ - $(Configuration)_$(Platform)\ - $(Configuration)_$(Platform)\ - true - true - ..\..\..\bin\ - ..\..\..\bin\ - $(Configuration)_$(Platform)\ - $(Configuration)_$(Platform)\ - false - false - AllRules.ruleset - AllRules.ruleset - - - - - AllRules.ruleset - AllRules.ruleset - - - - - C:\jpeg-8d;c:\tiff-4.0.2\libtiff;$(IncludePath) - C:\jpeg-8d;c:\tiff-4.0.2\libtiff;$(IncludePath) - C:\jpeg-8d;C:\tiff-4.0.2\libtiff;$(LibraryPath) - C:\jpeg-8d;C:\tiff-4.0.2\libtiff;$(LibraryPath) - C:\jpeg-8d;c:\tiff-4.0.2\libtiff;$(IncludePath) - C:\jpeg-8d;c:\tiff-4.0.2\libtiff;$(IncludePath) - C:\jpeg-8d;C:\tiff-4.0.2\libtiff;$(LibraryPath) - C:\jpeg-8d;C:\tiff-4.0.2\libtiff;$(LibraryPath) - - - - Disabled - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - EditAndContinue - true - - - libtiff.lib;%(AdditionalDependencies) - true - Console - MachineX86 - false - - - - - Disabled - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level4 - ProgramDatabase - true - - - libtiff.lib;%(AdditionalDependencies) - true - Console - false - - - - - MaxSpeed - true - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level4 - ProgramDatabase - true - true - - - libtiff.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX86 - $(OutDir)$(TargetName)$(TargetExt) - false - - - true - - - - - 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 - - - - - - - - - - {71dede59-3f1e-486b-a899-4283000f76b5} - false - - - - - - \ No newline at end of file diff --git a/Projects/VC2015/tiffdiff/tiffdiff.vcxproj.filters b/Projects/VC2015/tiffdiff/tiffdiff.vcxproj.filters deleted file mode 100644 index b7f9a80d1..000000000 --- a/Projects/VC2015/tiffdiff/tiffdiff.vcxproj.filters +++ /dev/null @@ -1,28 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/Projects/VC2015/tifficc/tifficc.vcxproj b/Projects/VC2015/tifficc/tifficc.vcxproj deleted file mode 100644 index 7de14c4b9..000000000 --- a/Projects/VC2015/tifficc/tifficc.vcxproj +++ /dev/null @@ -1,211 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {2256DE16-ED92-4A6F-9C54-F65BB61E64A2} - tifficc - Win32Proj - 8.1 - - - - Application - Unicode - true - v140 - - - Application - Unicode - true - v140 - - - Application - Unicode - v140 - - - Application - Unicode - v140 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.21006.1 - ..\..\..\bin\ - ..\..\..\bin\ - $(Configuration)_$(Platform)\ - $(Configuration)_$(Platform)\ - true - true - ..\..\..\bin\ - ..\..\..\bin\ - $(Configuration)_$(Platform)\ - $(Configuration)_$(Platform)\ - false - false - AllRules.ruleset - AllRules.ruleset - - - - - AllRules.ruleset - AllRules.ruleset - - - - - $(IncludePath);C:\code\tiff-4.0.3\libtiff - $(IncludePath);C:\code\tiff-4.0.3\libtiff - $(LibraryPath);C:\code\tiff-4.0.3\libtiff - $(LibraryPath);C:\code\tiff-4.0.3\libtiff - $(IncludePath);C:\code\tiff-4.0.3\libtiff - $(IncludePath);C:\code\tiff-4.0.3\libtiff - $(LibraryPath);C:\code\tiff-4.0.3\libtiff - $(LibraryPath);C:\code\tiff-4.0.3\libtiff - - - - Disabled - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - true - - - libtiff.lib;%(AdditionalDependencies) - true - Console - MachineX86 - false - - - - - Disabled - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - true - - - libtiff.lib;%(AdditionalDependencies) - true - Console - false - - - - - MaxSpeed - true - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level4 - ProgramDatabase - true - true - - - libtiff.lib;%(AdditionalDependencies) - true - Console - true - true - MachineX86 - false - - - true - - - - - MaxSpeed - true - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level4 - ProgramDatabase - true - - - libtiff.lib;%(AdditionalDependencies) - true - Console - true - true - false - - - - - - - - - - - - - {71dede59-3f1e-486b-a899-4283000f76b5} - false - - - - - - \ No newline at end of file diff --git a/Projects/VC2015/tifficc/tifficc.vcxproj.filters b/Projects/VC2015/tifficc/tifficc.vcxproj.filters deleted file mode 100644 index 2e0e44d1e..000000000 --- a/Projects/VC2015/tifficc/tifficc.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/Projects/VC2015/transicc/transicc.vcxproj b/Projects/VC2015/transicc/transicc.vcxproj deleted file mode 100644 index f96500605..000000000 --- a/Projects/VC2015/transicc/transicc.vcxproj +++ /dev/null @@ -1,196 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {9EE22D66-C849-474C-9ED5-C3E141DAB160} - transicc - Win32Proj - - - - Application - Unicode - true - v140 - - - Application - Unicode - true - v140 - - - Application - Unicode - v140 - - - Application - Unicode - v140 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.21006.1 - ..\..\..\bin\ - ..\..\..\bin\ - $(Configuration)_$(Platform)\ - $(Configuration)_$(Platform)\ - true - true - ..\..\..\bin\ - ..\..\..\bin\ - $(Configuration)_$(Platform)\ - $(Configuration)_$(Platform)\ - false - false - AllRules.ruleset - AllRules.ruleset - - - - - AllRules.ruleset - AllRules.ruleset - - - - - - - - Disabled - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - EditAndContinue - true - - - true - Console - MachineX86 - - - - - Disabled - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - ProgramDatabase - true - - - true - Console - - - - - MaxSpeed - true - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level4 - ProgramDatabase - true - true - - - true - Console - true - true - MachineX86 - - - true - - - - - MaxSpeed - true - ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - - Level4 - ProgramDatabase - true - - - true - Console - true - true - - - - - false - - - - - - - - - - {71dede59-3f1e-486b-a899-4283000f76b5} - false - - - - - - \ No newline at end of file diff --git a/Projects/VC2015/transicc/transicc.vcxproj.filters b/Projects/VC2015/transicc/transicc.vcxproj.filters deleted file mode 100644 index 3d4544302..000000000 --- a/Projects/VC2015/transicc/transicc.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/Projects/VC2017/lcms2.rc b/Projects/VC2017/lcms2.rc index 52c7a46a6..32277fde9 100644 --- a/Projects/VC2017/lcms2.rc +++ b/Projects/VC2017/lcms2.rc @@ -27,8 +27,8 @@ LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN // 1 VERSIONINFO - FILEVERSION 2,16,0,0 - PRODUCTVERSION 2,16,0,0 + FILEVERSION 2,17,0,0 + PRODUCTVERSION 2,17,0,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG FILEFLAGS 0x1L @@ -45,12 +45,12 @@ BEGIN BEGIN VALUE "CompanyName", "Marti Maria" VALUE "FileDescription", "lcms color engine" - VALUE "FileVersion", "2.16.0.0" + VALUE "FileVersion", "2.17.0.0" VALUE "InternalName", "lcms2" - VALUE "LegalCopyright", "Copyright © Marti Maria 2023" + VALUE "LegalCopyright", "Copyright © Marti Maria 2024" VALUE "OriginalFilename", "lcms2.dll" VALUE "ProductName", "LittleCMS color engine" - VALUE "ProductVersion", "2.16.0.0" + VALUE "ProductVersion", "2.17.0.0" END END BLOCK "VarFileInfo" diff --git a/Projects/VC2019/lcms2.rc b/Projects/VC2019/lcms2.rc index 52c7a46a6..32277fde9 100644 --- a/Projects/VC2019/lcms2.rc +++ b/Projects/VC2019/lcms2.rc @@ -27,8 +27,8 @@ LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN // 1 VERSIONINFO - FILEVERSION 2,16,0,0 - PRODUCTVERSION 2,16,0,0 + FILEVERSION 2,17,0,0 + PRODUCTVERSION 2,17,0,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG FILEFLAGS 0x1L @@ -45,12 +45,12 @@ BEGIN BEGIN VALUE "CompanyName", "Marti Maria" VALUE "FileDescription", "lcms color engine" - VALUE "FileVersion", "2.16.0.0" + VALUE "FileVersion", "2.17.0.0" VALUE "InternalName", "lcms2" - VALUE "LegalCopyright", "Copyright © Marti Maria 2023" + VALUE "LegalCopyright", "Copyright © Marti Maria 2024" VALUE "OriginalFilename", "lcms2.dll" VALUE "ProductName", "LittleCMS color engine" - VALUE "ProductVersion", "2.16.0.0" + VALUE "ProductVersion", "2.17.0.0" END END BLOCK "VarFileInfo" diff --git a/Projects/VC2022/lcms2.rc b/Projects/VC2022/lcms2.rc index 52c7a46a6..32277fde9 100644 --- a/Projects/VC2022/lcms2.rc +++ b/Projects/VC2022/lcms2.rc @@ -27,8 +27,8 @@ LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN // 1 VERSIONINFO - FILEVERSION 2,16,0,0 - PRODUCTVERSION 2,16,0,0 + FILEVERSION 2,17,0,0 + PRODUCTVERSION 2,17,0,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG FILEFLAGS 0x1L @@ -45,12 +45,12 @@ BEGIN BEGIN VALUE "CompanyName", "Marti Maria" VALUE "FileDescription", "lcms color engine" - VALUE "FileVersion", "2.16.0.0" + VALUE "FileVersion", "2.17.0.0" VALUE "InternalName", "lcms2" - VALUE "LegalCopyright", "Copyright © Marti Maria 2023" + VALUE "LegalCopyright", "Copyright © Marti Maria 2024" VALUE "OriginalFilename", "lcms2.dll" VALUE "ProductName", "LittleCMS color engine" - VALUE "ProductVersion", "2.16.0.0" + VALUE "ProductVersion", "2.17.0.0" END END BLOCK "VarFileInfo" diff --git a/configure b/configure index 202ca436c..388f09ee8 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for lcms2 2.16. +# Generated by GNU Autoconf 2.71 for lcms2 2.17. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -618,8 +618,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='lcms2' PACKAGE_TARNAME='lcms2' -PACKAGE_VERSION='2.16' -PACKAGE_STRING='lcms2 2.16' +PACKAGE_VERSION='2.17' +PACKAGE_STRING='lcms2 2.17' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1400,7 +1400,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures lcms2 2.16 to adapt to many kinds of systems. +\`configure' configures lcms2 2.17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1471,7 +1471,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lcms2 2.16:";; + short | recursive ) echo "Configuration of lcms2 2.17:";; esac cat <<\_ACEOF @@ -1596,7 +1596,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lcms2 configure 2.16 +lcms2 configure 2.17 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2019,7 +2019,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lcms2 $as_me 2.16, which was +It was created by lcms2 $as_me 2.17, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2998,7 +2998,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Libtool library revision control info # LIBRARY_CURRENT=2 -LIBRARY_REVISION=16 +LIBRARY_REVISION=17 LIBRARY_AGE=0 @@ -3593,7 +3593,7 @@ fi # Define the identity of the package. PACKAGE='lcms2' - VERSION='2.16' + VERSION='2.17' # Some tools Automake needs. @@ -7097,7 +7097,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -8021,8 +8021,11 @@ _LT_EOF test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5 - if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -10218,12 +10221,6 @@ lt_prog_compiler_static= lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; - # flang / f18. f95 an alias for gfortran or flang on Debian - flang* | f18* | f95*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -10705,9 +10702,6 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries openbsd* | bitrig*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs=no - ;; esac ld_shlibs=yes @@ -10943,7 +10937,6 @@ _LT_EOF case $cc_basename in tcc*) - hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' export_dynamic_flag_spec='-rdynamic' ;; xlf* | bgf* | bgxlf* | mpixlf*) @@ -10964,7 +10957,7 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -11641,7 +11634,6 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } if test yes = "$lt_cv_irix_exported_symbol"; then archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi - link_all_deplibs=no else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' @@ -11659,12 +11651,11 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } # Fabrice Bellard et al's Tiny C Compiler ld_shlibs=yes archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -12764,6 +12755,9 @@ fi # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -12772,7 +12766,7 @@ fi # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -12784,18 +12778,6 @@ fi dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -14199,7 +14181,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else GXX=no @@ -14696,7 +14678,7 @@ fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -14761,7 +14743,7 @@ fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -15100,7 +15082,7 @@ fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # FIXME: insert proper C++ library support @@ -15184,7 +15166,7 @@ fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. @@ -15195,7 +15177,7 @@ fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir' @@ -15708,7 +15690,7 @@ lt_prog_compiler_static_CXX= ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -16088,9 +16070,6 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs_CXX=no - ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -16768,6 +16747,9 @@ fi # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -16776,7 +16758,7 @@ fi # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -16788,18 +16770,6 @@ fi dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -20456,7 +20426,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by lcms2 $as_me 2.16, which was +This file was extended by lcms2 $as_me 2.17, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20515,7 +20485,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -lcms2 config.status 2.16 +lcms2 config.status 2.17 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" @@ -21579,6 +21549,7 @@ See \`config.log' for more details" "$LINENO" 5; } cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. diff --git a/configure.ac b/configure.ac index 4b3bc520e..614f3ad1c 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_PREREQ(2.60) # # Set the package name and version # -AC_INIT(lcms2,2.16) +AC_INIT(lcms2,2.17) # Specify directory where m4 macros may be found. AC_CONFIG_MACRO_DIR([m4]) @@ -16,7 +16,7 @@ AC_CONFIG_MACRO_DIR([m4]) # Libtool library revision control info # LIBRARY_CURRENT=2 -LIBRARY_REVISION=16 +LIBRARY_REVISION=17 LIBRARY_AGE=0 AC_SUBST(LIBRARY_CURRENT)dnl diff --git a/ltmain.sh b/ltmain.sh old mode 100755 new mode 100644 index 9b12fbb7f..49fcad136 --- a/ltmain.sh +++ b/ltmain.sh @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.7 Debian-2.4.7-5" +VERSION=2.4.7 package_revision=2.4.7 @@ -430,7 +430,7 @@ EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. # putting '$debug_cmd' at the start of all your functions, you can get # bash to show function call trace with: # -# debug_cmd='echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name debug_cmd=${debug_cmd-":"} exit_cmd=: @@ -1706,8 +1706,6 @@ func_run_hooks () { $debug_cmd - _G_rc_run_hooks=false - case " $hookable_fns " in *" $1 "*) ;; *) func_fatal_error "'$1' does not support hook functions." ;; @@ -2308,12 +2306,12 @@ include the following information: compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.7-5 + version: $progname (GNU libtool) 2.4.7 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` Report bugs to . -GNU libtool home page: . +GNU libtool home page: . General help using GNU software: ." exit 0 } @@ -2512,8 +2510,6 @@ libtool_options_prep () _G_rc_lt_options_prep=: - _G_rc_lt_options_prep=: - # Shorthand for --mode=foo, only valid as the first argument case $1 in clean|clea|cle|cl) @@ -2672,17 +2668,10 @@ libtool_validate_options () # preserve --debug test : = "$debug_cmd" || func_append preserve_args " --debug" - case $host in - # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 - # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 - *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac + # Keeping compiler generated duplicates in $postdeps and $predeps is not + # harmful, and is necessary in a majority of systems that use it to satisfy + # symbol dependencies. + opt_duplicate_compiler_generated_deps=: $opt_help || { # Sanity checks first: @@ -7561,13 +7550,11 @@ func_mode_link () # -stdlib=* select c++ std lib with clang # -fsanitize=* Clang/GCC memory and address sanitizer # -fuse-ld=* Linker select flags for GCC - # -static-* direct GCC to link specific libraries statically - # -fcilkplus Cilk Plus language extension features for C/C++ # -Wa,* Pass flags directly to the assembler -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus|-Wa,*) + -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*) func_quote_arg pretty "$arg" arg=$func_quote_arg_result func_append compile_command " $arg" @@ -7860,10 +7847,7 @@ func_mode_link () case $pass in dlopen) libs=$dlfiles ;; dlpreopen) libs=$dlprefiles ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi if test lib,dlpreopen = "$linkmode,$pass"; then @@ -8182,19 +8166,19 @@ func_mode_link () # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done elif test prog != "$linkmode" && test lib != "$linkmode"; then func_fatal_error "'$lib' is not a convenience library" fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done continue fi # $pass = conv @@ -9118,9 +9102,6 @@ func_mode_link () revision=$number_minor lt_irix_increment=no ;; - *) - func_fatal_configuration "$modename: unknown library version type '$version_type'" - ;; esac ;; no) diff --git a/m4/libtool.m4 b/m4/libtool.m4 index e7b683345..e3adedad6 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -730,6 +730,7 @@ _LT_CONFIG_SAVE_COMMANDS([ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. @@ -2886,6 +2887,9 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -2894,7 +2898,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2906,18 +2910,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -3577,7 +3569,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4083,8 +4075,7 @@ _LT_EOF if AC_TRY_EVAL(ac_compile); then # Now try to grab the symbols. nlist=conftest.nm - $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD - if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -4456,7 +4447,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4724,12 +4715,6 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; - # flang / f18. f95 an alias for gfortran or flang on Debian - flang* | f18* | f95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -4974,9 +4959,6 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -5039,9 +5021,6 @@ dnl Note also adjust exclude_expsyms for C++ above. openbsd* | bitrig*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -5277,7 +5256,6 @@ _LT_EOF case $cc_basename in tcc*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' ;; xlf* | bgf* | bgxlf* | mpixlf*) @@ -5298,7 +5276,7 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5819,7 +5797,6 @@ _LT_EOF if test yes = "$lt_cv_irix_exported_symbol"; then _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' @@ -5837,12 +5814,11 @@ _LT_EOF # Fabrice Bellard et al's Tiny C Compiler _LT_TAGVAR(ld_shlibs, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6469,7 +6445,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else GXX=no @@ -6845,7 +6821,7 @@ if test yes != "$_lt_caught_CXX_error"; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -6910,7 +6886,7 @@ if test yes != "$_lt_caught_CXX_error"; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -7249,7 +7225,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # FIXME: insert proper C++ library support @@ -7333,7 +7309,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. @@ -7344,7 +7320,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' diff --git a/meson.build b/meson.build index 883cb5107..298f4a86b 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ project( 'Little-CMS', 'c', version: '2.16', - meson_version: '>=0.64.0', + meson_version: '>=0.63.0', # default_options: ['c_std=c99'] ) diff --git a/plugins/fast_float/include/lcms2_fast_float.h b/plugins/fast_float/include/lcms2_fast_float.h index 23ee50c0e..1f3290e34 100644 --- a/plugins/fast_float/include/lcms2_fast_float.h +++ b/plugins/fast_float/include/lcms2_fast_float.h @@ -30,7 +30,7 @@ extern "C" { # endif #endif -#define LCMS2_FAST_FLOAT_VERSION 1502 +#define LCMS2_FAST_FLOAT_VERSION LCMS_VERSION // Configuration toggles diff --git a/plugins/fast_float/src/meson.build b/plugins/fast_float/src/meson.build index c53639c7f..32e71e6d7 100644 --- a/plugins/fast_float/src/meson.build +++ b/plugins/fast_float/src/meson.build @@ -38,6 +38,7 @@ liblcms2_fast_float = library( dependencies: [liblcms2_dep, m_dep], include_directories: lcms2_fast_float_incdir, c_args: cargs, + version: library_version, install: true, ) diff --git a/plugins/threaded/include/lcms2_threaded.h b/plugins/threaded/include/lcms2_threaded.h index b664674bf..e8b729ff0 100644 --- a/plugins/threaded/include/lcms2_threaded.h +++ b/plugins/threaded/include/lcms2_threaded.h @@ -34,7 +34,7 @@ extern "C" { # endif #endif -#define LCMS2_THREADED_VERSION 1000 +#define LCMS2_THREADED_VERSION LCMS_VERSION // Configuration toggles diff --git a/plugins/threaded/src/lcms2_threaded.rc.in b/plugins/threaded/src/lcms2_threaded.rc.in index 3df6e221b..eb4c9d7c6 100644 --- a/plugins/threaded/src/lcms2_threaded.rc.in +++ b/plugins/threaded/src/lcms2_threaded.rc.in @@ -39,7 +39,7 @@ FILETYPE VFT_DLL VALUE "FileDescription", "Multithread plugin" VALUE "FileVersion", @LCMS2_VERSION@ VALUE "InternalName", "lcms2_threaded" - VALUE "LegalCopyright", "Copyright (C) Marti Maria 2022, GPL-3.0-or-later" + VALUE "LegalCopyright", "Copyright (C) Marti Maria 2024, GPL-3.0-or-later" VALUE "OriginalFilename", "lcms2_threaded.dll" VALUE "ProductName", "LittleCMS color engine" VALUE "ProductVersion", @LCMS2_VERSION@ diff --git a/plugins/threaded/src/meson.build b/plugins/threaded/src/meson.build index ef970552b..dd0f96dc2 100644 --- a/plugins/threaded/src/meson.build +++ b/plugins/threaded/src/meson.build @@ -23,6 +23,7 @@ liblcms2_threaded = library( include_directories: lcms2_threaded_incdir, dependencies: [ liblcms2_dep, threads_dep ], c_args: cargs, + version: library_version, install: true, ) diff --git a/testbed/meson.build b/testbed/meson.build index c387a0095..9e406db73 100644 --- a/testbed/meson.build +++ b/testbed/meson.build @@ -12,7 +12,8 @@ iccs = [ ] fs=import('fs') foreach icc : iccs - fs.copyfile(icc) + # fs.copyfile(icc) # DOES NOT WORK ON FEDORA 40 + configure_file(input : icc, output : icc, copy : true) endforeach testcms = executable( diff --git a/testbed/testcms2.c b/testbed/testcms2.c index e1a5fc771..58a739fc6 100644 --- a/testbed/testcms2.c +++ b/testbed/testcms2.c @@ -5201,7 +5201,6 @@ cmsInt32Number CheckVCGT(cmsInt32Number Pass, cmsHPROFILE hProfile) // Only one of the two following may be used, as they share the same tag -static cmsInt32Number CheckDictionary16(cmsInt32Number Pass, cmsHPROFILE hProfile) { cmsHANDLE hDict; @@ -5245,9 +5244,6 @@ cmsInt32Number CheckDictionary16(cmsInt32Number Pass, cmsHPROFILE hProfile) return 0; } - - -static cmsInt32Number CheckDictionary24(cmsInt32Number Pass, cmsHPROFILE hProfile) { cmsHANDLE hDict; @@ -9529,7 +9525,10 @@ int main(int argc, char* argv[]) cmsInt32Number DoSpeedTests = 1; cmsInt32Number DoCheckTests = 1; cmsInt32Number DoPluginTests = 1; + +#ifdef CMS_IS_WINDOWS_ cmsInt32Number DoZooTests = 0; +#endif #ifdef _MSC_VER _CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );