r13904 by jghali - msvc project update : remove libwpd/libwpg dependency following fork of libwpg

scribus-commit scribus-commit at lists.scribus.net
Wed Aug 26 05:54:12 CEST 2009


Revision: 13904
Author: jghali
Date: 2009-08-23T18:22:09.174626Z
Commit message: msvc project update : remove libwpd/libwpg dependency following fork of libwpg

Changeset: 
M  /trunk/Scribus/win32/vc8/Scribus-build.vsprops
M  /trunk/Scribus/win32/vc8/wpgimport/wpgimport.vcproj

Diffs:
Index: win32/vc8/wpgimport/wpgimport.vcproj
===================================================================
--- win32/vc8/wpgimport/wpgimport.vcproj	(revision 13903)
+++ win32/vc8/wpgimport/wpgimport.vcproj	(revision 13904)
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..\..\scribus;&quot;$(QT4_DIR)\include\QtCore&quot;;&quot;$(QT4_DIR)\include\QtGui&quot;;&quot;$(QT4_DIR)\include\QtXml&quot;;&quot;$(QT4_DIR)\include&quot;;&quot;$(QT4_DIR)\src\3rdparty\zlib&quot;;&quot;$(LCMS_DIR)\include&quot;;&quot;$(CAIRO_DIR)\include&quot;;&quot;$(FREETYPE_DIR)\include&quot;;&quot;$(LIBJPEG_DIR)\include&quot;;&quot;$(LIBTIFF_DIR)\include&quot;;&quot;$(LIBWPD_DIR)\include&quot;;&quot;$(LIBWPG_DIR)\include&quot;"
+				AdditionalIncludeDirectories="..;..\..\..\scribus;..\..\..\scribus\plugins\wpgimplugin\wpg;&quot;$(QT4_DIR)\include\QtCore&quot;;&quot;$(QT4_DIR)\include\QtGui&quot;;&quot;$(QT4_DIR)\include\QtXml&quot;;&quot;$(QT4_DIR)\include&quot;;&quot;$(QT4_DIR)\src\3rdparty\zlib&quot;;&quot;$(LCMS_DIR)\include&quot;;&quot;$(CAIRO_DIR)\include&quot;;&quot;$(FREETYPE_DIR)\include&quot;;&quot;$(LIBJPEG_DIR)\include&quot;;&quot;$(LIBTIFF_DIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;;HAVE_CAIRO;COMPILE_PLUGIN_AS_DLL;DOCDIR=\&quot;doc/\&quot;;ICONDIR=\&quot;icons/\&quot;;SAMPLESDIR=\&quot;samples/\&quot;;SCRIPTSDIR=\&quot;scripts/\&quot;;TEMPLATEDIR=\&quot;templates/\&quot;;LIBDIR=\&quot;libs/\&quot;;PLUGINDIR=\&quot;plugins/\&quot;;AVOID_WIN32_FILEIO"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -64,10 +64,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcmsd.lib libwpg-0.1d.lib libwpg-stream-0.1d.lib scribus-api.lib"
+				AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcmsd.lib scribus-api.lib"
 				OutputFile="$(OutDir)\importwpg.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(QT4_DIR)\lib&quot;;&quot;$(LIBWPG_DIR)\lib&quot;;&quot;$(OutDir)\..&quot;"
+				AdditionalLibraryDirectories="&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(QT4_DIR)\lib&quot;;&quot;$(OutDir)\..&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\importwpg.pdb"
 				SubSystem="2"
@@ -127,7 +127,7 @@
 				Optimization="1"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..;..\..\..\scribus;&quot;$(QT4_DIR)\include\QtCore&quot;;&quot;$(QT4_DIR)\include\QtGui&quot;;&quot;$(QT4_DIR)\include\QtXml&quot;;&quot;$(QT4_DIR)\include&quot;;&quot;$(QT4_DIR)\src\3rdparty\zlib&quot;;&quot;$(LCMS_DIR)\include&quot;;&quot;$(CAIRO_DIR)\include&quot;;&quot;$(FREETYPE_DIR)\include&quot;;&quot;$(LIBJPEG_DIR)\include&quot;;&quot;$(LIBTIFF_DIR)\include&quot;;&quot;$(LIBWPD_DIR)\include&quot;;&quot;$(LIBWPG_DIR)\include&quot;"
+				AdditionalIncludeDirectories="..;..\..\..\scribus;..\..\..\scribus\plugins\wpgimplugin\wpg;&quot;$(QT4_DIR)\include\QtCore&quot;;&quot;$(QT4_DIR)\include\QtGui&quot;;&quot;$(QT4_DIR)\include\QtXml&quot;;&quot;$(QT4_DIR)\include&quot;;&quot;$(QT4_DIR)\src\3rdparty\zlib&quot;;&quot;$(LCMS_DIR)\include&quot;;&quot;$(CAIRO_DIR)\include&quot;;&quot;$(FREETYPE_DIR)\include&quot;;&quot;$(LIBJPEG_DIR)\include&quot;;&quot;$(LIBTIFF_DIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;;HAVE_CAIRO;COMPILE_PLUGIN_AS_DLL;AVOID_WIN32_FILEIO"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -150,10 +150,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms.lib libwpg-0.1.lib libwpg-stream-0.1.lib scribus-api.lib"
+				AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms.lib scribus-api.lib"
 				OutputFile="$(OutDir)\importwpg.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(QT4_DIR)\lib&quot;;&quot;$(LIBWPG_DIR)\lib&quot;;&quot;$(OutDir)\..&quot;"
+				AdditionalLibraryDirectories="&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(QT4_DIR)\lib&quot;;&quot;$(OutDir)\..&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\importwpg.pdb"
 				SubSystem="2"
@@ -213,7 +213,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..\..\scribus;&quot;$(QT4_DIR)\include\QtCore&quot;;&quot;$(QT4_DIR)\include\QtGui&quot;;&quot;$(QT4_DIR)\include\QtXml&quot;;&quot;$(QT4_DIR)\include&quot;;&quot;$(QT4_DIR)\src\3rdparty\zlib&quot;;&quot;$(LCMS_DIR)\include&quot;;&quot;$(CAIRO_DIR)\include&quot;;&quot;$(FREETYPE_DIR)\include&quot;;&quot;$(LIBJPEG_DIR)\include&quot;;&quot;$(LIBTIFF_DIR)\include&quot;;&quot;$(LIBWPD_DIR)\include&quot;;&quot;$(LIBWPG_DIR)\include&quot;"
+				AdditionalIncludeDirectories="..;..\..\..\scribus;..\..\..\scribus\plugins\wpgimplugin\wpg;&quot;$(QT4_DIR)\include\QtCore&quot;;&quot;$(QT4_DIR)\include\QtGui&quot;;&quot;$(QT4_DIR)\include\QtXml&quot;;&quot;$(QT4_DIR)\include&quot;;&quot;$(QT4_DIR)\src\3rdparty\zlib&quot;;&quot;$(LCMS_DIR)\include&quot;;&quot;$(CAIRO_DIR)\include&quot;;&quot;$(FREETYPE_DIR)\include&quot;;&quot;$(LIBJPEG_DIR)\include&quot;;&quot;$(LIBTIFF_DIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;DOCDIR=\&quot;doc/\&quot;;ICONDIR=\&quot;icons/\&quot;;SAMPLESDIR=\&quot;samples/\&quot;;SCRIPTSDIR=\&quot;scripts/\&quot;;TEMPLATEDIR=\&quot;templates/\&quot;;LIBDIR=\&quot;libs/\&quot;;PLUGINDIR=\&quot;plugins/\&quot;;AVOID_WIN32_FILEIO"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -236,10 +236,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcmsd.lib libwpg-0.1d.lib libwpg-stream-0.1d.lib scribus-api.lib"
+				AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcmsd.lib scribus-api.lib"
 				OutputFile="$(OutDir)\importwpg.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(QT4_DIR)\lib&quot;;&quot;$(LIBWPG_DIR)\lib&quot;;&quot;$(OutDir)\..&quot;"
+				AdditionalLibraryDirectories="&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(QT4_DIR)\lib&quot;;&quot;$(OutDir)\..&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\importwpg.pdb"
 				SubSystem="2"
@@ -299,7 +299,7 @@
 				Optimization="1"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..;..\..\..\scribus;&quot;$(QT4_DIR)\include\QtCore&quot;;&quot;$(QT4_DIR)\include\QtGui&quot;;&quot;$(QT4_DIR)\include\QtXml&quot;;&quot;$(QT4_DIR)\include&quot;;&quot;$(QT4_DIR)\src\3rdparty\zlib&quot;;&quot;$(LCMS_DIR)\include&quot;;&quot;$(CAIRO_DIR)\include&quot;;&quot;$(FREETYPE_DIR)\include&quot;;&quot;$(LIBJPEG_DIR)\include&quot;;&quot;$(LIBTIFF_DIR)\include&quot;;&quot;$(LIBWPD_DIR)\include&quot;;&quot;$(LIBWPG_DIR)\include&quot;"
+				AdditionalIncludeDirectories="..;..\..\..\scribus;..\..\..\scribus\plugins\wpgimplugin\wpg;&quot;$(QT4_DIR)\include\QtCore&quot;;&quot;$(QT4_DIR)\include\QtGui&quot;;&quot;$(QT4_DIR)\include\QtXml&quot;;&quot;$(QT4_DIR)\include&quot;;&quot;$(QT4_DIR)\src\3rdparty\zlib&quot;;&quot;$(LCMS_DIR)\include&quot;;&quot;$(CAIRO_DIR)\include&quot;;&quot;$(FREETYPE_DIR)\include&quot;;&quot;$(LIBJPEG_DIR)\include&quot;;&quot;$(LIBTIFF_DIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;AVOID_WIN32_FILEIO"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -322,10 +322,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms.lib libwpg-0.1.lib libwpg-stream-0.1.lib scribus-api.lib"
+				AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms.lib scribus-api.lib"
 				OutputFile="$(OutDir)\importwpg.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(QT4_DIR)\lib&quot;;&quot;$(LIBWPG_DIR)\lib&quot;;&quot;$(OutDir)\..&quot;"
+				AdditionalLibraryDirectories="&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(QT4_DIR)\lib&quot;;&quot;$(OutDir)\..&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\importwpg.pdb"
 				SubSystem="2"
@@ -493,6 +493,174 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Wpg"
+			>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\libwpd_types.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\libwpg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\libwpg_utils.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPG1Parser.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPG1Parser.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPG2Parser.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPG2Parser.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGBinaryData.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGBinaryData.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGBitmap.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGBitmap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGBrush.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGBrush.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGColor.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGColor.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGGradient.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGGradient.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGHeader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGHeader.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGInternalStream.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGInternalStream.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGOLEStream.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGOLEStream.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGPaintInterface.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGPath.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGPath.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGPen.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGPen.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGPoint.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGPoint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGraphics.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGraphics.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGRect.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGRect.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGStreamImplementation.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGStreamImplementation.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGString.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGString.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGXParser.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGXParser.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPXStream.h"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
Index: win32/vc8/Scribus-build.vsprops
===================================================================
--- win32/vc8/Scribus-build.vsprops	(revision 13903)
+++ win32/vc8/Scribus-build.vsprops	(revision 13904)
@@ -41,14 +41,6 @@
 		Value="E:\Libs-msvc2005\podofo-0.7.0"
 	/>
 	<UserMacro
-		Name="LIBWPD_DIR"
-		Value="E:\Libs-msvc2005\libwpd-0.8.14"
-	/>
-	<UserMacro
-		Name="LIBWPG_DIR"
-		Value="E:\Libs-msvc2005\libwpg-0.1.3"
-	/>
-	<UserMacro
 		Name="LIBXML2_DIR"
 		Value="E:\Libs-msvc2005\libxml2-2.6.32+"
 	/>




More information about the scribus-commit mailing list