From 6f15a9e7816c2b8b46c2d91ef269efd1e1878f0d Mon Sep 17 00:00:00 2001 From: Marti Maria Date: Mon, 20 May 2013 16:12:06 +0200 Subject: Fixed VS2010 projects --- ChangeLog | 3 ++- Projects/VC2010/jpegicc/jpegicc.vcxproj | 15 +++++++++------ Projects/VC2010/lcms2_DLL/lcms2_DLL.vcxproj | 17 ++++++++++++----- Projects/VC2010/lcms2_static/lcms2_static.vcxproj | 7 ++++--- Projects/VC2010/linkicc/linkicc.vcxproj | 5 ++--- Projects/VC2010/psicc/psicc.vcxproj | 5 ++--- Projects/VC2010/testbed/testbed.vcxproj | 5 ++--- Projects/VC2010/tiffdiff/tiffdiff.vcxproj | 17 ++++++++++------- Projects/VC2010/tifficc/tifficc.vcxproj | 15 +++++++++------ Projects/VC2010/transicc/transicc.vcxproj | 3 +-- Projects/VC2012/lcms2_DLL/lcms2_DLL.vcxproj | 7 +++---- Projects/cppcheck/lcms2.cppcheck | 9 +++++++++ 12 files changed, 65 insertions(+), 43 deletions(-) create mode 100755 Projects/cppcheck/lcms2.cppcheck diff --git a/ChangeLog b/ChangeLog index 9f631b5..66a8a07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -107,4 +107,5 @@ Added TIFF Lab16 handling on tifficc Added some fixes from XhmikosR Fixed a bug in parametric curves Remove spurious tabs added by git merge of pull request -Added support for VS2012 \ No newline at end of file +Added support for VS2012 +Added a simple project for cppcheck \ No newline at end of file diff --git a/Projects/VC2010/jpegicc/jpegicc.vcxproj b/Projects/VC2010/jpegicc/jpegicc.vcxproj index 5941e85..a0493bc 100644 --- a/Projects/VC2010/jpegicc/jpegicc.vcxproj +++ b/Projects/VC2010/jpegicc/jpegicc.vcxproj @@ -84,17 +84,20 @@ - $(IncludePath);;C:\jpeg-8b - $(LibraryPath);;C:\jpeg-8b - $(IncludePath);;C:\jpeg-8b - $(LibraryPath);;C:\jpeg-8b + $(IncludePath);;C:\jpeg-8d + $(IncludePath);;C:\jpeg-8d + $(LibraryPath);C:\jpeg-8d\ + $(LibraryPath);;C:\jpeg-8d + $(IncludePath);;C:\jpeg-8d + $(IncludePath);;C:\jpeg-8d + $(LibraryPath);C:\jpeg-8d\ + $(LibraryPath);;C:\jpeg-8d Disabled ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL @@ -135,7 +138,7 @@ true ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL true diff --git a/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcxproj b/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcxproj index 45057bf..9c67c79 100644 --- a/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcxproj +++ b/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcxproj @@ -84,13 +84,16 @@ + lcms2 + lcms2 + lcms2 + lcms2 Disabled ../../../include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;CMS_DLL_BUILD;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL @@ -104,7 +107,7 @@ true Windows MachineX86 - ../../../bin/lcms2d.dll + $(OutDir)$(TargetName)$(TargetExt) @@ -121,10 +124,11 @@ true - ..\..\..\src\lcms2.def + + true Windows - ../../../bin/lcms2d.dll + $(OutDir)$(TargetName)$(TargetExt) @@ -154,6 +158,7 @@ true true MachineX86 + $(OutDir)$(TargetName)$(TargetExt) @@ -177,11 +182,13 @@ true - ..\..\..\src\lcms2.def + + true Windows true true + $(OutDir)$(TargetName)$(TargetExt) diff --git a/Projects/VC2010/lcms2_static/lcms2_static.vcxproj b/Projects/VC2010/lcms2_static/lcms2_static.vcxproj index b448e67..f0aebf9 100644 --- a/Projects/VC2010/lcms2_static/lcms2_static.vcxproj +++ b/Projects/VC2010/lcms2_static/lcms2_static.vcxproj @@ -86,9 +86,8 @@ Disabled ../../../include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL Level4 @@ -96,6 +95,8 @@ true + + @@ -120,7 +121,7 @@ true ../../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL true diff --git a/Projects/VC2010/linkicc/linkicc.vcxproj b/Projects/VC2010/linkicc/linkicc.vcxproj index b8022fe..5db9ea1 100644 --- a/Projects/VC2010/linkicc/linkicc.vcxproj +++ b/Projects/VC2010/linkicc/linkicc.vcxproj @@ -90,9 +90,8 @@ Disabled ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true EnableFastChecks - MultiThreadedDebug + MultiThreadedDLL Level4 @@ -129,7 +128,7 @@ true ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL true diff --git a/Projects/VC2010/psicc/psicc.vcxproj b/Projects/VC2010/psicc/psicc.vcxproj index 32e87d1..2b4610f 100644 --- a/Projects/VC2010/psicc/psicc.vcxproj +++ b/Projects/VC2010/psicc/psicc.vcxproj @@ -90,9 +90,8 @@ Disabled ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true EnableFastChecks - MultiThreadedDebug + MultiThreadedDLL Level4 @@ -129,7 +128,7 @@ true ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL true diff --git a/Projects/VC2010/testbed/testbed.vcxproj b/Projects/VC2010/testbed/testbed.vcxproj index 01bebe8..fc92b0c 100644 --- a/Projects/VC2010/testbed/testbed.vcxproj +++ b/Projects/VC2010/testbed/testbed.vcxproj @@ -90,9 +90,8 @@ Disabled ../../../include;../../../src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL Level3 @@ -134,7 +133,7 @@ true ../../../include;../../../src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL false true NotSet diff --git a/Projects/VC2010/tiffdiff/tiffdiff.vcxproj b/Projects/VC2010/tiffdiff/tiffdiff.vcxproj index 49da2cd..311f836 100644 --- a/Projects/VC2010/tiffdiff/tiffdiff.vcxproj +++ b/Projects/VC2010/tiffdiff/tiffdiff.vcxproj @@ -84,19 +84,22 @@ - $(IncludePath);;C:\tiff-3.9.4\libtiff - $(LibraryPath);;C:\tiff-3.9.4\libtiff - $(IncludePath);;C:\tiff-3.9.4\libtiff - $(LibraryPath);;C:\tiff-3.9.4\libtiff + 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 - MultiThreadedDebug + MultiThreadedDebugDLL Level4 @@ -135,7 +138,7 @@ true ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL true diff --git a/Projects/VC2010/tifficc/tifficc.vcxproj b/Projects/VC2010/tifficc/tifficc.vcxproj index 38358f7..9abce92 100644 --- a/Projects/VC2010/tifficc/tifficc.vcxproj +++ b/Projects/VC2010/tifficc/tifficc.vcxproj @@ -84,17 +84,20 @@ - $(IncludePath);C:\tiff-3.9.4\libtiff - $(LibraryPath);C:\tiff-3.9.4\libtiff - $(IncludePath);C:\tiff-3.9.4\libtiff - $(LibraryPath);C:\tiff-3.9.4\libtiff + $(IncludePath);;C:\tiff-4.0.2\libtiff + $(IncludePath);;C:\tiff-4.0.2\libtiff + $(LibraryPath);;C:\tiff-4.0.2\libtiff + $(LibraryPath);;C:\tiff-4.0.2\libtiff + $(IncludePath);;C:\tiff-4.0.2\libtiff + $(IncludePath);;C:\tiff-4.0.2\libtiff + $(LibraryPath);;C:\tiff-4.0.2\libtiff + $(LibraryPath);;C:\tiff-4.0.2\libtiff Disabled ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL @@ -135,7 +138,7 @@ true ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL true diff --git a/Projects/VC2010/transicc/transicc.vcxproj b/Projects/VC2010/transicc/transicc.vcxproj index 85002e1..5c27ff6 100644 --- a/Projects/VC2010/transicc/transicc.vcxproj +++ b/Projects/VC2010/transicc/transicc.vcxproj @@ -90,7 +90,6 @@ Disabled ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL @@ -129,7 +128,7 @@ true ../../../include;../../../utils/common;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL true diff --git a/Projects/VC2012/lcms2_DLL/lcms2_DLL.vcxproj b/Projects/VC2012/lcms2_DLL/lcms2_DLL.vcxproj index bf13074..43595f0 100755 --- a/Projects/VC2012/lcms2_DLL/lcms2_DLL.vcxproj +++ b/Projects/VC2012/lcms2_DLL/lcms2_DLL.vcxproj @@ -90,13 +90,13 @@ - lcms2d + lcms2 lcms2 - lcms2d + lcms2 lcms2 @@ -120,7 +120,6 @@ true Windows MachineX86 - ../../../bin/lcms2d.dll @@ -141,7 +140,7 @@ true Windows - ../../../bin/lcms2d.dll + $(OutDir)$(TargetName)$(TargetExt) diff --git a/Projects/cppcheck/lcms2.cppcheck b/Projects/cppcheck/lcms2.cppcheck new file mode 100755 index 0000000..751884f --- /dev/null +++ b/Projects/cppcheck/lcms2.cppcheck @@ -0,0 +1,9 @@ + + + + + + + + + -- cgit v1.2.1