r18916 by jghali - msvc project update
scribus-commit
scribus-commit at lists.scribus.net
Sun Mar 16 12:20:50 UTC 2014
Author: jghali
Date: Sun Mar 16 12:20:50 2014
New Revision: 18916
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18916
Log:
msvc project update
Modified:
trunk/Scribus/win32/vc10/Scribus.sln
trunk/Scribus/win32/vc10/gettext-odtim/gettext-odtim.vcxproj
trunk/Scribus/win32/vc10/gettext-sxwim/gettext-sxwim.vcxproj
trunk/Scribus/win32/vc10/idmlimport/idmlimport.vcxproj
trunk/Scribus/win32/vc10/oodrawimport/oodrawimport.vcxproj
trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj
trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters
trunk/Scribus/win32/vc11/Scribus.sln
trunk/Scribus/win32/vc11/gettext-odtim/gettext-odtim.vcxproj
trunk/Scribus/win32/vc11/gettext-sxwim/gettext-sxwim.vcxproj
trunk/Scribus/win32/vc11/idmlimport/idmlimport.vcxproj
trunk/Scribus/win32/vc11/oodrawimport/oodrawimport.vcxproj
trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj
trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters
Modified: trunk/Scribus/win32/vc10/Scribus.sln
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18916&path=/trunk/Scribus/win32/vc10/Scribus.sln
==============================================================================
--- trunk/Scribus/win32/vc10/Scribus.sln (original)
+++ trunk/Scribus/win32/vc10/Scribus.sln Sun Mar 16 12:20:50 2014
@@ -1,6 +1,9 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scribus-main", "scribus-main\Scribus.vcxproj", "{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}"
+ ProjectSection(ProjectDependencies) = postProject
+ {6CC39EED-B1E2-4209-8F65-0E6242EE63E5} = {6CC39EED-B1E2-4209-8F65-0E6242EE63E5}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "svgexport", "svgexport\svgexport.vcxproj", "{9652EA11-AFA0-4CDF-88AC-7912C653EFE6}"
ProjectSection(ProjectDependencies) = postProject
Modified: trunk/Scribus/win32/vc10/gettext-odtim/gettext-odtim.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18916&path=/trunk/Scribus/win32/vc10/gettext-odtim/gettext-odtim.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc10/gettext-odtim/gettext-odtim.vcxproj (original)
+++ trunk/Scribus/win32/vc10/gettext-odtim/gettext-odtim.vcxproj Sun Mar 16 12:20:50 2014
@@ -69,8 +69,8 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);$(LCMS_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(ZLIB_DEBUG_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)gettext-odtim.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -97,8 +97,8 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);$(ZLIB_RELEASE_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)gettext-odtim.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: trunk/Scribus/win32/vc10/gettext-sxwim/gettext-sxwim.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18916&path=/trunk/Scribus/win32/vc10/gettext-sxwim/gettext-sxwim.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc10/gettext-sxwim/gettext-sxwim.vcxproj (original)
+++ trunk/Scribus/win32/vc10/gettext-sxwim/gettext-sxwim.vcxproj Sun Mar 16 12:20:50 2014
@@ -69,8 +69,8 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);$(LCMS_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(ZLIB_DEBUG_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)gettext-sxwim.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -97,8 +97,8 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);$(ZLIB_RELEASE_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)gettext-sxwim.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: trunk/Scribus/win32/vc10/idmlimport/idmlimport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18916&path=/trunk/Scribus/win32/vc10/idmlimport/idmlimport.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc10/idmlimport/idmlimport.vcxproj (original)
+++ trunk/Scribus/win32/vc10/idmlimport/idmlimport.vcxproj Sun Mar 16 12:20:50 2014
@@ -69,8 +69,8 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LCMS_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(ZLIB_DEBUG_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(FREETYPE_LIB_DIR);$(LCMS_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)importidml.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -97,8 +97,8 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(ZLIB_RELEASE_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(FREETYPE_LIB_DIR);$(LCMS_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)importidml.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: trunk/Scribus/win32/vc10/oodrawimport/oodrawimport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18916&path=/trunk/Scribus/win32/vc10/oodrawimport/oodrawimport.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc10/oodrawimport/oodrawimport.vcxproj (original)
+++ trunk/Scribus/win32/vc10/oodrawimport/oodrawimport.vcxproj Sun Mar 16 12:20:50 2014
@@ -69,8 +69,8 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LCMS_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(ZLIB_DEBUG_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)oodrawimp.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -97,8 +97,8 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(ZLIB_RELEASE_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)oodrawimp.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18916&path=/trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj (original)
+++ trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj Sun Mar 16 12:20:50 2014
@@ -78,7 +78,7 @@
<ForcedIncludeFiles>.\scribuspch.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Networkd.lib;Qt5PrintSupportd.lib;Qt5Webkitd.lib;Qt5WebkitWidgetsd.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(CAIRO_DEBUG_LIB);$(FREETYPE_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(PODOFO_DEBUG_LIB);$(ZLIB_DEBUG_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Networkd.lib;Qt5PrintSupportd.lib;Qt5Webkitd.lib;Qt5WebkitWidgetsd.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(CAIRO_DEBUG_LIB);$(FREETYPE_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(PODOFO_DEBUG_LIB);$(ZLIB_DEBUG_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(QT5_DIR)\lib;$(CAIRO_LIB_DIR);$(FREETYPE_LIB_DIR);$(LCMS_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(PODOFO_LIB_DIR);$(ZLIB_LIB_DIR);$(OutDir).;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug />
@@ -112,7 +112,7 @@
<ForcedIncludeFiles>.\scribuspch.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Network.lib;Qt5PrintSupport.lib;Qt5Webkit.lib;Qt5WebkitWidgets.lib;Qt5Widgets.lib;Qt5Xml.lib;qtmain.lib;$(CAIRO_RELEASE_LIB);$(FREETYPE_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(PODOFO_RELEASE_LIB);$(ZLIB_RELEASE_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Network.lib;Qt5PrintSupport.lib;Qt5Webkit.lib;Qt5WebkitWidgets.lib;Qt5Widgets.lib;Qt5Xml.lib;qtmain.lib;$(CAIRO_RELEASE_LIB);$(FREETYPE_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(PODOFO_RELEASE_LIB);$(ZLIB_RELEASE_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(QT5_DIR)\lib;$(CAIRO_LIB_DIR);$(FREETYPE_LIB_DIR);$(LCMS_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(PODOFO_LIB_DIR);$(ZLIB_LIB_DIR);$(OutDir).;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)Scribus.pdb</ProgramDatabaseFile>
@@ -246,7 +246,6 @@
<moc Include="..\..\..\scribus\fileloader.h" />
<moc Include="..\..\..\scribus\filesearch.h" />
<moc Include="..\..\..\scribus\ui\filetoolbar.h" />
- <ClInclude Include="..\..\..\scribus\fileunzip.h" />
<moc Include="..\..\..\scribus\filewatcher.h" />
<moc Include="..\..\..\scribus\ui\fontcombo.h" />
<moc Include="..\..\..\scribus\fontlistmodel.h" />
@@ -621,7 +620,6 @@
<ClInclude Include="..\..\..\scribus\undostate.h" />
<moc Include="..\..\..\scribus\ui\unicodesearch.h" />
<ClInclude Include="..\..\..\scribus\units.h" />
- <ClInclude Include="..\..\..\scribus\unzip.h" />
<ClInclude Include="..\..\..\scribus\updatemanager.h" />
<moc Include="..\..\..\scribus\urllauncher.h" />
<moc Include="..\..\..\scribus\ui\useprintermarginsdialog.h" />
@@ -879,7 +877,6 @@
<ClCompile Include="..\..\..\scribus\fileloader.cpp" />
<ClCompile Include="..\..\..\scribus\filesearch.cpp" />
<ClCompile Include="..\..\..\scribus\ui\filetoolbar.cpp" />
- <ClCompile Include="..\..\..\scribus\fileunzip.cpp" />
<ClCompile Include="..\..\..\scribus\filewatcher.cpp" />
<ClCompile Include="..\..\..\scribus\ui\fontcombo.cpp" />
<ClCompile Include="..\..\..\scribus\fontlistmodel.cpp" />
@@ -1291,20 +1288,6 @@
<ClCompile Include="..\..\..\scribus\undostate.cpp" />
<ClCompile Include="..\..\..\scribus\ui\unicodesearch.cpp" />
<ClCompile Include="..\..\..\scribus\units.cpp" />
- <ClCompile Include="..\..\..\scribus\unzip.c">
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- </PrecompiledHeader>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- </PrecompiledHeaderFile>
- <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- </ForcedIncludeFiles>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- </PrecompiledHeader>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- </PrecompiledHeaderFile>
- <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- </ForcedIncludeFiles>
- </ClCompile>
<ClCompile Include="..\..\..\scribus\updatemanager.cpp" />
<ClCompile Include="..\..\..\scribus\urllauncher.cpp" />
<ClCompile Include="..\..\..\scribus\ui\useprintermarginsdialog.cpp" />
Modified: trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18916&path=/trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters (original)
+++ trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters Sun Mar 16 12:20:50 2014
@@ -174,9 +174,6 @@
<ClInclude Include="..\..\..\scribus\exif.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\scribus\fileunzip.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\scribus\fparser.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -568,9 +565,6 @@
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\scribus\units.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\scribus\unzip.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\scribus\updatemanager.h">
@@ -1325,9 +1319,6 @@
<ClCompile Include="..\..\..\scribus\ui\filetoolbar.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\scribus\fileunzip.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\scribus\filewatcher.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -2385,9 +2376,6 @@
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\scribus\units.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\scribus\unzip.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\scribus\updatemanager.cpp">
Modified: trunk/Scribus/win32/vc11/Scribus.sln
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18916&path=/trunk/Scribus/win32/vc11/Scribus.sln
==============================================================================
--- trunk/Scribus/win32/vc11/Scribus.sln (original)
+++ trunk/Scribus/win32/vc11/Scribus.sln Sun Mar 16 12:20:50 2014
@@ -1,6 +1,9 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2012 for Windows Desktop
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scribus-main", "scribus-main\Scribus.vcxproj", "{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}"
+ ProjectSection(ProjectDependencies) = postProject
+ {6CC39EED-B1E2-4209-8F65-0E6242EE63E5} = {6CC39EED-B1E2-4209-8F65-0E6242EE63E5}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "svgexport", "svgexport\svgexport.vcxproj", "{9652EA11-AFA0-4CDF-88AC-7912C653EFE6}"
ProjectSection(ProjectDependencies) = postProject
Modified: trunk/Scribus/win32/vc11/gettext-odtim/gettext-odtim.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18916&path=/trunk/Scribus/win32/vc11/gettext-odtim/gettext-odtim.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc11/gettext-odtim/gettext-odtim.vcxproj (original)
+++ trunk/Scribus/win32/vc11/gettext-odtim/gettext-odtim.vcxproj Sun Mar 16 12:20:50 2014
@@ -107,8 +107,8 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);$(LCMS_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(ZLIB_DEBUG_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)gettext-odtim.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -133,8 +133,8 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);$(LCMS_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(ZLIB_DEBUG_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)gettext-odtim.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -161,8 +161,8 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);$(ZLIB_RELEASE_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)gettext-odtim.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -192,8 +192,8 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);$(ZLIB_RELEASE_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)gettext-odtim.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: trunk/Scribus/win32/vc11/gettext-sxwim/gettext-sxwim.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18916&path=/trunk/Scribus/win32/vc11/gettext-sxwim/gettext-sxwim.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc11/gettext-sxwim/gettext-sxwim.vcxproj (original)
+++ trunk/Scribus/win32/vc11/gettext-sxwim/gettext-sxwim.vcxproj Sun Mar 16 12:20:50 2014
@@ -107,8 +107,8 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);$(LCMS_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(ZLIB_DEBUG_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)gettext-sxwim.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -133,8 +133,8 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);$(LCMS_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(ZLIB_DEBUG_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)gettext-sxwim.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -161,8 +161,8 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);$(ZLIB_RELEASE_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)gettext-sxwim.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -192,8 +192,8 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);$(ZLIB_RELEASE_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(LIBXML2_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)gettext-sxwim.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: trunk/Scribus/win32/vc11/idmlimport/idmlimport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18916&path=/trunk/Scribus/win32/vc11/idmlimport/idmlimport.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc11/idmlimport/idmlimport.vcxproj (original)
+++ trunk/Scribus/win32/vc11/idmlimport/idmlimport.vcxproj Sun Mar 16 12:20:50 2014
@@ -107,8 +107,8 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LCMS_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(ZLIB_DEBUG_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)importidml.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -133,8 +133,8 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LCMS_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(ZLIB_DEBUG_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)importidml.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -161,8 +161,8 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(ZLIB_RELEASE_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)importidml.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -192,8 +192,8 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(ZLIB_RELEASE_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)importidml.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: trunk/Scribus/win32/vc11/oodrawimport/oodrawimport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18916&path=/trunk/Scribus/win32/vc11/oodrawimport/oodrawimport.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc11/oodrawimport/oodrawimport.vcxproj (original)
+++ trunk/Scribus/win32/vc11/oodrawimport/oodrawimport.vcxproj Sun Mar 16 12:20:50 2014
@@ -107,8 +107,8 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LCMS_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(ZLIB_DEBUG_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)oodrawimp.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -133,8 +133,8 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LCMS_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(ZLIB_DEBUG_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)oodrawimp.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -161,8 +161,8 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(ZLIB_RELEASE_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)oodrawimp.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -192,8 +192,8 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(ZLIB_RELEASE_LIB);scribus-api.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(LCMS_LIB_DIR);$(FREETYPE_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(ZLIB_LIB_DIR);$(QT5_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)oodrawimp.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18916&path=/trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj (original)
+++ trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj Sun Mar 16 12:20:50 2014
@@ -118,7 +118,7 @@
<ForcedIncludeFiles>.\scribuspch.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Networkd.lib;Qt5PrintSupportd.lib;Qt5Webkitd.lib;Qt5WebkitWidgetsd.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(CAIRO_DEBUG_LIB);$(FREETYPE_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(PODOFO_DEBUG_LIB);$(ZLIB_DEBUG_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Networkd.lib;Qt5PrintSupportd.lib;Qt5Webkitd.lib;Qt5WebkitWidgetsd.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(CAIRO_DEBUG_LIB);$(FREETYPE_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(PODOFO_DEBUG_LIB);$(ZLIB_DEBUG_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(QT5_DIR)\lib;$(CAIRO_LIB_DIR);$(FREETYPE_LIB_DIR);$(LCMS_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(PODOFO_LIB_DIR);$(ZLIB_LIB_DIR);$(OutDir).;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug />
@@ -153,7 +153,7 @@
<ForcedIncludeFiles>.\scribuspch.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Networkd.lib;Qt5PrintSupportd.lib;Qt5Webkitd.lib;Qt5WebkitWidgetsd.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(CAIRO_DEBUG_LIB);$(FREETYPE_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(PODOFO_DEBUG_LIB);$(ZLIB_DEBUG_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Networkd.lib;Qt5PrintSupportd.lib;Qt5Webkitd.lib;Qt5WebkitWidgetsd.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(CAIRO_DEBUG_LIB);$(FREETYPE_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(PODOFO_DEBUG_LIB);$(ZLIB_DEBUG_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(QT5_DIR)\lib;$(CAIRO_LIB_DIR);$(FREETYPE_LIB_DIR);$(LCMS_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(PODOFO_LIB_DIR);$(ZLIB_LIB_DIR);$(OutDir).;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>
@@ -188,7 +188,7 @@
<ForcedIncludeFiles>.\scribuspch.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Network.lib;Qt5PrintSupport.lib;Qt5Webkit.lib;Qt5WebkitWidgets.lib;Qt5Widgets.lib;Qt5Xml.lib;qtmain.lib;$(CAIRO_RELEASE_LIB);$(FREETYPE_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(PODOFO_RELEASE_LIB);$(ZLIB_RELEASE_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Network.lib;Qt5PrintSupport.lib;Qt5Webkit.lib;Qt5WebkitWidgets.lib;Qt5Widgets.lib;Qt5Xml.lib;qtmain.lib;$(CAIRO_RELEASE_LIB);$(FREETYPE_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(PODOFO_RELEASE_LIB);$(ZLIB_RELEASE_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(QT5_DIR)\lib;$(CAIRO_LIB_DIR);$(FREETYPE_LIB_DIR);$(LCMS_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(PODOFO_LIB_DIR);$(ZLIB_LIB_DIR);$(OutDir).;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)Scribus.pdb</ProgramDatabaseFile>
@@ -224,7 +224,7 @@
<ForcedIncludeFiles>.\scribuspch.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
- <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Network.lib;Qt5PrintSupport.lib;Qt5Webkit.lib;Qt5WebkitWidgets.lib;Qt5Widgets.lib;Qt5Xml.lib;qtmain.lib;$(CAIRO_RELEASE_LIB);$(FREETYPE_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(PODOFO_RELEASE_LIB);$(ZLIB_RELEASE_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Network.lib;Qt5PrintSupport.lib;Qt5Webkit.lib;Qt5WebkitWidgets.lib;Qt5Widgets.lib;Qt5Xml.lib;qtmain.lib;$(CAIRO_RELEASE_LIB);$(FREETYPE_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(PODOFO_RELEASE_LIB);$(ZLIB_RELEASE_LIB);mscms.lib;WSock32.Lib;scribus-pgf.lib;scribus-wpg.lib;scribus-zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(QT5_DIR)\lib;$(CAIRO_LIB_DIR);$(FREETYPE_LIB_DIR);$(LCMS_LIB_DIR);$(LIBJPEG_LIB_DIR);$(LIBTIFF_LIB_DIR);$(PODOFO_LIB_DIR);$(ZLIB_LIB_DIR);$(OutDir).;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)Scribus.pdb</ProgramDatabaseFile>
@@ -359,7 +359,6 @@
<moc Include="..\..\..\scribus\fileloader.h" />
<moc Include="..\..\..\scribus\filesearch.h" />
<moc Include="..\..\..\scribus\ui\filetoolbar.h" />
- <ClInclude Include="..\..\..\scribus\fileunzip.h" />
<moc Include="..\..\..\scribus\filewatcher.h" />
<moc Include="..\..\..\scribus\ui\fontcombo.h" />
<moc Include="..\..\..\scribus\fontlistmodel.h" />
@@ -734,7 +733,6 @@
<ClInclude Include="..\..\..\scribus\undostate.h" />
<moc Include="..\..\..\scribus\ui\unicodesearch.h" />
<ClInclude Include="..\..\..\scribus\units.h" />
- <ClInclude Include="..\..\..\scribus\unzip.h" />
<ClInclude Include="..\..\..\scribus\updatemanager.h" />
<moc Include="..\..\..\scribus\urllauncher.h" />
<moc Include="..\..\..\scribus\ui\useprintermarginsdialog.h" />
@@ -992,7 +990,6 @@
<ClCompile Include="..\..\..\scribus\fileloader.cpp" />
<ClCompile Include="..\..\..\scribus\filesearch.cpp" />
<ClCompile Include="..\..\..\scribus\ui\filetoolbar.cpp" />
- <ClCompile Include="..\..\..\scribus\fileunzip.cpp" />
<ClCompile Include="..\..\..\scribus\filewatcher.cpp" />
<ClCompile Include="..\..\..\scribus\ui\fontcombo.cpp" />
<ClCompile Include="..\..\..\scribus\fontlistmodel.cpp" />
@@ -1454,32 +1451,6 @@
<ClCompile Include="..\..\..\scribus\undostate.cpp" />
<ClCompile Include="..\..\..\scribus\ui\unicodesearch.cpp" />
<ClCompile Include="..\..\..\scribus\units.cpp" />
- <ClCompile Include="..\..\..\scribus\unzip.c">
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- </PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- </PrecompiledHeader>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- </PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- </PrecompiledHeaderFile>
- <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- </ForcedIncludeFiles>
- <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- </ForcedIncludeFiles>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- </PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- </PrecompiledHeader>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- </PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- </PrecompiledHeaderFile>
- <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- </ForcedIncludeFiles>
- <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- </ForcedIncludeFiles>
- </ClCompile>
<ClCompile Include="..\..\..\scribus\updatemanager.cpp" />
<ClCompile Include="..\..\..\scribus\urllauncher.cpp" />
<ClCompile Include="..\..\..\scribus\ui\useprintermarginsdialog.cpp" />
Modified: trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18916&path=/trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters (original)
+++ trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters Sun Mar 16 12:20:50 2014
@@ -174,9 +174,6 @@
<ClInclude Include="..\..\..\scribus\exif.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\scribus\fileunzip.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\scribus\fparser.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -568,9 +565,6 @@
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\scribus\units.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\scribus\unzip.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\scribus\updatemanager.h">
@@ -1313,9 +1307,6 @@
<ClCompile Include="..\..\..\scribus\ui\filetoolbar.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\scribus\fileunzip.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\scribus\filewatcher.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -2373,9 +2364,6 @@
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\scribus\units.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\scribus\unzip.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\scribus\updatemanager.cpp">
More information about the scribus-commit
mailing list