r20296 by jghali - msvc 2012 projects: make the distinction between debug and release libs thru macros in order to allow uniform definition of linker options across platforms and configuration
scribus-commit
scribus-commit at lists.scribus.net
Thu Jul 30 11:57:36 UTC 2015
Author: jghali
Date: Thu Jul 30 11:57:35 2015
New Revision: 20296
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20296
Log:
msvc 2012 projects: make the distinction between debug and release libs thru macros in order to allow uniform definition of linker options across platforms and configuration
Modified:
branches/Version14x/Scribus/win32/vc11/Scribus-build-props.props
branches/Version14x/Scribus/win32/vc11/aiimport/aiimport.vcxproj
branches/Version14x/Scribus/win32/vc11/barcodegenerator/barcodegenerator.vcxproj
branches/Version14x/Scribus/win32/vc11/colorwheel/colorwheel.vcxproj
branches/Version14x/Scribus/win32/vc11/cvgimport/cvgimport.vcxproj
branches/Version14x/Scribus/win32/vc11/fontpreview/fontpreview.vcxproj
branches/Version14x/Scribus/win32/vc11/gettext-csvim/gettext-csvim.vcxproj
branches/Version14x/Scribus/win32/vc11/gettext-docim/gettext-docim.vcxproj
branches/Version14x/Scribus/win32/vc11/gettext-htmlim/gettext-htmlim.vcxproj
branches/Version14x/Scribus/win32/vc11/gettext-odtim/gettext-odtim.vcxproj
branches/Version14x/Scribus/win32/vc11/gettext-pdbim/gettext-pdbim.vcxproj
branches/Version14x/Scribus/win32/vc11/gettext-sxwim/gettext-sxwim.vcxproj
branches/Version14x/Scribus/win32/vc11/gettext-textfilter/gettext-textfilter.vcxproj
branches/Version14x/Scribus/win32/vc11/gettext-txtim/gettext-txtim.vcxproj
branches/Version14x/Scribus/win32/vc11/hunspellcheck/hunspellcheck.vcxproj
branches/Version14x/Scribus/win32/vc11/lenseffects/lenseffects.vcxproj
branches/Version14x/Scribus/win32/vc11/meshdistortion/meshdistortion.vcxproj
branches/Version14x/Scribus/win32/vc11/oodrawimport/oodrawimport.vcxproj
branches/Version14x/Scribus/win32/vc11/pathalongpath/pathalongpath.vcxproj
branches/Version14x/Scribus/win32/vc11/pathconnect/pathconnect.vcxproj
branches/Version14x/Scribus/win32/vc11/pathcut/pathcut.vcxproj
branches/Version14x/Scribus/win32/vc11/pathfinder/pathfinder.vcxproj
branches/Version14x/Scribus/win32/vc11/pathstroker/pathstroker.vcxproj
branches/Version14x/Scribus/win32/vc11/pctimport/pctimport.vcxproj
branches/Version14x/Scribus/win32/vc11/pixmapexport/pixmapexport.vcxproj
branches/Version14x/Scribus/win32/vc11/psimport/psimport.vcxproj
branches/Version14x/Scribus/win32/vc11/saveastemplate/saveastemplate.vcxproj
branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.vcxproj
branches/Version14x/Scribus/win32/vc11/scribus12format/scribus12format.vcxproj
branches/Version14x/Scribus/win32/vc11/scribus134format/scribus134format.vcxproj
branches/Version14x/Scribus/win32/vc11/scribus13format/scribus13format.vcxproj
branches/Version14x/Scribus/win32/vc11/scriptplugin/scriptplugin.vcxproj
branches/Version14x/Scribus/win32/vc11/shortwords/shortwords.vcxproj
branches/Version14x/Scribus/win32/vc11/subdivide/subdivide.vcxproj
branches/Version14x/Scribus/win32/vc11/svgexport/svgexport.vcxproj
branches/Version14x/Scribus/win32/vc11/svgimport/svgimport.vcxproj
branches/Version14x/Scribus/win32/vc11/transform/transform.vcxproj
branches/Version14x/Scribus/win32/vc11/wmfimport/wmfimport.vcxproj
branches/Version14x/Scribus/win32/vc11/xfigimport/xfigimport.vcxproj
Modified: branches/Version14x/Scribus/win32/vc11/Scribus-build-props.props
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/Scribus-build-props.props
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/Scribus-build-props.props (original)
+++ branches/Version14x/Scribus/win32/vc11/Scribus-build-props.props Thu Jul 30 11:57:35 2015
@@ -3,153 +3,60 @@
<ImportGroup Label="PropertySheets">
</ImportGroup>
<PropertyGroup Label="UserMacros">
+ <!-- Scribus libs root path -->
+ <SCRIBUS_COMMON_LIB_ROOT>F:\Scribus Libs\scribus-common-libs</SCRIBUS_COMMON_LIB_ROOT>
+ <SCRIBUS_LIB_ROOT>F:\Scribus Libs\scribus-1.4.x-libs-msvc2012</SCRIBUS_LIB_ROOT>
<!-- Qt4 -->
<QT4_DIR Condition="'$(Platform)' == 'Win32'">F:\Libraries-vcall\Qt-4.8.7\msvc2012</QT4_DIR>
<QT4_DIR Condition="'$(Platform)' == 'x64'">F:\Libraries-vcall\Qt-4.8.7\msvc2012_64</QT4_DIR>
+ <QT4_LIBS Condition="'$(Configuration)' == 'Debug-cairo'">QtCored4.lib;QtGuid4.lib;QtNetworkd4.lib;QtXmld4.lib</QT4_LIBS>
+ <QT4_LIBS Condition="'$(Configuration)' == 'Release-cairo'">QtCore4.lib;QtGui4.lib;QtNetwork4.lib;QtXml4.lib</QT4_LIBS>
<!-- Boost -->
- <BOOST_DIR>F:\Scribus Libs\scribus-common-libs\boost-1.58.0</BOOST_DIR>
+ <BOOST_DIR>$(SCRIBUS_COMMON_LIB_ROOT)\boost-1.58.0</BOOST_DIR>
<!-- Cairo -->
- <CAIRO_DIR>F:\Scribus Libs\scribus-1.4.x-libs-msvc2012\cairo-1.8.6</CAIRO_DIR>
- <CAIRO_DEBUG_LIB>cairo2d.lib</CAIRO_DEBUG_LIB>
- <CAIRO_RELEASE_LIB>cairo2.lib</CAIRO_RELEASE_LIB>
+ <CAIRO_DIR>$(SCRIBUS_LIB_ROOT)\cairo-1.8.6</CAIRO_DIR>
+ <CAIRO_LIB Condition="'$(Configuration)' == 'Debug-cairo'">cairo2d.lib</CAIRO_LIB>
+ <CAIRO_LIB Condition="'$(Configuration)' == 'Release-cairo'">cairo2.lib</CAIRO_LIB>
<!-- Freetype -->
- <FREETYPE_DIR>F:\Scribus Libs\scribus-1.4.x-libs-msvc2012\freetype-2.4.6</FREETYPE_DIR>
- <FREETYPE_DEBUG_LIB>freetypeD.lib</FREETYPE_DEBUG_LIB>
- <FREETYPE_RELEASE_LIB>freetype.lib</FREETYPE_RELEASE_LIB>
+ <FREETYPE_DIR>$(SCRIBUS_LIB_ROOT)\freetype-2.4.6</FREETYPE_DIR>
+ <FREETYPE_LIB Condition="'$(Configuration)' == 'Debug-cairo'">freetypeD.lib</FREETYPE_LIB>
+ <FREETYPE_LIB Condition="'$(Configuration)' == 'Release-cairo'">freetype.lib</FREETYPE_LIB>
<!-- Hunspell -->
- <HUNSPELL_DIR>F:\Scribus Libs\scribus-1.4.x-libs-msvc2012\hunspell-1.3.3</HUNSPELL_DIR>
- <HUNSPELL_DEBUG_LIB>libhunspell_staticD.lib</HUNSPELL_DEBUG_LIB>
- <HUNSPELL_RELEASE_LIB>libhunspell_static.lib</HUNSPELL_RELEASE_LIB>
+ <HUNSPELL_DIR>$(SCRIBUS_LIB_ROOT)\hunspell-1.3.3</HUNSPELL_DIR>
+ <HUNSPELL_LIB Condition="'$(Configuration)' == 'Debug-cairo'">libhunspell_staticD.lib</HUNSPELL_LIB>
+ <HUNSPELL_LIB Condition="'$(Configuration)' == 'Release-cairo'">libhunspell_static.lib</HUNSPELL_LIB>
<!-- Iconv -->
- <ICONV_DIR>F:\Scribus Libs\scribus-1.4.x-libs-msvc2012\libiconv-1.14</ICONV_DIR>
- <ICONV_DEBUG_LIB>iconv_d.lib</ICONV_DEBUG_LIB>
- <ICONV_RELEASE_LIB>iconv.lib</ICONV_RELEASE_LIB>
+ <ICONV_DIR>$(SCRIBUS_LIB_ROOT)\libiconv-1.14</ICONV_DIR>
+ <ICONV_LIB Condition="'$(Configuration)' == 'Debug-cairo'">iconv_d.lib</ICONV_LIB>
+ <ICONV_LIB Condition="'$(Configuration)' == 'Release-cairo'">iconv.lib</ICONV_LIB>
<!-- Littlecms -->
- <LCMS_DIR>F:\Scribus Libs\scribus-1.4.x-libs-msvc2012\lcms2-2.3</LCMS_DIR>
- <LCMS_DEBUG_LIB>lcms2_staticd.lib</LCMS_DEBUG_LIB>
- <LCMS_RELEASE_LIB>lcms2_static.lib</LCMS_RELEASE_LIB>
+ <LCMS_DIR>$(SCRIBUS_LIB_ROOT)\lcms2-2.3</LCMS_DIR>
+ <LCMS_LIB Condition="'$(Configuration)' == 'Debug-cairo'">lcms2_staticd.lib</LCMS_LIB>
+ <LCMS_LIB Condition="'$(Configuration)' == 'Release-cairo'">lcms2_static.lib</LCMS_LIB>
<!-- Libjpeg -->
- <LIBJPEG_DIR>F:\Scribus Libs\scribus-1.4.x-libs-msvc2012\libjpeg-9a</LIBJPEG_DIR>
- <LIBJPEG_DEBUG_LIB>libjpeg9a_d.lib</LIBJPEG_DEBUG_LIB>
- <LIBJPEG_RELEASE_LIB>libjpeg9a.lib</LIBJPEG_RELEASE_LIB>
+ <LIBJPEG_DIR>$(SCRIBUS_LIB_ROOT)\libjpeg-9a</LIBJPEG_DIR>
+ <LIBJPEG_LIB Condition="'$(Configuration)' == 'Debug-cairo'">libjpeg9a_d.lib</LIBJPEG_LIB>
+ <LIBJPEG_LIB Condition="'$(Configuration)' == 'Release-cairo'">libjpeg9a.lib</LIBJPEG_LIB>
<!-- Libtiff -->
- <LIBTIFF_DIR>F:\Scribus Libs\scribus-1.4.x-libs-msvc2012\libtiff-3.9.7</LIBTIFF_DIR>
- <LIBTIFF_DEBUG_LIB>libtiff3_d.lib</LIBTIFF_DEBUG_LIB>
- <LIBTIFF_RELEASE_LIB>libtiff3.lib</LIBTIFF_RELEASE_LIB>
+ <LIBTIFF_DIR>$(SCRIBUS_LIB_ROOT)\libtiff-3.9.7</LIBTIFF_DIR>
+ <LIBTIFF_LIB Condition="'$(Configuration)' == 'Debug-cairo'">libtiff3_d.lib</LIBTIFF_LIB>
+ <LIBTIFF_LIB Condition="'$(Configuration)' == 'Release-cairo'">libtiff3.lib</LIBTIFF_LIB>
<!-- PoDoFo -->
- <PODOFO_DIR>F:\Scribus Libs\scribus-1.4.x-libs-msvc2012\podofo-0.9.1</PODOFO_DIR>
- <PODOFO_DEBUG_LIB>PoDoFoLibD.lib</PODOFO_DEBUG_LIB>
- <PODOFO_RELEASE_LIB>PoDoFoLib.lib</PODOFO_RELEASE_LIB>
+ <PODOFO_DIR>$(SCRIBUS_LIB_ROOT)\podofo-0.9.1</PODOFO_DIR>
+ <PODOFO_LIB Condition="'$(Configuration)' == 'Debug-cairo'">PoDoFoLibD.lib</PODOFO_LIB>
+ <PODOFO_LIB Condition="'$(Configuration)' == 'Release-cairo'">PoDoFoLib.lib</PODOFO_LIB>
<!-- Libxml2 -->
- <LIBXML2_DIR>F:\Scribus Libs\scribus-1.4.x-libs-msvc2012\libxml2-2.9.1</LIBXML2_DIR>
- <LIBXML2_DEBUG_LIB>libxml2_d.lib</LIBXML2_DEBUG_LIB>
- <LIBXML2_RELEASE_LIB>libxml2.lib</LIBXML2_RELEASE_LIB>
+ <LIBXML2_DIR>$(SCRIBUS_LIB_ROOT)\libxml2-2.9.1</LIBXML2_DIR>
+ <LIBXML2_LIB Condition="'$(Configuration)' == 'Debug-cairo'">libxml2_d.lib</LIBXML2_LIB>
+ <LIBXML2_LIB Condition="'$(Configuration)' == 'Release-cairo'">libxml2.lib</LIBXML2_LIB>
<!-- Python -->
- <PYTHON_DIR Condition="'$(Platform)' == 'Win32'">F:\Scribus Libs\scribus-common-libs\python-2.7.10-win32</PYTHON_DIR>
- <PYTHON_DIR Condition="'$(Platform)' == 'x64'">F:\Scribus Libs\scribus-common-libs\python-2.7.10-amd64</PYTHON_DIR>
- <PYTHON_DEBUG_LIB>python27_d.lib</PYTHON_DEBUG_LIB>
- <PYTHON_RELEASE_LIB>python27.lib</PYTHON_RELEASE_LIB>
+ <PYTHON_DIR Condition="'$(Platform)' == 'Win32'">$(SCRIBUS_COMMON_LIB_ROOT)\python-2.7.10-win32</PYTHON_DIR>
+ <PYTHON_DIR Condition="'$(Platform)' == 'x64'">$(SCRIBUS_COMMON_LIB_ROOT)\python-2.7.10-amd64</PYTHON_DIR>
+ <PYTHON_LIB Condition="'$(Configuration)' == 'Debug-cairo'">python27_d.lib</PYTHON_LIB>
+ <PYTHON_LIB Condition="'$(Configuration)' == 'Release-cairo'">python27.lib</PYTHON_LIB>
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
</PropertyGroup>
<ItemDefinitionGroup />
- <ItemGroup>
- <BuildMacro Include="QT4_DIR">
- <Value>$(QT4_DIR)</Value>
- </BuildMacro>
- <BuildMacro Include="BOOST_DIR">
- <Value>$(BOOST_DIR)</Value>
- </BuildMacro>
- <BuildMacro Include="CAIRO_DIR">
- <Value>$(CAIRO_DIR)</Value>
- </BuildMacro>
- <BuildMacro Include="CAIRO_DEBUG_LIB">
- <Value>$(CAIRO_DEBUG_LIB)</Value>
- </BuildMacro>
- <BuildMacro Include="CAIRO_RELEASE_LIB">
- <Value>$(CAIRO_RELEASE_LIB)</Value>
- </BuildMacro>
- <BuildMacro Include="FREETYPE_DIR">
- <Value>$(FREETYPE_DIR)</Value>
- </BuildMacro>
- <BuildMacro Include="FREETYPE_DEBUG_LIB">
- <Value>$(FREETYPE_DEBUG_LIB)</Value>
- </BuildMacro>
- <BuildMacro Include="FREETYPE_RELEASE_LIB">
- <Value>$(FREETYPE_RELEASE_LIB)</Value>
- </BuildMacro>
- <BuildMacro Include="HUNSPELL_DIR">
- <Value>$(HUNSPELL_DIR)</Value>
- </BuildMacro>
- <BuildMacro Include="HUNSPELL_DEBUG_LIB">
- <Value>$(HUNSPELL_DEBUG_LIB)</Value>
- </BuildMacro>
- <BuildMacro Include="HUNSPELL_RELEASE_LIB">
- <Value>$(HUNSPELL_RELEASE_LIB)</Value>
- </BuildMacro>
- <BuildMacro Include="ICONV_DIR">
- <Value>$(ICONV_DIR)</Value>
- </BuildMacro>
- <BuildMacro Include="ICONV_DEBUG_LIB">
- <Value>$(ICONV_DEBUG_LIB)</Value>
- </BuildMacro>
- <BuildMacro Include="ICONV_RELEASE_LIB">
- <Value>$(ICONV_RELEASE_LIB)</Value>
- </BuildMacro>
- <BuildMacro Include="LCMS_DIR">
- <Value>$(LCMS_DIR)</Value>
- </BuildMacro>
- <BuildMacro Include="LCMS_DEBUG_LIB">
- <Value>$(LCMS_DEBUG_LIB)</Value>
- </BuildMacro>
- <BuildMacro Include="LCMS_RELEASE_LIB">
- <Value>$(LCMS_RELEASE_LIB)</Value>
- </BuildMacro>
- <BuildMacro Include="LIBJPEG_DIR">
- <Value>$(LIBJPEG_DIR)</Value>
- </BuildMacro>
- <BuildMacro Include="LIBJPEG_DEBUG_LIB">
- <Value>$(LIBJPEG_DEBUG_LIB)</Value>
- </BuildMacro>
- <BuildMacro Include="LIBJPEG_RELEASE_LIB">
- <Value>$(LIBJPEG_RELEASE_LIB)</Value>
- </BuildMacro>
- <BuildMacro Include="LIBTIFF_DIR">
- <Value>$(LIBTIFF_DIR)</Value>
- </BuildMacro>
- <BuildMacro Include="LIBTIFF_DEBUG_LIB">
- <Value>$(LIBTIFF_DEBUG_LIB)</Value>
- </BuildMacro>
- <BuildMacro Include="LIBTIFF_RELEASE_LIB">
- <Value>$(LIBTIFF_RELEASE_LIB)</Value>
- </BuildMacro>
- <BuildMacro Include="PODOFO_DIR">
- <Value>$(PODOFO_DIR)</Value>
- </BuildMacro>
- <BuildMacro Include="PODOFO_DEBUG_LIB">
- <Value>$(PODOFO_DEBUG_LIB)</Value>
- </BuildMacro>
- <BuildMacro Include="PODOFO_RELEASE_LIB">
- <Value>$(PODOFO_RELEASE_LIB)</Value>
- </BuildMacro>
- <BuildMacro Include="LIBXML2_DIR">
- <Value>$(LIBXML2_DIR)</Value>
- </BuildMacro>
- <BuildMacro Include="LIBXML2_DEBUG_LIB">
- <Value>$(LIBXML2_DEBUG_LIB)</Value>
- </BuildMacro>
- <BuildMacro Include="LIBXML2_RELEASE_LIB">
- <Value>$(LIBXML2_RELEASE_LIB)</Value>
- </BuildMacro>
- <BuildMacro Include="PYTHON_DIR">
- <Value>$(PYTHON_DIR)</Value>
- </BuildMacro>
- <BuildMacro Include="PYTHON_DEBUG_LIB">
- <Value>$(PYTHON_DEBUG_LIB)</Value>
- </BuildMacro>
- <BuildMacro Include="PYTHON_RELEASE_LIB">
- <Value>$(PYTHON_RELEASE_LIB)</Value>
- </BuildMacro>
- </ItemGroup>
</Project>
Modified: branches/Version14x/Scribus/win32/vc11/aiimport/aiimport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/aiimport/aiimport.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/aiimport/aiimport.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/aiimport/aiimport.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(PODOFO_DEBUG_LIB);scribus-api.lib;WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(PODOFO_LIB);scribus-api.lib;WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(PODOFO_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(PODOFO_DEBUG_LIB);scribus-api.lib;WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(PODOFO_LIB);scribus-api.lib;WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(PODOFO_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(PODOFO_RELEASE_LIB);scribus-api.lib;WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(PODOFO_LIB);scribus-api.lib;WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(PODOFO_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(PODOFO_RELEASE_LIB);scribus-api.lib;WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(PODOFO_LIB);scribus-api.lib;WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(PODOFO_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/barcodegenerator/barcodegenerator.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/barcodegenerator/barcodegenerator.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/barcodegenerator/barcodegenerator.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/barcodegenerator/barcodegenerator.vcxproj Thu Jul 30 11:57:35 2015
@@ -107,7 +107,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -132,7 +132,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -159,7 +159,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -189,7 +189,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/colorwheel/colorwheel.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/colorwheel/colorwheel.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/colorwheel/colorwheel.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/colorwheel/colorwheel.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/cvgimport/cvgimport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/cvgimport/cvgimport.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/cvgimport/cvgimport.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/cvgimport/cvgimport.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/fontpreview/fontpreview.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/fontpreview/fontpreview.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/fontpreview/fontpreview.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/fontpreview/fontpreview.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/gettext-csvim/gettext-csvim.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/gettext-csvim/gettext-csvim.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/gettext-csvim/gettext-csvim.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/gettext-csvim/gettext-csvim.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/gettext-docim/gettext-docim.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/gettext-docim/gettext-docim.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/gettext-docim/gettext-docim.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/gettext-docim/gettext-docim.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/gettext-htmlim/gettext-htmlim.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/gettext-htmlim/gettext-htmlim.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/gettext-htmlim/gettext-htmlim.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/gettext-htmlim/gettext-htmlim.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/gettext-odtim/gettext-odtim.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/gettext-odtim/gettext-odtim.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/gettext-odtim/gettext-odtim.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/gettext-odtim/gettext-odtim.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/gettext-pdbim/gettext-pdbim.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/gettext-pdbim/gettext-pdbim.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/gettext-pdbim/gettext-pdbim.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/gettext-pdbim/gettext-pdbim.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)gettext-pdbim.dll</OutputFile>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -132,7 +132,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)gettext-pdbim.dll</OutputFile>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -160,7 +160,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)gettext-pdbim.dll</OutputFile>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -191,7 +191,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)gettext-pdbim.dll</OutputFile>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
Modified: branches/Version14x/Scribus/win32/vc11/gettext-sxwim/gettext-sxwim.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/gettext-sxwim/gettext-sxwim.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/gettext-sxwim/gettext-sxwim.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/gettext-sxwim/gettext-sxwim.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/gettext-textfilter/gettext-textfilter.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/gettext-textfilter/gettext-textfilter.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/gettext-textfilter/gettext-textfilter.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/gettext-textfilter/gettext-textfilter.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/gettext-txtim/gettext-txtim.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/gettext-txtim/gettext-txtim.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/gettext-txtim/gettext-txtim.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/gettext-txtim/gettext-txtim.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LIBXML2_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LIBXML2_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LIBXML2_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(LIBXML2_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..\..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/hunspellcheck/hunspellcheck.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/hunspellcheck/hunspellcheck.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/hunspellcheck/hunspellcheck.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/hunspellcheck/hunspellcheck.vcxproj Thu Jul 30 11:57:35 2015
@@ -107,7 +107,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(HUNSPELL_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(HUNSPELL_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(HUNSPELL_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -132,7 +132,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(HUNSPELL_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(HUNSPELL_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(HUNSPELL_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -159,7 +159,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(HUNSPELL_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(HUNSPELL_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(HUNSPELL_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -189,7 +189,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(HUNSPELL_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(HUNSPELL_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(HUNSPELL_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/lenseffects/lenseffects.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/lenseffects/lenseffects.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/lenseffects/lenseffects.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/lenseffects/lenseffects.vcxproj Thu Jul 30 11:57:35 2015
@@ -107,7 +107,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -132,7 +132,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -159,7 +159,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -189,7 +189,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/meshdistortion/meshdistortion.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/meshdistortion/meshdistortion.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/meshdistortion/meshdistortion.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/meshdistortion/meshdistortion.vcxproj Thu Jul 30 11:57:35 2015
@@ -107,7 +107,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;scribus-lib2geom.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;scribus-lib2geom.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -132,7 +132,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;scribus-lib2geom.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;scribus-lib2geom.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -159,7 +159,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;scribus-lib2geom.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;scribus-lib2geom.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -189,7 +189,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;scribus-lib2geom.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;scribus-lib2geom.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/oodrawimport/oodrawimport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/oodrawimport/oodrawimport.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/oodrawimport/oodrawimport.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/oodrawimport/oodrawimport.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/pathalongpath/pathalongpath.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/pathalongpath/pathalongpath.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/pathalongpath/pathalongpath.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/pathalongpath/pathalongpath.vcxproj Thu Jul 30 11:57:35 2015
@@ -107,7 +107,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;scribus-lib2geom.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;scribus-lib2geom.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -132,7 +132,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;scribus-lib2geom.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;scribus-lib2geom.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -159,7 +159,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;scribus-lib2geom.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;scribus-lib2geom.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -189,7 +189,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;scribus-lib2geom.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;scribus-lib2geom.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/pathconnect/pathconnect.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/pathconnect/pathconnect.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/pathconnect/pathconnect.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/pathconnect/pathconnect.vcxproj Thu Jul 30 11:57:35 2015
@@ -107,7 +107,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -132,7 +132,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -159,7 +159,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -189,7 +189,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/pathcut/pathcut.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/pathcut/pathcut.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/pathcut/pathcut.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/pathcut/pathcut.vcxproj Thu Jul 30 11:57:35 2015
@@ -107,7 +107,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -132,7 +132,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -159,7 +159,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -189,7 +189,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/pathfinder/pathfinder.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/pathfinder/pathfinder.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/pathfinder/pathfinder.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/pathfinder/pathfinder.vcxproj Thu Jul 30 11:57:35 2015
@@ -107,7 +107,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -132,7 +132,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -159,7 +159,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -189,7 +189,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/pathstroker/pathstroker.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/pathstroker/pathstroker.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/pathstroker/pathstroker.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/pathstroker/pathstroker.vcxproj Thu Jul 30 11:57:35 2015
@@ -107,7 +107,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -132,7 +132,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -159,7 +159,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -189,7 +189,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/pctimport/pctimport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/pctimport/pctimport.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/pctimport/pctimport.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/pctimport/pctimport.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/pixmapexport/pixmapexport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/pixmapexport/pixmapexport.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/pixmapexport/pixmapexport.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/pixmapexport/pixmapexport.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/psimport/psimport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/psimport/psimport.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/psimport/psimport.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/psimport/psimport.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(PODOFO_DEBUG_LIB);scribus-api.lib;WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(PODOFO_LIB);scribus-api.lib;WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(PODOFO_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(PODOFO_DEBUG_LIB);scribus-api.lib;WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(PODOFO_LIB);scribus-api.lib;WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(PODOFO_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(PODOFO_RELEASE_LIB);scribus-api.lib;WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(PODOFO_LIB);scribus-api.lib;WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(PODOFO_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(PODOFO_RELEASE_LIB);scribus-api.lib;WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(PODOFO_LIB);scribus-api.lib;WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(PODOFO_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/saveastemplate/saveastemplate.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/saveastemplate/saveastemplate.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/saveastemplate/saveastemplate.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/saveastemplate/saveastemplate.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.vcxproj Thu Jul 30 11:57:35 2015
@@ -117,7 +117,7 @@
<ForcedIncludeFiles>scribuspch.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtNetworkd4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(CAIRO_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LCMS_DEBUG_LIB);mscms.lib;$(PODOFO_DEBUG_LIB);WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(CAIRO_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LCMS_LIB);mscms.lib;$(PODOFO_LIB);WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(QT4_DIR)\lib;$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(CAIRO_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(PODOFO_DIR)\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug />
@@ -150,7 +150,7 @@
<ForcedIncludeFiles>scribuspch.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtNetworkd4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(CAIRO_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LCMS_DEBUG_LIB);mscms.lib;$(PODOFO_DEBUG_LIB);WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(CAIRO_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LCMS_LIB);mscms.lib;$(PODOFO_LIB);WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(QT4_DIR)\lib;$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(CAIRO_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(PODOFO_DIR)\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>
@@ -184,7 +184,7 @@
<ForcedIncludeFiles>scribuspch.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtNetwork4.lib;QtXml4.lib;qtmain.lib;$(FREETYPE_RELEASE_LIB);$(CAIRO_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);mscms.lib;$(PODOFO_RELEASE_LIB);WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);qtmain.lib;$(FREETYPE_LIB);$(CAIRO_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LCMS_LIB);mscms.lib;$(PODOFO_LIB);WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(QT4_DIR)\lib;$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(CAIRO_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(PODOFO_DIR)\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -219,7 +219,7 @@
<ForcedIncludeFiles>scribuspch.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtNetwork4.lib;QtXml4.lib;qtmain.lib;$(FREETYPE_RELEASE_LIB);$(CAIRO_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);mscms.lib;$(PODOFO_RELEASE_LIB);WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);qtmain.lib;$(FREETYPE_LIB);$(CAIRO_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);$(LCMS_LIB);mscms.lib;$(PODOFO_LIB);WSock32.Lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(QT4_DIR)\lib;$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(CAIRO_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(PODOFO_DIR)\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/scribus12format/scribus12format.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/scribus12format/scribus12format.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/scribus12format/scribus12format.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/scribus12format/scribus12format.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/scribus134format/scribus134format.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/scribus134format/scribus134format.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/scribus134format/scribus134format.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/scribus134format/scribus134format.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/scribus13format/scribus13format.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/scribus13format/scribus13format.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/scribus13format/scribus13format.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/scribus13format/scribus13format.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/scriptplugin/scriptplugin.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/scriptplugin/scriptplugin.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/scriptplugin/scriptplugin.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/scriptplugin/scriptplugin.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4005;4138;4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);python27_d.lib;scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);python27_d.lib;scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(PYTHON_DIR)\libs;$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4005;4138;4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);python27_d.lib;scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);python27_d.lib;scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(PYTHON_DIR)\libs;$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4005;4138;4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);python27.lib;scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);python27.lib;scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(PYTHON_DIR)\libs;$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4005;4138;4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);python27.lib;scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);python27.lib;scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(PYTHON_DIR)\libs;$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/shortwords/shortwords.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/shortwords/shortwords.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/shortwords/shortwords.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/shortwords/shortwords.vcxproj Thu Jul 30 11:57:35 2015
@@ -107,7 +107,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -132,7 +132,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -159,7 +159,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -189,7 +189,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/subdivide/subdivide.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/subdivide/subdivide.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/subdivide/subdivide.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/subdivide/subdivide.vcxproj Thu Jul 30 11:57:35 2015
@@ -107,7 +107,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -132,7 +132,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -159,7 +159,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -189,7 +189,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/svgexport/svgexport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/svgexport/svgexport.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/svgexport/svgexport.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/svgexport/svgexport.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/svgimport/svgimport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/svgimport/svgimport.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/svgimport/svgimport.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/svgimport/svgimport.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/transform/transform.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/transform/transform.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/transform/transform.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/transform/transform.vcxproj Thu Jul 30 11:57:35 2015
@@ -107,7 +107,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -132,7 +132,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -159,7 +159,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -189,7 +189,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/wmfimport/wmfimport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/wmfimport/wmfimport.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/wmfimport/wmfimport.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/wmfimport/wmfimport.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/Version14x/Scribus/win32/vc11/xfigimport/xfigimport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20296&path=/branches/Version14x/Scribus/win32/vc11/xfigimport/xfigimport.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/xfigimport/xfigimport.vcxproj (original)
+++ branches/Version14x/Scribus/win32/vc11/xfigimport/xfigimport.vcxproj Thu Jul 30 11:57:35 2015
@@ -106,7 +106,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;QtXmld4.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -188,7 +188,7 @@
<DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtXml4.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(QT4_LIBS);$(FREETYPE_LIB);$(LIBJPEG_LIB);$(LIBTIFF_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(LCMS_DIR)\lib\$(Platform);$(FREETYPE_DIR)\lib\$(Platform);$(LIBJPEG_DIR)\lib\$(Platform);$(LIBTIFF_DIR)\lib\$(Platform);$(QT4_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
More information about the scribus-commit
mailing list