r16685 by jghali - msvc project update : switch to lcms2

[scribus-commit]

Author: jghali
Date: Mon Jun 20 21:07:35 2011
New Revision: 16685

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16685
Log:
msvc project update : switch to lcms2

Modified:
    branches/Version135/Scribus/win32/vc9/Scribus-1.3.x.vcproj
    branches/Version135/Scribus/win32/vc9/Scribus-build.vsprops
    branches/Version135/Scribus/win32/vc9/win-config.h

Modified: branches/Version135/Scribus/win32/vc9/Scribus-1.3.x.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16685&path=/branches/Version135/Scribus/win32/vc9/Scribus-1.3.x.vcproj
==============================================================================
--- branches/Version135/Scribus/win32/vc9/Scribus-1.3.x.vcproj (original)
+++ branches/Version135/Scribus/win32/vc9/Scribus-1.3.x.vcproj Mon Jun 20 21:07:35 2011
@@ -85,7 +85,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib freetypeD.lib cairo2d.lib libjpeg.a libtiff.lib lcmsd.lib mscms.lib PoDoFoLibD.lib WSock32.Lib"
+				AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib freetypeD.lib cairo2d.lib libjpeg.a libtiff.lib lcms2_staticd.lib mscms.lib PoDoFoLibD.lib WSock32.Lib"
 				OutputFile="$(OutDir)\Scribus.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib""
@@ -187,7 +187,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib qtmain.lib freetype.lib cairo2.lib libjpeg.a libtiff.lib lcms.lib mscms.lib PoDoFoLib.lib WSock32.Lib"
+				AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib qtmain.lib freetype.lib cairo2.lib libjpeg.a libtiff.lib lcms2_static.lib mscms.lib PoDoFoLib.lib WSock32.Lib"
 				OutputFile="$(OutDir)\Scribus.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib""
@@ -290,7 +290,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib freetypeD.lib cairo2d.lib libjpeg.a libtiff.lib lcmsd.lib mscms.lib PoDoFoLibD.lib WSock32.Lib"
+				AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib freetypeD.lib cairo2d.lib libjpeg.a libtiff.lib lcms2_staticd.lib mscms.lib PoDoFoLibD.lib WSock32.Lib"
 				OutputFile="$(OutDir)\Scribus.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib""
@@ -393,7 +393,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib qtmain.lib freetype.lib cairo2.lib libjpeg.a libtiff.lib lcms.lib mscms.lib PoDoFoLib.lib WSock32.Lib"
+				AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib qtmain.lib freetype.lib cairo2.lib libjpeg.a libtiff.lib lcms2_static.lib mscms.lib PoDoFoLib.lib WSock32.Lib"
 				OutputFile="$(OutDir)\Scribus.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib""
@@ -1915,10 +1915,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\scribus\util_cms.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\scribus\util_color.cpp"
 				>
 			</File>
@@ -9856,10 +9852,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\scribus\util_cms.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\scribus\util_color.h"
 				>
 			</File>
@@ -11480,27 +11472,27 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\scribus\colormgmt\sclcmscolormgmtengineimpl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\scribus\colormgmt\sclcmscolormgmtengineimpl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\scribus\colormgmt\sclcmscolorprofileimpl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\scribus\colormgmt\sclcmscolorprofileimpl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\scribus\colormgmt\sclcmscolortransformimpl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\scribus\colormgmt\sclcmscolortransformimpl.h"
+				RelativePath="..\..\scribus\colormgmt\sclcms2colormgmtengineimpl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\scribus\colormgmt\sclcms2colormgmtengineimpl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\scribus\colormgmt\sclcms2colorprofileimpl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\scribus\colormgmt\sclcms2colorprofileimpl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\scribus\colormgmt\sclcms2colortransformimpl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\scribus\colormgmt\sclcms2colortransformimpl.h"
 				>
 			</File>
 		</Filter>

Modified: branches/Version135/Scribus/win32/vc9/Scribus-build.vsprops
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16685&path=/branches/Version135/Scribus/win32/vc9/Scribus-build.vsprops
==============================================================================
--- branches/Version135/Scribus/win32/vc9/Scribus-build.vsprops (original)
+++ branches/Version135/Scribus/win32/vc9/Scribus-build.vsprops Mon Jun 20 21:07:35 2011
@@ -26,7 +26,7 @@
 	/>
 	<UserMacro
 		Name="LCMS_DIR"
-		Value="F:\Libraries-vc9\lcms-1.16"
+		Value="F:\Libraries-vc9\lcms2-2.1"
 	/>
 	<UserMacro
 		Name="LIBJPEG_DIR"

Modified: branches/Version135/Scribus/win32/vc9/win-config.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16685&path=/branches/Version135/Scribus/win32/vc9/win-config.h
==============================================================================
--- branches/Version135/Scribus/win32/vc9/win-config.h (original)
+++ branches/Version135/Scribus/win32/vc9/win-config.h Mon Jun 20 21:07:35 2011
@@ -15,6 +15,9 @@
 
 /* ColorManagement (LittleCms) */
 #define HAVE_CMS 1
+
+/* ColorManagement (LittleCms 2.1) */
+#define HAVE_LCMS21 1
 
 /* ColorManagement (Windows) */
 #define HAVE_ICM 1