r14089 by jghali - mcvs project update

scribus-commit scribus-commit at lists.scribus.net
Sun Oct 4 17:20:22 CEST 2009


Revision: 14089
Author: jghali
Date: 2009-10-04T15:20:01.124954Z
Commit message: mcvs project update

Changeset: 
M  /trunk/Scribus/win32/vc8/wpgimport/wpgimport.vcproj
A  /trunk/Scribus/win32/vc8/scribus-wpg
M  /trunk/Scribus/win32/vc8/Scribus.sln
M  /trunk/Scribus/win32/vc8/Scribus.vcproj
A  /trunk/Scribus/win32/vc8/scribus-wpg/scribus-wpg.vcproj

Diffs:
Index: win32/vc8/wpgimport/wpgimport.vcproj
===================================================================
--- win32/vc8/wpgimport/wpgimport.vcproj	(revision 14088)
+++ win32/vc8/wpgimport/wpgimport.vcproj	(revision 14089)
@@ -64,7 +64,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcmsd.lib scribus-api.lib"
+				AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcmsd.lib scribus-api.lib scribus-wpg.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;$(OutDir)\..&quot;"
@@ -150,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms.lib scribus-api.lib"
+				AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms.lib scribus-api.lib scribus-wpg.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;$(OutDir)\..&quot;"
@@ -236,7 +236,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcmsd.lib scribus-api.lib"
+				AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcmsd.lib scribus-api.lib scribus-wpg.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;$(OutDir)\..&quot;"
@@ -322,7 +322,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms.lib scribus-api.lib"
+				AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms.lib scribus-api.lib scribus-wpg.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;$(OutDir)\..&quot;"
@@ -493,174 +493,6 @@
 				>
 			</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.sln
===================================================================
--- win32/vc8/Scribus.sln	(revision 14088)
+++ win32/vc8/Scribus.sln	(revision 14089)
@@ -1,6 +1,9 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual C++ Express 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scribus-main", "Scribus.vcproj", "{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{50C264A1-2CE7-46A3-8C79-CBC714C49510} = {50C264A1-2CE7-46A3-8C79-CBC714C49510}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "svgexport", "svgexport\svgexport.vcproj", "{9652EA11-AFA0-4CDF-88AC-7912C653EFE6}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -196,6 +199,7 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wpgimport", "wpgimport\wpgimport.vcproj", "{A2A76BE2-A592-43A1-B087-068D6E082340}"
 	ProjectSection(ProjectDependencies) = postProject
 		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
+		{50C264A1-2CE7-46A3-8C79-CBC714C49510} = {50C264A1-2CE7-46A3-8C79-CBC714C49510}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pctimport", "pctimport\pctimport.vcproj", "{DB5B98E3-34C2-4909-87C6-4950BCFC9CA3}"
@@ -208,6 +212,8 @@
 		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scribus-wpg", "scribus-wpg\scribus-wpg.vcproj", "{50C264A1-2CE7-46A3-8C79-CBC714C49510}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug-arthur|Win32 = Debug-arthur|Win32
@@ -560,6 +566,14 @@
 		{9D13FB34-9EC8-4BA5-B851-3FA6864EC3FB}.Release-arthur|Win32.Build.0 = Release-arthur|Win32
 		{9D13FB34-9EC8-4BA5-B851-3FA6864EC3FB}.Release-cairo|Win32.ActiveCfg = Release-cairo|Win32
 		{9D13FB34-9EC8-4BA5-B851-3FA6864EC3FB}.Release-cairo|Win32.Build.0 = Release-cairo|Win32
+		{50C264A1-2CE7-46A3-8C79-CBC714C49510}.Debug-arthur|Win32.ActiveCfg = Debug-arthur|Win32
+		{50C264A1-2CE7-46A3-8C79-CBC714C49510}.Debug-arthur|Win32.Build.0 = Debug-arthur|Win32
+		{50C264A1-2CE7-46A3-8C79-CBC714C49510}.Debug-cairo|Win32.ActiveCfg = Debug-cairo|Win32
+		{50C264A1-2CE7-46A3-8C79-CBC714C49510}.Debug-cairo|Win32.Build.0 = Debug-cairo|Win32
+		{50C264A1-2CE7-46A3-8C79-CBC714C49510}.Release-arthur|Win32.ActiveCfg = Release-arthur|Win32
+		{50C264A1-2CE7-46A3-8C79-CBC714C49510}.Release-arthur|Win32.Build.0 = Release-arthur|Win32
+		{50C264A1-2CE7-46A3-8C79-CBC714C49510}.Release-cairo|Win32.ActiveCfg = Release-cairo|Win32
+		{50C264A1-2CE7-46A3-8C79-CBC714C49510}.Release-cairo|Win32.Build.0 = Release-cairo|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
Index: win32/vc8/scribus-wpg/scribus-wpg.vcproj
===================================================================
--- win32/vc8/scribus-wpg/scribus-wpg.vcproj	(revision 0)
+++ win32/vc8/scribus-wpg/scribus-wpg.vcproj	(revision 14089)
@@ -0,0 +1,465 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="scribus-wpg"
+	ProjectGUID="{50C264A1-2CE7-46A3-8C79-CBC714C49510}"
+	RootNamespace="scribuswpg"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug-cairo|Win32"
+			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc8-$(ConfigurationName)\scribus"
+			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc8\$(ConfigurationName)\$(TargetName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\Scribus-build.vsprops"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\vc8;&quot;$(QT4_DIR)\include\QtCore&quot;;&quot;$(QT4_DIR)\include\QtGui&quot;;&quot;$(QT4_DIR)\include\QtNetwork&quot;;&quot;$(QT4_DIR)\include\QtXml&quot;;&quot;$(QT4_DIR)\include&quot;;&quot;$(QT4_DIR)\src\3rdparty\zlib&quot;;&quot;$(BOOST_DIR)&quot;;&quot;$(FREETYPE_DIR)\include&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4005;4244;4251;4258;4267;4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\scribus-wpg.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release-cairo|Win32"
+			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc8-$(ConfigurationName)\scribus"
+			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc8\$(ConfigurationName)\$(TargetName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\Scribus-build.vsprops"
+			CharacterSet="1"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\vc8;&quot;$(QT4_DIR)\include\QtCore&quot;;&quot;$(QT4_DIR)\include\QtGui&quot;;&quot;$(QT4_DIR)\include\QtNetwork&quot;;&quot;$(QT4_DIR)\include\QtXml&quot;;&quot;$(QT4_DIR)\include&quot;;&quot;$(QT4_DIR)\src\3rdparty\zlib&quot;;&quot;$(BOOST_DIR)&quot;;&quot;$(FREETYPE_DIR)\include&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4005;4244;4251;4258;4267;4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\scribus-wpg.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug-arthur|Win32"
+			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc8-$(ConfigurationName)\scribus"
+			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc8\$(ConfigurationName)\$(TargetName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\Scribus-build.vsprops"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\vc8;&quot;$(QT4_DIR)\include\QtCore&quot;;&quot;$(QT4_DIR)\include\QtGui&quot;;&quot;$(QT4_DIR)\include\QtNetwork&quot;;&quot;$(QT4_DIR)\include\QtXml&quot;;&quot;$(QT4_DIR)\include&quot;;&quot;$(QT4_DIR)\src\3rdparty\zlib&quot;;&quot;$(BOOST_DIR)&quot;;&quot;$(FREETYPE_DIR)\include&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4005;4244;4251;4258;4267;4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\scribus-wpg.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release-arthur|Win32"
+			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc8-$(ConfigurationName)\scribus"
+			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc8\$(ConfigurationName)\$(TargetName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\Scribus-build.vsprops"
+			CharacterSet="1"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\vc8;&quot;$(QT4_DIR)\include\QtCore&quot;;&quot;$(QT4_DIR)\include\QtGui&quot;;&quot;$(QT4_DIR)\include\QtNetwork&quot;;&quot;$(QT4_DIR)\include\QtXml&quot;;&quot;$(QT4_DIR)\include&quot;;&quot;$(QT4_DIR)\src\3rdparty\zlib&quot;;&quot;$(BOOST_DIR)&quot;;&quot;$(FREETYPE_DIR)\include&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4005;4244;4251;4258;4267;4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\scribus-wpg.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Sources Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPG1Parser.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPG2Parser.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGBinaryData.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGBitmap.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGBrush.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGColor.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGGradient.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGHeader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGInternalStream.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGOLEStream.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGPath.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGPen.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGPoint.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGraphics.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGRect.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGStreamImplementation.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGString.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGXParser.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<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.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPG2Parser.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGBinaryData.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGBitmap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGBrush.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGColor.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGGradient.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGHeader.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGInternalStream.h"
+				>
+			</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.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGPen.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGPoint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGraphics.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGRect.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGStreamImplementation.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGString.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGXParser.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPXStream.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
Index: win32/vc8/Scribus.vcproj
===================================================================
--- win32/vc8/Scribus.vcproj	(revision 14088)
+++ win32/vc8/Scribus.vcproj	(revision 14089)
@@ -69,10 +69,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib QtWebKitd4.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 QtWebKitd4.lib freetypeD.lib cairo2d.lib libjpeg.a libtiff.lib lcmsd.lib mscms.lib PoDoFoLibD.lib WSock32.Lib scribus-wpg.lib"
 				OutputFile="$(OutDir)\Scribus.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(QT4_DIR)\lib&quot;;&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(CAIRO_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(PODOFO_DIR)\lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(QT4_DIR)\lib&quot;;&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(CAIRO_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(PODOFO_DIR)\lib&quot;;&quot;$(OutDir)\.&quot;"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				AssemblyDebug="0"
@@ -161,10 +161,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib QtWebKit4.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 QtWebKit4.lib qtmain.lib freetype.lib cairo2.lib libjpeg.a libtiff.lib lcms.lib mscms.lib PoDoFoLib.lib WSock32.Lib scribus-wpg.lib"
 				OutputFile="$(OutDir)\Scribus.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(QT4_DIR)\lib&quot;;&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(CAIRO_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(PODOFO_DIR)\lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(QT4_DIR)\lib&quot;;&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(CAIRO_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(PODOFO_DIR)\lib&quot;;&quot;$(OutDir)\.&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\Scribus.pdb"
 				SubSystem="2"
@@ -253,10 +253,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib QtWebKitd4.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 QtWebKitd4.lib freetypeD.lib cairo2d.lib libjpeg.a libtiff.lib lcmsd.lib mscms.lib PoDoFoLibD.lib WSock32.Lib scribus-wpg.lib"
 				OutputFile="$(OutDir)\Scribus.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(QT4_DIR)\lib&quot;;&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(CAIRO_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(PODOFO_DIR)\lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(QT4_DIR)\lib&quot;;&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(CAIRO_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(PODOFO_DIR)\lib&quot;;&quot;$(OutDir)\.&quot;"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				AssemblyDebug="0"
@@ -345,10 +345,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib QtWebKit4.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 QtWebKit4.lib qtmain.lib freetype.lib cairo2.lib libjpeg.a libtiff.lib lcms.lib mscms.lib PoDoFoLib.lib WSock32.Lib scribus-wpg.lib"
 				OutputFile="$(OutDir)\Scribus.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(QT4_DIR)\lib&quot;;&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(CAIRO_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(PODOFO_DIR)\lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(QT4_DIR)\lib&quot;;&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(CAIRO_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(PODOFO_DIR)\lib&quot;;&quot;$(OutDir)\.&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\Scribus.pdb"
 				SubSystem="2"
@@ -1536,6 +1536,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\scimgdataloader_wpg.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\scinputdialog.cpp"
 				>
 			</File>
@@ -9517,7 +9521,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Moc&apos;ing $(InputFileName)"
-						CommandLine="$(QT4_DIR)\bin\moc.exe &quot;$(InputPath)&quot; -o  &quot;$(InputDir)\moc_$(InputName).cpp&quot;"
+						CommandLine="$(QT4_DIR)\bin\moc.exe &quot;$(InputPath)&quot; -o  &quot;$(InputDir)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QT4_DIR)\bin\moc.exe"
 						Outputs="$(InputDir)\moc_$(InputName).cpp"
 					/>
@@ -9528,7 +9532,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Moc&apos;ing $(InputFileName)"
-						CommandLine="$(QT4_DIR)\bin\moc.exe &quot;$(InputPath)&quot; -o  &quot;$(InputDir)\moc_$(InputName).cpp&quot;"
+						CommandLine="$(QT4_DIR)\bin\moc.exe &quot;$(InputPath)&quot; -o  &quot;$(InputDir)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QT4_DIR)\bin\moc.exe"
 						Outputs="$(InputDir)\moc_$(InputName).cpp"
 					/>
@@ -9539,7 +9543,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Moc&apos;ing $(InputFileName)"
-						CommandLine="$(QT4_DIR)\bin\moc.exe &quot;$(InputPath)&quot; -o  &quot;$(InputDir)\moc_$(InputName).cpp&quot;"
+						CommandLine="$(QT4_DIR)\bin\moc.exe &quot;$(InputPath)&quot; -o  &quot;$(InputDir)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QT4_DIR)\bin\moc.exe"
 						Outputs="$(InputDir)\moc_$(InputName).cpp"
 					/>
@@ -9550,7 +9554,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Moc&apos;ing $(InputFileName)"
-						CommandLine="$(QT4_DIR)\bin\moc.exe &quot;$(InputPath)&quot; -o  &quot;$(InputDir)\moc_$(InputName).cpp&quot;"
+						CommandLine="$(QT4_DIR)\bin\moc.exe &quot;$(InputPath)&quot; -o  &quot;$(InputDir)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="$(QT4_DIR)\bin\moc.exe"
 						Outputs="$(InputDir)\moc_$(InputName).cpp"
 					/>
@@ -11037,6 +11041,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\scimgdataloader_wpg.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\scinputdialog.h"
 				>
 				<FileConfiguration




More information about the scribus-commit mailing list