r14355 by jghali - msvc project update

scribus-commit scribus-commit at lists.scribus.net
Wed Nov 25 23:25:51 CET 2009


Revision: 14355
Author: jghali
Date: 2009-11-25T13:05:47.809957Z
Commit message: msvc project update

Changeset: 
M  /trunk/Scribus/win32/vc8/wpgimport/wpgimport.vcproj
M  /trunk/Scribus/win32/vc8/xfigimport/xfigimport.vcproj
M  /trunk/Scribus/win32/vc8/pctimport/pctimport.vcproj
M  /trunk/Scribus/win32/vc8/cvgimport/cvgimport.vcproj
M  /trunk/Scribus/win32/vc8/svgimport/svgimport.vcproj
M  /trunk/Scribus/win32/vc8/aiimport/aiimport.vcproj
M  /trunk/Scribus/win32/vc8/uniconvimport/uniconvimport.vcproj
M  /trunk/Scribus/win32/vc8/wmfimport/wmfimport.vcproj
M  /trunk/Scribus/win32/vc8/psimport/psimport.vcproj
M  /trunk/Scribus/win32/vc8/scribus-wpg/scribus-wpg.vcproj

Diffs:
Index: win32/vc8/wpgimport/wpgimport.vcproj
===================================================================
--- win32/vc8/wpgimport/wpgimport.vcproj	(revision 14354)
+++ win32/vc8/wpgimport/wpgimport.vcproj	(revision 14355)
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				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;"
+				AdditionalIncludeDirectories="..;..\..\..\scribus;..\..\..\scribus\plugins\import\wpg\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"
@@ -127,7 +127,7 @@
 				Optimization="1"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				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;"
+				AdditionalIncludeDirectories="..;..\..\..\scribus;..\..\..\scribus\plugins\import\wpg\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"
@@ -213,7 +213,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				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;"
+				AdditionalIncludeDirectories="..;..\..\..\scribus;..\..\..\scribus\plugins\import\wpg\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"
@@ -299,7 +299,7 @@
 				Optimization="1"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				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;"
+				AdditionalIncludeDirectories="..;..\..\..\scribus;..\..\..\scribus\plugins\import\wpg\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"
@@ -368,11 +368,11 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\importwpg.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\importwpg.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\importwpgplugin.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\importwpgplugin.cpp"
 				>
 			</File>
 			<File
@@ -385,7 +385,7 @@
 			Filter="h;hpp;hxx;hm;inl;inc"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\importwpg.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\importwpg.h"
 				>
 				<FileConfiguration
 					Name="Debug-cairo|Win32"
@@ -433,7 +433,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\importwpgplugin.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\importwpgplugin.h"
 				>
 				<FileConfiguration
 					Name="Debug-cairo|Win32"
@@ -485,11 +485,11 @@
 			Name="Generated Moc Files"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\moc_importwpg.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\moc_importwpg.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\moc_importwpgplugin.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\moc_importwpgplugin.cpp"
 				>
 			</File>
 		</Filter>
Index: win32/vc8/xfigimport/xfigimport.vcproj
===================================================================
--- win32/vc8/xfigimport/xfigimport.vcproj	(revision 14354)
+++ win32/vc8/xfigimport/xfigimport.vcproj	(revision 14355)
@@ -367,11 +367,11 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\xfigimplugin\importxfig.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\xfig\importxfig.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\xfigimplugin\importxfigplugin.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\xfig\importxfigplugin.cpp"
 				>
 			</File>
 			<File
@@ -384,7 +384,7 @@
 			Filter="h;hpp;hxx;hm;inl;inc"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\xfigimplugin\importxfig.h"
+				RelativePath="..\..\..\scribus\plugins\import\xfig\importxfig.h"
 				>
 				<FileConfiguration
 					Name="Debug-cairo|Win32"
@@ -432,7 +432,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\xfigimplugin\importxfigplugin.h"
+				RelativePath="..\..\..\scribus\plugins\import\xfig\importxfigplugin.h"
 				>
 				<FileConfiguration
 					Name="Debug-cairo|Win32"
@@ -484,11 +484,11 @@
 			Name="Generated Moc Files"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\xfigimplugin\moc_importxfig.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\xfig\moc_importxfig.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\xfigimplugin\moc_importxfigplugin.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\xfig\moc_importxfigplugin.cpp"
 				>
 			</File>
 		</Filter>
Index: win32/vc8/svgimport/svgimport.vcproj
===================================================================
--- win32/vc8/svgimport/svgimport.vcproj	(revision 14354)
+++ win32/vc8/svgimport/svgimport.vcproj	(revision 14355)
@@ -371,7 +371,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\svgimplugin\svgplugin.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\svg\svgplugin.cpp"
 				>
 			</File>
 		</Filter>
@@ -380,7 +380,7 @@
 			Filter="h;hpp;hxx;hm;inl;inc"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\svgimplugin\svgplugin.h"
+				RelativePath="..\..\..\scribus\plugins\import\svg\svgplugin.h"
 				>
 				<FileConfiguration
 					Name="Debug-cairo|Win32"
@@ -432,7 +432,7 @@
 			Name="Generated Moc Files"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\svgimplugin\moc_svgplugin.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\svg\moc_svgplugin.cpp"
 				>
 			</File>
 		</Filter>
Index: win32/vc8/uniconvimport/uniconvimport.vcproj
===================================================================
--- win32/vc8/uniconvimport/uniconvimport.vcproj	(revision 14354)
+++ win32/vc8/uniconvimport/uniconvimport.vcproj	(revision 14355)
@@ -371,7 +371,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\uniconvertorplugin\uniconvplugin.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\uniconvertor\uniconvplugin.cpp"
 				>
 			</File>
 		</Filter>
@@ -380,7 +380,7 @@
 			Filter="h;hpp;hxx;hm;inl;inc"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\uniconvertorplugin\uniconvplugin.h"
+				RelativePath="..\..\..\scribus\plugins\import\uniconvertor\uniconvplugin.h"
 				>
 				<FileConfiguration
 					Name="Debug-cairo|Win32"
@@ -432,7 +432,7 @@
 			Name="Generated Moc Files"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\uniconvertorplugin\moc_uniconvplugin.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\uniconvertor\moc_uniconvplugin.cpp"
 				>
 			</File>
 		</Filter>
Index: win32/vc8/psimport/psimport.vcproj
===================================================================
--- win32/vc8/psimport/psimport.vcproj	(revision 14354)
+++ win32/vc8/psimport/psimport.vcproj	(revision 14355)
@@ -367,11 +367,11 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\psimport\importps.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\ps\importps.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\psimport\importpsplugin.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\ps\importpsplugin.cpp"
 				>
 			</File>
 			<File
@@ -384,7 +384,7 @@
 			Filter="h;hpp;hxx;hm;inl;inc"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\psimport\importps.h"
+				RelativePath="..\..\..\scribus\plugins\import\ps\importps.h"
 				>
 				<FileConfiguration
 					Name="Debug-cairo|Win32"
@@ -432,7 +432,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\psimport\importpsplugin.h"
+				RelativePath="..\..\..\scribus\plugins\import\ps\importpsplugin.h"
 				>
 				<FileConfiguration
 					Name="Debug-cairo|Win32"
@@ -484,11 +484,11 @@
 			Name="Generated Moc Files"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\psimport\moc_importps.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\ps\moc_importps.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\psimport\moc_importpsplugin.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\ps\moc_importpsplugin.cpp"
 				>
 			</File>
 		</Filter>
Index: win32/vc8/pctimport/pctimport.vcproj
===================================================================
--- win32/vc8/pctimport/pctimport.vcproj	(revision 14354)
+++ win32/vc8/pctimport/pctimport.vcproj	(revision 14355)
@@ -367,11 +367,11 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\pctimplugin\importpct.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\pct\importpct.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\pctimplugin\importpctplugin.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\pct\importpctplugin.cpp"
 				>
 			</File>
 			<File
@@ -384,7 +384,7 @@
 			Filter="h;hpp;hxx;hm;inl;inc"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\pctimplugin\importpct.h"
+				RelativePath="..\..\..\scribus\plugins\import\pct\importpct.h"
 				>
 				<FileConfiguration
 					Name="Debug-cairo|Win32"
@@ -432,7 +432,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\pctimplugin\importpctplugin.h"
+				RelativePath="..\..\..\scribus\plugins\import\pct\importpctplugin.h"
 				>
 				<FileConfiguration
 					Name="Debug-cairo|Win32"
@@ -484,11 +484,11 @@
 			Name="Generated Moc Files"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\pctimplugin\moc_importpct.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\pct\moc_importpct.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\pctimplugin\moc_importpctplugin.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\pct\moc_importpctplugin.cpp"
 				>
 			</File>
 		</Filter>
Index: win32/vc8/aiimport/aiimport.vcproj
===================================================================
--- win32/vc8/aiimport/aiimport.vcproj	(revision 14354)
+++ win32/vc8/aiimport/aiimport.vcproj	(revision 14355)
@@ -371,11 +371,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\aiimplugin\importai.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\ai\importai.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\aiimplugin\importaiplugin.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\ai\importaiplugin.cpp"
 				>
 			</File>
 		</Filter>
@@ -384,7 +384,7 @@
 			Filter="h;hpp;hxx;hm;inl;inc"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\aiimplugin\importai.h"
+				RelativePath="..\..\..\scribus\plugins\import\ai\importai.h"
 				>
 				<FileConfiguration
 					Name="Debug-cairo|Win32"
@@ -432,7 +432,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\aiimplugin\importaiplugin.h"
+				RelativePath="..\..\..\scribus\plugins\import\ai\importaiplugin.h"
 				>
 				<FileConfiguration
 					Name="Debug-cairo|Win32"
@@ -484,11 +484,11 @@
 			Name="Generated Moc Files"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\aiimplugin\moc_importai.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\ai\moc_importai.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\aiimplugin\moc_importaiplugin.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\ai\moc_importaiplugin.cpp"
 				>
 			</File>
 		</Filter>
Index: win32/vc8/wmfimport/wmfimport.vcproj
===================================================================
--- win32/vc8/wmfimport/wmfimport.vcproj	(revision 14354)
+++ win32/vc8/wmfimport/wmfimport.vcproj	(revision 14355)
@@ -367,11 +367,11 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wmfimplugin\wmfcontext.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wmf\wmfcontext.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wmfimplugin\wmfimport.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wmf\wmfimport.cpp"
 				>
 			</File>
 			<File
@@ -379,7 +379,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wmfimplugin\wmfimportplugin.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wmf\wmfimportplugin.cpp"
 				>
 			</File>
 		</Filter>
@@ -388,23 +388,23 @@
 			Filter="h;hpp;hxx;hm;inl;inc"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wmfimplugin\metafuncs.h"
+				RelativePath="..\..\..\scribus\plugins\import\wmf\metafuncs.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wmfimplugin\wmfcmd.h"
+				RelativePath="..\..\..\scribus\plugins\import\wmf\wmfcmd.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wmfimplugin\wmfcontext.h"
+				RelativePath="..\..\..\scribus\plugins\import\wmf\wmfcontext.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wmfimplugin\wmfhandle.h"
+				RelativePath="..\..\..\scribus\plugins\import\wmf\wmfhandle.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wmfimplugin\wmfimport.h"
+				RelativePath="..\..\..\scribus\plugins\import\wmf\wmfimport.h"
 				>
 				<FileConfiguration
 					Name="Debug-cairo|Win32"
@@ -452,7 +452,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wmfimplugin\wmfimportplugin.h"
+				RelativePath="..\..\..\scribus\plugins\import\wmf\wmfimportplugin.h"
 				>
 				<FileConfiguration
 					Name="Debug-cairo|Win32"
@@ -500,7 +500,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wmfimplugin\wmfstruct.h"
+				RelativePath="..\..\..\scribus\plugins\import\wmf\wmfstruct.h"
 				>
 			</File>
 		</Filter>
@@ -508,11 +508,11 @@
 			Name="Generated Moc Files"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wmfimplugin\moc_wmfimport.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wmf\moc_wmfimport.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wmfimplugin\moc_wmfimportplugin.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wmf\moc_wmfimportplugin.cpp"
 				>
 			</File>
 		</Filter>
Index: win32/vc8/scribus-wpg/scribus-wpg.vcproj
===================================================================
--- win32/vc8/scribus-wpg/scribus-wpg.vcproj	(revision 14354)
+++ win32/vc8/scribus-wpg/scribus-wpg.vcproj	(revision 14355)
@@ -289,75 +289,75 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPG1Parser.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPG1Parser.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPG2Parser.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPG2Parser.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGBinaryData.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGBinaryData.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGBitmap.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGBitmap.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGBrush.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGBrush.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGColor.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGColor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGGradient.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGGradient.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGHeader.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGHeader.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGInternalStream.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGInternalStream.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGOLEStream.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGOLEStream.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGPath.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGPath.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGPen.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGPen.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGPoint.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGPoint.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGraphics.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGraphics.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGRect.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGRect.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGStreamImplementation.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGStreamImplementation.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGString.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGString.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGXParser.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGXParser.cpp"
 				>
 			</File>
 		</Filter>
@@ -367,95 +367,95 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\libwpd_types.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\libwpd_types.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\libwpg.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\libwpg.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\libwpg_utils.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\libwpg_utils.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPG1Parser.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPG1Parser.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPG2Parser.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPG2Parser.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGBinaryData.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGBinaryData.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGBitmap.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGBitmap.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGBrush.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGBrush.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGColor.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGColor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGGradient.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGGradient.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGHeader.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGHeader.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGInternalStream.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGInternalStream.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGOLEStream.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGOLEStream.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGPaintInterface.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGPaintInterface.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGPath.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGPath.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGPen.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGPen.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGPoint.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGPoint.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGraphics.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGraphics.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGRect.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGRect.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGStreamImplementation.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGStreamImplementation.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGString.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGString.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPGXParser.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPGXParser.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\wpgimplugin\wpg\WPXStream.h"
+				RelativePath="..\..\..\scribus\plugins\import\wpg\wpg\WPXStream.h"
 				>
 			</File>
 		</Filter>
Index: win32/vc8/cvgimport/cvgimport.vcproj
===================================================================
--- win32/vc8/cvgimport/cvgimport.vcproj	(revision 14354)
+++ win32/vc8/cvgimport/cvgimport.vcproj	(revision 14355)
@@ -367,11 +367,11 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\cvgimplugin\importcvg.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\cvg\importcvg.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\cvgimplugin\importcvgplugin.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\cvg\importcvgplugin.cpp"
 				>
 			</File>
 			<File
@@ -384,7 +384,7 @@
 			Filter="h;hpp;hxx;hm;inl;inc"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\cvgimplugin\importcvg.h"
+				RelativePath="..\..\..\scribus\plugins\import\cvg\importcvg.h"
 				>
 				<FileConfiguration
 					Name="Debug-cairo|Win32"
@@ -432,7 +432,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\cvgimplugin\importcvgplugin.h"
+				RelativePath="..\..\..\scribus\plugins\import\cvg\importcvgplugin.h"
 				>
 				<FileConfiguration
 					Name="Debug-cairo|Win32"
@@ -484,11 +484,11 @@
 			Name="Generated Moc Files"
 			>
 			<File
-				RelativePath="..\..\..\scribus\plugins\cvgimplugin\moc_importcvg.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\cvg\moc_importcvg.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\plugins\cvgimplugin\moc_importcvgplugin.cpp"
+				RelativePath="..\..\..\scribus\plugins\import\cvg\moc_importcvgplugin.cpp"
 				>
 			</File>
 		</Filter>




More information about the scribus-commit mailing list