r19982 by jghali - update msvc props file to reflect that msvc2012 solution can now be used to compile with msvc2010 toolset

scribus-commit scribus-commit at lists.scribus.net
Thu Apr 9 18:38:25 UTC 2015


Author: jghali
Date: Thu Apr  9 18:38:25 2015
New Revision: 19982

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19982
Log:
update msvc props file to reflect that msvc2012 solution can now be used to compile with msvc2010 toolset

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

Modified: trunk/Scribus/win32/vc10/Scribus-build-props.props
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19982&path=/trunk/Scribus/win32/vc10/Scribus-build-props.props
==============================================================================
--- trunk/Scribus/win32/vc10/Scribus-build-props.props (original)
+++ trunk/Scribus/win32/vc10/Scribus-build-props.props Thu Apr  9 18:38:25 2015
@@ -4,77 +4,80 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
 	<!-- Qt5 -->
-    <QT5_DIR>F:\Libraries-vcall\Qt\5.1.1\msvc2010_opengl</QT5_DIR>
+    <QT5_DIR>F:\Libraries-vcall\Qt\5.3\msvc2010_opengl</QT5_DIR>
+	<!-- 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-msvc2010</SCRIBUS_LIB_ROOT>
 	<!-- Boost -->
-    <BOOST_DIR>F:\Libraries-vc10\boost-1.51.0</BOOST_DIR>
+    <BOOST_DIR>$(SCRIBUS_COMMON_LIB_ROOT)\boost-1.51.0</BOOST_DIR>
 	<!-- Cairo -->
-    <CAIRO_DIR>F:\Libraries-vc10\cairo-1.12.16</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</CAIRO_LIB_DIR>
     <CAIRO_DEBUG_LIB>cairo2d.lib</CAIRO_DEBUG_LIB>
     <CAIRO_RELEASE_LIB>cairo2.lib</CAIRO_RELEASE_LIB>
 	<!-- Freetype -->
-    <FREETYPE_DIR>F:\Libraries-vc10\freetype-2.4.12</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</FREETYPE_LIB_DIR>
-    <FREETYPE_DEBUG_LIB>freetypeD.lib</FREETYPE_DEBUG_LIB>
+    <FREETYPE_DEBUG_LIB>freetype_d.lib</FREETYPE_DEBUG_LIB>
     <FREETYPE_RELEASE_LIB>freetype.lib</FREETYPE_RELEASE_LIB>
 	<!-- Hunspell -->
-    <HUNSPELL_DIR>F:\Libraries-vc10\hunspell-1.3.2</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</HUNSPELL_LIB_DIR>
     <HUNSPELL_DEBUG_LIB>libhunspell_staticD.lib</HUNSPELL_DEBUG_LIB>
     <HUNSPELL_RELEASE_LIB>libhunspell_static.lib</HUNSPELL_RELEASE_LIB>
 	<!-- Iconv -->
-    <ICONV_DIR>F:\Libraries-vc10\iconv-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</ICONV_LIB_DIR>
 	<ICONV_DEBUG_LIB>iconv.lib</ICONV_DEBUG_LIB>
     <ICONV_RELEASE_LIB>iconv_d.lib</ICONV_RELEASE_LIB>
 	<!-- Littlecms -->
-    <LCMS_DIR>F:\Libraries-vc10\lcms2-2.5</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</LCMS_LIB_DIR>
     <LCMS_DEBUG_LIB>lcms2_staticd.lib</LCMS_DEBUG_LIB>
     <LCMS_RELEASE_LIB>lcms2_static.lib</LCMS_RELEASE_LIB>
 	<!-- Libjpeg -->
-    <LIBJPEG_DIR>F:\Libraries-vc10\libjpeg-9</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</LIBJPEG_LIB_DIR>
-    <LIBJPEG_DEBUG_LIB>jpeg9_d.lib</LIBJPEG_DEBUG_LIB>
-    <LIBJPEG_RELEASE_LIB>jpeg9.lib</LIBJPEG_RELEASE_LIB>
+    <LIBJPEG_DEBUG_LIB>libjpeg9a_d.lib</LIBJPEG_DEBUG_LIB>
+    <LIBJPEG_RELEASE_LIB>libjpeg9a.lib</LIBJPEG_RELEASE_LIB>
 	<!-- Libtiff -->
-    <LIBTIFF_DIR>F:\Libraries-vc10\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</LIBTIFF_LIB_DIR>
     <LIBTIFF_DEBUG_LIB>libtiff5_d.lib</LIBTIFF_DEBUG_LIB>
     <LIBTIFF_RELEASE_LIB>libtiff5.lib</LIBTIFF_RELEASE_LIB>
 	<!-- Libxml2 -->
-	<LIBXML2_DIR>F:\Libraries-vc10\libxml2-2.9.1</LIBXML2_DIR>
+	<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</LIBXML2_LIB_DIR>
     <LIBXML2_DEBUG_LIB>libxml2_d.lib</LIBXML2_DEBUG_LIB>
     <LIBXML2_RELEASE_LIB>libxml2.lib</LIBXML2_RELEASE_LIB>
 	<!-- PoDoFo -->
-    <PODOFO_DIR>F:\Libraries-vc10\podofo-0.9.2</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</PODOFO_LIB_DIR>
     <PODOFO_DEBUG_LIB>PoDoFoLibD.lib</PODOFO_DEBUG_LIB>
     <PODOFO_RELEASE_LIB>PoDoFoLib.lib</PODOFO_RELEASE_LIB>
 	<!-- Poppler -->
-    <POPPLER_DIR>F:\Libraries-vc10\poppler-0.24.3</POPPLER_DIR>
+    <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</POPPLER_LIB_DIR>
     <POPPLER_DEBUG_LIB>poppler_staticD.lib</POPPLER_DEBUG_LIB>
     <POPPLER_RELEASE_LIB>poppler_static.lib</POPPLER_RELEASE_LIB>
 	<!-- Python -->
-	<PYTHON_DIR>F:\Libraries-vc10\Python-2.7.5</PYTHON_DIR>
+	<PYTHON_DIR>$(SCRIBUS_COMMON_LIB_ROOT)\python-2.7.8-win32</PYTHON_DIR>
 	<PYTHON_INCLUDE_DIR>$(PYTHON_DIR)\include</PYTHON_INCLUDE_DIR>
 	<PYTHON_LIB_DIR>$(PYTHON_DIR)\lib</PYTHON_LIB_DIR>
     <PYTHON_DEBUG_LIB>python27_d.lib</PYTHON_DEBUG_LIB>
     <PYTHON_RELEASE_LIB>python27.lib</PYTHON_RELEASE_LIB>
 	<!-- Zlib -->
-	<ZLIB_DIR>F:\Libraries-vc10\zlib-1.2.8</ZLIB_DIR>
+	<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</ZLIB_LIB_DIR>
     <ZLIB_DEBUG_LIB>zlib1d.lib</ZLIB_DEBUG_LIB>
@@ -83,115 +86,4 @@
   <PropertyGroup>
     <_ProjectFileVersion>11.0.60610.1</_ProjectFileVersion>
   </PropertyGroup>
-  <ItemDefinitionGroup />
-  <ItemGroup>
-    <BuildMacro Include="QT5_DIR">
-      <Value>$(QT5_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="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="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="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="POPPLER_DIR">
-      <Value>$(POPPLER_DIR)</Value>
-    </BuildMacro>
-    <BuildMacro Include="POPPLER_DEBUG_LIB">
-      <Value>$(POPPLER_DEBUG_LIB)</Value>
-    </BuildMacro>
-    <BuildMacro Include="POPPLER_RELEASE_LIB">
-      <Value>$(POPPLER_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>
-	<BuildMacro Include="ZLIB_DIR">
-      <Value>$(ZLIB_DIR)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ZLIB_DEBUG_LIB">
-      <Value>$(ZLIB_DEBUG_LIB)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ZLIB_RELEASE_LIB">
-      <Value>$(ZLIB_RELEASE_LIB)</Value>
-    </BuildMacro>
-  </ItemGroup>
 </Project>

Modified: trunk/Scribus/win32/vc11/Scribus-build-props.props
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19982&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 Thu Apr  9 18:38:25 2015
@@ -8,83 +8,73 @@
 	<QT5_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)' == 'v100'">F:\Libraries-vcall\Qt\5.3\msvc2010_opengl</QT5_DIR>
 	<QT5_DIR Condition="'$(Platform)' == 'x64'">F:\Libraries-vcall\Qt-5.3.2\msvc2012_64_opengl</QT5_DIR>
 	<!-- 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>
-	<SCRIBUS_LIB_ROOT Condition="'$(PlatformToolset)' == 'v100'">F:\Scribus Libs\scribus-1.5.x-libs-msvc2010</SCRIBUS_LIB_ROOT>
 	<!-- Boost -->
-    <BOOST_DIR>F:\Scribus Libs\scribus-common-libs\boost-1.51.0</BOOST_DIR>
+    <BOOST_DIR>$(SCRIBUS_COMMON_LIB_ROOT)\boost-1.51.0</BOOST_DIR>
 	<!-- Cairo -->
     <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)</CAIRO_LIB_DIR>
-	<CAIRO_LIB_DIR Condition="'$(PlatformToolset)' == 'v100'">$(CAIRO_DIR)\lib</CAIRO_LIB_DIR>
+	<CAIRO_LIB_DIR>$(CAIRO_DIR)\lib\$(Platform)-$(PlatformToolset)</CAIRO_LIB_DIR>
     <CAIRO_DEBUG_LIB>cairo2d.lib</CAIRO_DEBUG_LIB>
     <CAIRO_RELEASE_LIB>cairo2.lib</CAIRO_RELEASE_LIB>
 	<!-- Freetype -->
     <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)</FREETYPE_LIB_DIR>
-	<FREETYPE_LIB_DIR Condition="'$(PlatformToolset)' == 'v100'">$(FREETYPE_DIR)\lib</FREETYPE_LIB_DIR>
+	<FREETYPE_LIB_DIR>$(FREETYPE_DIR)\lib\$(Platform)-$(PlatformToolset)</FREETYPE_LIB_DIR>
     <FREETYPE_DEBUG_LIB>freetype_d.lib</FREETYPE_DEBUG_LIB>
     <FREETYPE_RELEASE_LIB>freetype.lib</FREETYPE_RELEASE_LIB>
 	<!-- Hunspell -->
     <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)</HUNSPELL_LIB_DIR>
-	<HUNSPELL_LIB_DIR Condition="'$(PlatformToolset)' == 'v100'">$(HUNSPELL_DIR)\lib</HUNSPELL_LIB_DIR>
+	<HUNSPELL_LIB_DIR>$(HUNSPELL_DIR)\lib\$(Platform)-$(PlatformToolset)</HUNSPELL_LIB_DIR>
     <HUNSPELL_DEBUG_LIB>libhunspell_staticD.lib</HUNSPELL_DEBUG_LIB>
     <HUNSPELL_RELEASE_LIB>libhunspell_static.lib</HUNSPELL_RELEASE_LIB>
 	<!-- Iconv -->
     <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)</ICONV_LIB_DIR>
-	<ICONV_LIB_DIR Condition="'$(PlatformToolset)' == 'v100'">$(ICONV_DIR)\lib</ICONV_LIB_DIR>
+	<ICONV_LIB_DIR>$(ICONV_DIR)\lib\$(Platform)-$(PlatformToolset)</ICONV_LIB_DIR>
 	<ICONV_DEBUG_LIB>iconv.lib</ICONV_DEBUG_LIB>
     <ICONV_RELEASE_LIB>iconv_d.lib</ICONV_RELEASE_LIB>
 	<!-- Littlecms -->
-    <LCMS_DIR>$(SCRIBUS_LIB_ROOT)\lcms2-2.5</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)</LCMS_LIB_DIR>
-	<LCMS_LIB_DIR Condition="'$(PlatformToolset)' == 'v100'">$(LCMS_DIR)\lib</LCMS_LIB_DIR>
+	<LCMS_LIB_DIR>$(LCMS_DIR)\lib\$(Platform)-$(PlatformToolset)</LCMS_LIB_DIR>
     <LCMS_DEBUG_LIB>lcms2_staticd.lib</LCMS_DEBUG_LIB>
     <LCMS_RELEASE_LIB>lcms2_static.lib</LCMS_RELEASE_LIB>
 	<!-- Libjpeg -->
     <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)</LIBJPEG_LIB_DIR>
-	<LIBJPEG_LIB_DIR Condition="'$(PlatformToolset)' == 'v100'">$(LIBJPEG_DIR)\lib</LIBJPEG_LIB_DIR>
+	<LIBJPEG_LIB_DIR>$(LIBJPEG_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBJPEG_LIB_DIR>
     <LIBJPEG_DEBUG_LIB>libjpeg9a_d.lib</LIBJPEG_DEBUG_LIB>
     <LIBJPEG_RELEASE_LIB>libjpeg9a.lib</LIBJPEG_RELEASE_LIB>
 	<!-- Libtiff -->
     <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)</LIBTIFF_LIB_DIR>
-	<LIBTIFF_LIB_DIR Condition="'$(PlatformToolset)' == 'v100'">$(LIBTIFF_DIR)\lib</LIBTIFF_LIB_DIR>
+	<LIBTIFF_LIB_DIR>$(LIBTIFF_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBTIFF_LIB_DIR>
     <LIBTIFF_DEBUG_LIB>libtiff5_d.lib</LIBTIFF_DEBUG_LIB>
     <LIBTIFF_RELEASE_LIB>libtiff5.lib</LIBTIFF_RELEASE_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)</LIBXML2_LIB_DIR>
-	<LIBXML2_LIB_DIR Condition="'$(PlatformToolset)' == 'v100'">$(LIBXML2_DIR)\lib</LIBXML2_LIB_DIR>
+	<LIBXML2_LIB_DIR>$(LIBXML2_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBXML2_LIB_DIR>
     <LIBXML2_DEBUG_LIB>libxml2_d.lib</LIBXML2_DEBUG_LIB>
     <LIBXML2_RELEASE_LIB>libxml2.lib</LIBXML2_RELEASE_LIB>
 	<!-- PoDoFo -->
     <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)</PODOFO_LIB_DIR>
-	<PODOFO_LIB_DIR Condition="'$(PlatformToolset)' == 'v100'">$(PODOFO_DIR)\lib</PODOFO_LIB_DIR>
+	<PODOFO_LIB_DIR>$(PODOFO_DIR)\lib\$(Platform)-$(PlatformToolset)</PODOFO_LIB_DIR>
     <PODOFO_DEBUG_LIB>PoDoFoLibD.lib</PODOFO_DEBUG_LIB>
     <PODOFO_RELEASE_LIB>PoDoFoLib.lib</PODOFO_RELEASE_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)</POPPLER_LIB_DIR>
-	<POPPLER_LIB_DIR Condition="'$(PlatformToolset)' == 'v100'">$(POPPLER_DIR)\lib</POPPLER_LIB_DIR>
+	<POPPLER_LIB_DIR>$(POPPLER_DIR)\lib\$(Platform)-$(PlatformToolset)</POPPLER_LIB_DIR>
     <POPPLER_DEBUG_LIB>poppler_staticD.lib</POPPLER_DEBUG_LIB>
     <POPPLER_RELEASE_LIB>poppler_static.lib</POPPLER_RELEASE_LIB>
 	<!-- Python -->
-	<PYTHON_DIR Condition="'$(Platform)' == 'Win32'">F:\Scribus Libs\scribus-common-libs\python-2.7.8-win32</PYTHON_DIR>
-	<PYTHON_DIR Condition="'$(Platform)' == 'x64'">F:\Scribus Libs\scribus-common-libs\python-2.7.8-amd64</PYTHON_DIR>
+	<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_INCLUDE_DIR>$(PYTHON_DIR)\include</PYTHON_INCLUDE_DIR>
 	<PYTHON_LIB_DIR>$(PYTHON_DIR)\lib</PYTHON_LIB_DIR>
     <PYTHON_DEBUG_LIB>python27_d.lib</PYTHON_DEBUG_LIB>
@@ -92,8 +82,7 @@
 	<!-- 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)</ZLIB_LIB_DIR>
-	<ZLIB_LIB_DIR Condition="'$(PlatformToolset)' == 'v100'">$(ZLIB_DIR)\lib</ZLIB_LIB_DIR>
+	<ZLIB_LIB_DIR>$(ZLIB_DIR)\lib\$(Platform)-$(PlatformToolset)</ZLIB_LIB_DIR>
     <ZLIB_DEBUG_LIB>zlib1d.lib</ZLIB_DEBUG_LIB>
     <ZLIB_RELEASE_LIB>zlib1.lib</ZLIB_RELEASE_LIB>
   </PropertyGroup>




More information about the scribus-commit mailing list