r20182 by jghali - update msvc *.props file according to latest libs archive uploaded to sourceforge

scribus-commit scribus-commit at lists.scribus.net
Sun Jun 21 18:45:34 UTC 2015


Author: jghali
Date: Sun Jun 21 18:45:34 2015
New Revision: 20182

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20182
Log:
update msvc *.props file according to latest libs archive uploaded to sourceforge

Modified:
    trunk/Scribus/win32/vc11/Scribus-build-props.props
    trunk/Scribus/win32/vc11/Scribus.sln

Modified: trunk/Scribus/win32/vc11/Scribus-build-props.props
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20182&path=/trunk/Scribus/win32/vc11/Scribus-build-props.props
==============================================================================
--- trunk/Scribus/win32/vc11/Scribus-build-props.props (original)
+++ trunk/Scribus/win32/vc11/Scribus-build-props.props Sun Jun 21 18:45:34 2015
@@ -6,11 +6,11 @@
 	<!-- 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.5.x-libs-msvc2012</SCRIBUS_LIB_ROOT>
-    <!-- Qt5 -->
-    <QT5_DIR Condition="'$(Platform)' == 'Win32'">F:\Libraries-vcall\Qt-5.3.2\msvc2012_opengl</QT5_DIR>
-	<QT5_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)' == 'v100'">F:\Libraries-vcall\Qt\5.3\msvc2010_opengl</QT5_DIR>
-	<QT5_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)' == 'v110_xp'">F:\Libraries-vcall\Qt-5.3.2\msvc2012_opengl_xp</QT5_DIR>
-	<QT5_DIR Condition="'$(Platform)' == 'x64'">F:\Libraries-vcall\Qt-5.3.2\msvc2012_64_opengl</QT5_DIR>
+	<!-- Qt5 -->
+	<QT5_DIR Condition="'$(Platform)' == 'Win32'">F:\Libraries-vcall\Qt-5.4.2\msvc2012</QT5_DIR>
+	<QT5_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)' == 'v100'">F:\Libraries-vcall\Qt\5.4\msvc2010_opengl</QT5_DIR>
+	<QT5_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)' == 'v110_xp'">F:\Libraries-vcall\Qt-5.4.2\msvc2012_xp</QT5_DIR>
+	<QT5_DIR Condition="'$(Platform)' == 'x64'">F:\Libraries-vcall\Qt-5.4.2\msvc2012_64</QT5_DIR>
 	<QT5CORE_LIB Condition="'$(Configuration)' == 'Debug'">Qt5Cored.lib</QT5CORE_LIB>
 	<QT5CORE_LIB Condition="'$(Configuration)' == 'Release'">Qt5Core.lib</QT5CORE_LIB>
 	<QT5GUI_LIB Condition="'$(Configuration)' == 'Debug'">Qt5Guid.lib</QT5GUI_LIB>
@@ -32,101 +32,122 @@
 	<QT5XML_LIB Condition="'$(Configuration)' == 'Debug'">Qt5Xmld.lib</QT5XML_LIB>
 	<QT5XML_LIB Condition="'$(Configuration)' == 'Release'">Qt5Xml.lib</QT5XML_LIB>
 	<!-- Boost -->
-    <BOOST_DIR>$(SCRIBUS_COMMON_LIB_ROOT)\boost-1.51.0</BOOST_DIR>
+	<BOOST_DIR>$(SCRIBUS_COMMON_LIB_ROOT)\boost-1.58.0</BOOST_DIR>
 	<!-- Cairo -->
-    <CAIRO_DIR>$(SCRIBUS_LIB_ROOT)\cairo-1.12.18</CAIRO_DIR>
+	<CAIRO_DIR>$(SCRIBUS_LIB_ROOT)\cairo-1.12.18</CAIRO_DIR>
 	<CAIRO_INCLUDE_DIR>$(CAIRO_DIR)\include</CAIRO_INCLUDE_DIR>
 	<CAIRO_LIB_DIR>$(CAIRO_DIR)\lib\$(Platform)-$(PlatformToolset)</CAIRO_LIB_DIR>
-    <CAIRO_LIB Condition="'$(Configuration)' == 'Debug'">cairo2d.lib</CAIRO_LIB>
-    <CAIRO_LIB Condition="'$(Configuration)' == 'Release'">cairo2.lib</CAIRO_LIB>
+	<CAIRO_LIB Condition="'$(Configuration)' == 'Debug'">cairo2d.lib</CAIRO_LIB>
+	<CAIRO_LIB Condition="'$(Configuration)' == 'Release'">cairo2.lib</CAIRO_LIB>
 	<!-- Freetype -->
-    <FREETYPE_DIR>$(SCRIBUS_LIB_ROOT)\freetype-2.5.5</FREETYPE_DIR>
+	<FREETYPE_DIR>$(SCRIBUS_LIB_ROOT)\freetype-2.5.5</FREETYPE_DIR>
 	<FREETYPE_INCLUDE_DIR>$(FREETYPE_DIR)\include</FREETYPE_INCLUDE_DIR>
 	<FREETYPE_LIB_DIR>$(FREETYPE_DIR)\lib\$(Platform)-$(PlatformToolset)</FREETYPE_LIB_DIR>
-    <FREETYPE_LIB Condition="'$(Configuration)' == 'Debug'">freetype_d.lib</FREETYPE_LIB>
-    <FREETYPE_LIB Condition="'$(Configuration)' == 'Release'">freetype.lib</FREETYPE_LIB>
+	<FREETYPE_LIB Condition="'$(Configuration)' == 'Debug'">freetype_d.lib</FREETYPE_LIB>
+	<FREETYPE_LIB Condition="'$(Configuration)' == 'Release'">freetype.lib</FREETYPE_LIB>
 	<!-- Hunspell -->
-    <HUNSPELL_DIR>$(SCRIBUS_LIB_ROOT)\hunspell-1.3.3</HUNSPELL_DIR>
+	<HUNSPELL_DIR>$(SCRIBUS_LIB_ROOT)\hunspell-1.3.3</HUNSPELL_DIR>
 	<HUNSPELL_INCLUDE_DIR>$(HUNSPELL_DIR)\include</HUNSPELL_INCLUDE_DIR>
 	<HUNSPELL_LIB_DIR>$(HUNSPELL_DIR)\lib\$(Platform)-$(PlatformToolset)</HUNSPELL_LIB_DIR>
-    <HUNSPELL_LIB Condition="'$(Configuration)' == 'Debug'">libhunspell_staticD.lib</HUNSPELL_LIB>
-    <HUNSPELL_LIB Condition="'$(Configuration)' == 'Release'">libhunspell_static.lib</HUNSPELL_LIB>
+	<HUNSPELL_LIB Condition="'$(Configuration)' == 'Debug'">libhunspell_staticD.lib</HUNSPELL_LIB>
+	<HUNSPELL_LIB Condition="'$(Configuration)' == 'Release'">libhunspell_static.lib</HUNSPELL_LIB>
 	<!-- Iconv -->
-    <ICONV_DIR>$(SCRIBUS_LIB_ROOT)\libiconv-1.14</ICONV_DIR>
+	<ICONV_DIR>$(SCRIBUS_LIB_ROOT)\libiconv-1.14</ICONV_DIR>
 	<ICONV_INCLUDE_DIR>$(ICONV_DIR)\include</ICONV_INCLUDE_DIR>
 	<ICONV_LIB_DIR>$(ICONV_DIR)\lib\$(Platform)-$(PlatformToolset)</ICONV_LIB_DIR>
 	<ICONV_LIB Condition="'$(Configuration)' == 'Debug'">iconv_d.lib</ICONV_LIB>
-    <ICONV_LIB Condition="'$(Configuration)' == 'Release'">iconv.lib</ICONV_LIB>
+	<ICONV_LIB Condition="'$(Configuration)' == 'Release'">iconv.lib</ICONV_LIB>
 	<!-- Icu -->
-	<ICU_INCLUDE_DIR>$(SCRIBUS_LIB_ROOT)\icu-52.1\include</ICU_INCLUDE_DIR>
-	<ICU_LIB_DIR>$(SCRIBUS_LIB_ROOT)\icu-52.1\lib\$(Platform)-$(PlatformToolset)</ICU_LIB_DIR>
+	<ICU_INCLUDE_DIR>$(SCRIBUS_LIB_ROOT)\icu-53.1\include</ICU_INCLUDE_DIR>
+	<ICU_LIB_DIR>$(SCRIBUS_LIB_ROOT)\icu-53.1\lib\$(Platform)-$(PlatformToolset)</ICU_LIB_DIR>
 	<ICU_LIB>icudt.lib;icuin.lib;icuuc.lib</ICU_LIB>
 	<!-- Littlecms -->
-    <LCMS_DIR>$(SCRIBUS_LIB_ROOT)\lcms2-2.7</LCMS_DIR>
+	<LCMS_DIR>$(SCRIBUS_LIB_ROOT)\lcms2-2.7</LCMS_DIR>
 	<LCMS_INCLUDE_DIR>$(LCMS_DIR)\include</LCMS_INCLUDE_DIR>
 	<LCMS_LIB_DIR>$(LCMS_DIR)\lib\$(Platform)-$(PlatformToolset)</LCMS_LIB_DIR>
-    <LCMS_LIB Condition="'$(Configuration)' == 'Debug'">lcms2_staticd.lib</LCMS_LIB>
-    <LCMS_LIB Condition="'$(Configuration)' == 'Release'">lcms2_static.lib</LCMS_LIB>
+	<LCMS_LIB Condition="'$(Configuration)' == 'Debug'">lcms2_staticd.lib</LCMS_LIB>
+	<LCMS_LIB Condition="'$(Configuration)' == 'Release'">lcms2_static.lib</LCMS_LIB>
+	<!-- Libcdr -->
+	<LIBCDR_DIR>$(SCRIBUS_LIB_ROOT)\libcdr-0.1.1</LIBCDR_DIR>
+	<LIBCDR_INCLUDE_DIR>$(LIBCDR_DIR)\inc</LIBCDR_INCLUDE_DIR>
+	<LIBCDR_LIB_DIR>$(LIBCDR_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBCDR_LIB_DIR>
+	<LIBCDR_LIB Condition="'$(Configuration)' == 'Debug'">libcdr_d.lib</LIBCDR_LIB>
+	<LIBCDR_LIB Condition="'$(Configuration)' == 'Release'">libcdr.lib</LIBCDR_LIB>
+	<!-- Libfreehand -->
+	<LIBFREEHAND_DIR>$(SCRIBUS_LIB_ROOT)\libfreehand-0.1.1</LIBFREEHAND_DIR>
+	<LIBFREEHAND_INCLUDE_DIR>$(LIBFREEHAND_DIR)\inc</LIBFREEHAND_INCLUDE_DIR>
+	<LIBFREEHAND_LIB_DIR>$(LIBFREEHAND_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBFREEHAND_LIB_DIR>
+	<LIBFREEHAND_LIB Condition="'$(Configuration)' == 'Debug'">libfreehand_d.lib</LIBFREEHAND_LIB>
+	<LIBFREEHAND_LIB Condition="'$(Configuration)' == 'Release'">libfreehand.lib</LIBFREEHAND_LIB>
 	<!-- Libjpeg -->
-    <LIBJPEG_DIR>$(SCRIBUS_LIB_ROOT)\libjpeg-9a</LIBJPEG_DIR>
+	<LIBJPEG_DIR>$(SCRIBUS_LIB_ROOT)\libjpeg-9a</LIBJPEG_DIR>
 	<LIBJPEG_INCLUDE_DIR>$(LIBJPEG_DIR)\include</LIBJPEG_INCLUDE_DIR>
 	<LIBJPEG_LIB_DIR>$(LIBJPEG_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBJPEG_LIB_DIR>
-    <LIBJPEG_LIB Condition="'$(Configuration)' == 'Debug'">libjpeg9a_d.lib</LIBJPEG_LIB>
-    <LIBJPEG_LIB Condition="'$(Configuration)' == 'Release'">libjpeg9a.lib</LIBJPEG_LIB>
+	<LIBJPEG_LIB Condition="'$(Configuration)' == 'Debug'">libjpeg9a_d.lib</LIBJPEG_LIB>
+	<LIBJPEG_LIB Condition="'$(Configuration)' == 'Release'">libjpeg9a.lib</LIBJPEG_LIB>
 	<!-- Libmspub -->
-	<LIBMSPUB_INCLUDE_DIR>$(SCRIBUS_LIB_ROOT)\libmspub-0.1.2\inc</LIBMSPUB_INCLUDE_DIR>
-	<LIBMSPUB_LIB_DIR>$(SCRIBUS_LIB_ROOT)\libmspub-0.1.2\lib\$(Platform)-$(PlatformToolset)</LIBMSPUB_LIB_DIR>
-    <LIBMSPUB_LIB Condition="'$(Configuration)' == 'Debug'">libmspub_d.lib</LIBMSPUB_LIB>
-    <LIBMSPUB_LIB Condition="'$(Configuration)' == 'Release'">libmspub.lib</LIBMSPUB_LIB>
+	<LIBMSPUB_DIR>$(SCRIBUS_LIB_ROOT)\libmspub-0.1.2</LIBMSPUB_DIR>
+	<LIBMSPUB_INCLUDE_DIR>$(LIBMSPUB_DIR)\inc</LIBMSPUB_INCLUDE_DIR>
+	<LIBMSPUB_LIB_DIR>$(LIBMSPUB_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBMSPUB_LIB_DIR>
+	<LIBMSPUB_LIB Condition="'$(Configuration)' == 'Debug'">libmspub_d.lib</LIBMSPUB_LIB>
+	<LIBMSPUB_LIB Condition="'$(Configuration)' == 'Release'">libmspub.lib</LIBMSPUB_LIB>
 	<!-- Libpagemaker -->
-	<LIBPAGEMAKER_INCLUDE_DIR>$(SCRIBUS_LIB_ROOT)\libpagemaker-0.0.2\inc</LIBPAGEMAKER_INCLUDE_DIR>
-	<LIBPAGEMAKER_LIB_DIR>$(SCRIBUS_LIB_ROOT)\libpagemaker-0.0.2\lib\$(Platform)-$(PlatformToolset)</LIBPAGEMAKER_LIB_DIR>
-    <LIBPAGEMAKER_LIB Condition="'$(Configuration)' == 'Debug'">libpagemaker_d.lib</LIBPAGEMAKER_LIB>
-    <LIBPAGEMAKER_LIB Condition="'$(Configuration)' == 'Release'">libpagemaker.lib</LIBPAGEMAKER_LIB>
+	<LIBPAGEMAKER_DIR>$(SCRIBUS_LIB_ROOT)\libpagemaker-0.0.2</LIBPAGEMAKER_DIR>
+	<LIBPAGEMAKER_INCLUDE_DIR>$(LIBPAGEMAKER_DIR)\inc</LIBPAGEMAKER_INCLUDE_DIR>
+	<LIBPAGEMAKER_LIB_DIR>$(LIBPAGEMAKER_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBPAGEMAKER_LIB_DIR>
+	<LIBPAGEMAKER_LIB Condition="'$(Configuration)' == 'Debug'">libpagemaker_d.lib</LIBPAGEMAKER_LIB>
+	<LIBPAGEMAKER_LIB Condition="'$(Configuration)' == 'Release'">libpagemaker.lib</LIBPAGEMAKER_LIB>
 	<!-- Librevenge -->
-	<LIBREVENGE_INCLUDE_DIR>$(SCRIBUS_LIB_ROOT)\librevenge-0.0.2\inc</LIBREVENGE_INCLUDE_DIR>
-	<LIBREVENGE_LIB_DIR>$(SCRIBUS_LIB_ROOT)\librevenge-0.0.2\lib\$(Platform)-$(PlatformToolset)</LIBREVENGE_LIB_DIR>
+	<LIBREVENGE_DIR>$(SCRIBUS_LIB_ROOT)\librevenge-0.0.2</LIBREVENGE_DIR>
+	<LIBREVENGE_INCLUDE_DIR>$(LIBREVENGE_DIR)\inc</LIBREVENGE_INCLUDE_DIR>
+	<LIBREVENGE_LIB_DIR>$(LIBREVENGE_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBREVENGE_LIB_DIR>
 	<LIBREVENGE_LIB Condition="'$(Configuration)' == 'Debug'">librevenge-0.0d.lib</LIBREVENGE_LIB>
-    <LIBREVENGE_LIB Condition="'$(Configuration)' == 'Release'">librevenge-0.0.lib</LIBREVENGE_LIB>
+	<LIBREVENGE_LIB Condition="'$(Configuration)' == 'Release'">librevenge-0.0.lib</LIBREVENGE_LIB>
 	<LIBREVENGE_STREAM_LIB Condition="'$(Configuration)' == 'Debug'">librevenge-stream-0.0d.lib</LIBREVENGE_STREAM_LIB>
-    <LIBREVENGE_STREAM_LIB Condition="'$(Configuration)' == 'Release'">librevenge-stream-0.0.lib</LIBREVENGE_STREAM_LIB>
+	<LIBREVENGE_STREAM_LIB Condition="'$(Configuration)' == 'Release'">librevenge-stream-0.0.lib</LIBREVENGE_STREAM_LIB>
 	<!-- Libtiff -->
-    <LIBTIFF_DIR>$(SCRIBUS_LIB_ROOT)\libtiff-4.0.3</LIBTIFF_DIR>
+	<LIBTIFF_DIR>$(SCRIBUS_LIB_ROOT)\libtiff-4.0.3</LIBTIFF_DIR>
 	<LIBTIFF_INCLUDE_DIR>$(LIBTIFF_DIR)\include</LIBTIFF_INCLUDE_DIR>
 	<LIBTIFF_LIB_DIR>$(LIBTIFF_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBTIFF_LIB_DIR>
-    <LIBTIFF_LIB Condition="'$(Configuration)' == 'Debug'">libtiff5_d.lib</LIBTIFF_LIB>
-    <LIBTIFF_LIB Condition="'$(Configuration)' == 'Release'">libtiff5.lib</LIBTIFF_LIB>
+	<LIBTIFF_LIB Condition="'$(Configuration)' == 'Debug'">libtiff5_d.lib</LIBTIFF_LIB>
+	<LIBTIFF_LIB Condition="'$(Configuration)' == 'Release'">libtiff5.lib</LIBTIFF_LIB>
+	<!-- Libvisio -->
+	<LIBVISIO_DIR>$(SCRIBUS_LIB_ROOT)\libvisio-0.1.1</LIBVISIO_DIR>
+	<LIBVISIO_INCLUDE_DIR>$(LIBVISIO_DIR)\inc</LIBVISIO_INCLUDE_DIR>
+	<LIBVISIO_LIB_DIR>$(LIBVISIO_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBVISIO_LIB_DIR>
+	<LIBVISIO_LIB Condition="'$(Configuration)' == 'Debug'">libvisio_d.lib</LIBVISIO_LIB>
+	<LIBVISIO_LIB Condition="'$(Configuration)' == 'Release'">libvisio.lib</LIBVISIO_LIB>
 	<!-- Libxml2 -->
 	<LIBXML2_DIR>$(SCRIBUS_LIB_ROOT)\libxml2-2.9.2</LIBXML2_DIR>
 	<LIBXML2_INCLUDE_DIR>$(LIBXML2_DIR)\include</LIBXML2_INCLUDE_DIR>
 	<LIBXML2_LIB_DIR>$(LIBXML2_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBXML2_LIB_DIR>
-    <LIBXML2_LIB Condition="'$(Configuration)' == 'Debug'">libxml2_d.lib</LIBXML2_LIB>
-    <LIBXML2_LIB Condition="'$(Configuration)' == 'Release'">libxml2.lib</LIBXML2_LIB>
+	<LIBXML2_LIB Condition="'$(Configuration)' == 'Debug'">libxml2_d.lib</LIBXML2_LIB>
+	<LIBXML2_LIB Condition="'$(Configuration)' == 'Release'">libxml2.lib</LIBXML2_LIB>
 	<!-- PoDoFo -->
-    <PODOFO_DIR>$(SCRIBUS_LIB_ROOT)\podofo-0.9.3</PODOFO_DIR>
+	<PODOFO_DIR>$(SCRIBUS_LIB_ROOT)\podofo-0.9.3</PODOFO_DIR>
 	<PODOFO_INCLUDE_DIR>$(PODOFO_DIR)\include</PODOFO_INCLUDE_DIR>
 	<PODOFO_LIB_DIR>$(PODOFO_DIR)\lib\$(Platform)-$(PlatformToolset)</PODOFO_LIB_DIR>
-    <PODOFO_LIB Condition="'$(Configuration)' == 'Debug'">PoDoFoLibD.lib</PODOFO_LIB>
-    <PODOFO_LIB Condition="'$(Configuration)' == 'Release'">PoDoFoLib.lib</PODOFO_LIB>
+	<PODOFO_LIB Condition="'$(Configuration)' == 'Debug'">PoDoFoLibD.lib</PODOFO_LIB>
+	<PODOFO_LIB Condition="'$(Configuration)' == 'Release'">PoDoFoLib.lib</PODOFO_LIB>
 	<!-- Poppler -->
 	<POPPLER_DIR>$(SCRIBUS_LIB_ROOT)\poppler-0.31.0</POPPLER_DIR>
 	<POPPLER_INCLUDE_DIR>$(POPPLER_DIR)\include</POPPLER_INCLUDE_DIR>
 	<POPPLER_LIB_DIR>$(POPPLER_DIR)\lib\$(Platform)-$(PlatformToolset)</POPPLER_LIB_DIR>
-    <POPPLER_LIB Condition="'$(Configuration)' == 'Debug'">poppler_staticD.lib</POPPLER_LIB>
-    <POPPLER_LIB Condition="'$(Configuration)' == 'Release'">poppler_static.lib</POPPLER_LIB>
+	<POPPLER_LIB Condition="'$(Configuration)' == 'Debug'">poppler_staticD.lib</POPPLER_LIB>
+	<POPPLER_LIB Condition="'$(Configuration)' == 'Release'">poppler_static.lib</POPPLER_LIB>
 	<!-- Python -->
-	<PYTHON_DIR Condition="'$(Platform)' == 'Win32'">$(SCRIBUS_COMMON_LIB_ROOT)\python-2.7.8-win32</PYTHON_DIR>
-	<PYTHON_DIR Condition="'$(Platform)' == 'x64'">$(SCRIBUS_COMMON_LIB_ROOT)\python-2.7.8-amd64</PYTHON_DIR>
+	<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_INCLUDE_DIR>$(PYTHON_DIR)\include</PYTHON_INCLUDE_DIR>
 	<PYTHON_LIB_DIR>$(PYTHON_DIR)\lib</PYTHON_LIB_DIR>
-    <PYTHON_LIB Condition="'$(Configuration)' == 'Debug'">python27_d.lib</PYTHON_LIB>
-    <PYTHON_LIB Condition="'$(Configuration)' == 'Release'">python27.lib</PYTHON_LIB>
+	<PYTHON_LIB Condition="'$(Configuration)' == 'Debug'">python27_d.lib</PYTHON_LIB>
+	<PYTHON_LIB Condition="'$(Configuration)' == 'Release'">python27.lib</PYTHON_LIB>
 	<!-- Zlib -->
 	<ZLIB_DIR>$(SCRIBUS_LIB_ROOT)\zlib-1.2.8</ZLIB_DIR>
 	<ZLIB_INCLUDE_DIR>$(ZLIB_DIR)\include</ZLIB_INCLUDE_DIR>
 	<ZLIB_LIB_DIR>$(ZLIB_DIR)\lib\$(Platform)-$(PlatformToolset)</ZLIB_LIB_DIR>
-    <ZLIB_LIB Condition="'$(Configuration)' == 'Debug'">zlib1d.lib</ZLIB_LIB>
-    <ZLIB_LIB Condition="'$(Configuration)' == 'Release'">zlib1.lib</ZLIB_LIB>
+	<ZLIB_LIB Condition="'$(Configuration)' == 'Debug'">zlib1d.lib</ZLIB_LIB>
+	<ZLIB_LIB Condition="'$(Configuration)' == 'Release'">zlib1.lib</ZLIB_LIB>
   </PropertyGroup>
   <PropertyGroup>
     <_ProjectFileVersion>11.0.60610.1</_ProjectFileVersion>

Modified: trunk/Scribus/win32/vc11/Scribus.sln
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20182&path=/trunk/Scribus/win32/vc11/Scribus.sln
==============================================================================
--- trunk/Scribus/win32/vc11/Scribus.sln (original)
+++ trunk/Scribus/win32/vc11/Scribus.sln Sun Jun 21 18:45:34 2015
@@ -315,6 +315,21 @@
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pubimport", "pubimport\pubimport.vcxproj", "{82E27AFC-A3B2-49AD-9432-411AD3E1A4CD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freehandimport", "freehandimport\freehandimport.vcxproj", "{5FD6472E-9B59-4490-BEDF-AC8966EB4F3F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visioimport", "visioimport\visioimport.vcxproj", "{BCEE742A-16A4-4F4C-8C6D-4E79D517EE81}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdrimport", "cdrimport\cdrimport.vcxproj", "{50B6573C-3462-4D85-B22B-4D85625B9284}"
 	ProjectSection(ProjectDependencies) = postProject
 		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
 	EndProjectSection
@@ -839,6 +854,30 @@
 		{82E27AFC-A3B2-49AD-9432-411AD3E1A4CD}.Release|Win32.Build.0 = Release|Win32
 		{82E27AFC-A3B2-49AD-9432-411AD3E1A4CD}.Release|x64.ActiveCfg = Release|x64
 		{82E27AFC-A3B2-49AD-9432-411AD3E1A4CD}.Release|x64.Build.0 = Release|x64
+		{5FD6472E-9B59-4490-BEDF-AC8966EB4F3F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5FD6472E-9B59-4490-BEDF-AC8966EB4F3F}.Debug|Win32.Build.0 = Debug|Win32
+		{5FD6472E-9B59-4490-BEDF-AC8966EB4F3F}.Debug|x64.ActiveCfg = Debug|x64
+		{5FD6472E-9B59-4490-BEDF-AC8966EB4F3F}.Debug|x64.Build.0 = Debug|x64
+		{5FD6472E-9B59-4490-BEDF-AC8966EB4F3F}.Release|Win32.ActiveCfg = Release|Win32
+		{5FD6472E-9B59-4490-BEDF-AC8966EB4F3F}.Release|Win32.Build.0 = Release|Win32
+		{5FD6472E-9B59-4490-BEDF-AC8966EB4F3F}.Release|x64.ActiveCfg = Release|x64
+		{5FD6472E-9B59-4490-BEDF-AC8966EB4F3F}.Release|x64.Build.0 = Release|x64
+		{BCEE742A-16A4-4F4C-8C6D-4E79D517EE81}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BCEE742A-16A4-4F4C-8C6D-4E79D517EE81}.Debug|Win32.Build.0 = Debug|Win32
+		{BCEE742A-16A4-4F4C-8C6D-4E79D517EE81}.Debug|x64.ActiveCfg = Debug|x64
+		{BCEE742A-16A4-4F4C-8C6D-4E79D517EE81}.Debug|x64.Build.0 = Debug|x64
+		{BCEE742A-16A4-4F4C-8C6D-4E79D517EE81}.Release|Win32.ActiveCfg = Release|Win32
+		{BCEE742A-16A4-4F4C-8C6D-4E79D517EE81}.Release|Win32.Build.0 = Release|Win32
+		{BCEE742A-16A4-4F4C-8C6D-4E79D517EE81}.Release|x64.ActiveCfg = Release|x64
+		{BCEE742A-16A4-4F4C-8C6D-4E79D517EE81}.Release|x64.Build.0 = Release|x64
+		{50B6573C-3462-4D85-B22B-4D85625B9284}.Debug|Win32.ActiveCfg = Debug|Win32
+		{50B6573C-3462-4D85-B22B-4D85625B9284}.Debug|Win32.Build.0 = Debug|Win32
+		{50B6573C-3462-4D85-B22B-4D85625B9284}.Debug|x64.ActiveCfg = Debug|x64
+		{50B6573C-3462-4D85-B22B-4D85625B9284}.Debug|x64.Build.0 = Debug|x64
+		{50B6573C-3462-4D85-B22B-4D85625B9284}.Release|Win32.ActiveCfg = Release|Win32
+		{50B6573C-3462-4D85-B22B-4D85625B9284}.Release|Win32.Build.0 = Release|Win32
+		{50B6573C-3462-4D85-B22B-4D85625B9284}.Release|x64.ActiveCfg = Release|x64
+		{50B6573C-3462-4D85-B22B-4D85625B9284}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE




More information about the scribus-commit mailing list