r20183 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:57:13 UTC 2015


Author: jghali
Date: Sun Jun 21 18:57:13 2015
New Revision: 20183

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

Modified:
    branches/Version14x/Scribus/win32/vc11/Scribus-build-props.props
    branches/Version14x/Scribus/win32/vc9/Scribus-build-props.vsprops

Modified: branches/Version14x/Scribus/win32/vc11/Scribus-build-props.props
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20183&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 Sun Jun 21 18:57:13 2015
@@ -4,10 +4,10 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
 	<!-- Qt4 -->
-    <QT4_DIR Condition="'$(Platform)' == 'Win32'">F:\Libraries-vcall\Qt-4.8.6\msvc2012</QT4_DIR>
-	<QT4_DIR Condition="'$(Platform)' == 'x64'">F:\Libraries-vcall\Qt-4.8.6\msvc2012_64</QT4_DIR>
+    <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>
 	<!-- Boost -->
-    <BOOST_DIR>F:\Scribus Libs\scribus-common-libs\boost-1.51.0</BOOST_DIR>
+    <BOOST_DIR>F:\Scribus Libs\scribus-common-libs\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>
@@ -17,7 +17,7 @@
     <FREETYPE_DEBUG_LIB>freetypeD.lib</FREETYPE_DEBUG_LIB>
     <FREETYPE_RELEASE_LIB>freetype.lib</FREETYPE_RELEASE_LIB>
 	<!-- Hunspell -->
-    <HUNSPELL_DIR>F:\Scribus Libs\scribus-1.4.x-libs-msvc2012\hunspell-1.3.2</HUNSPELL_DIR>
+    <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>
 	<!-- Iconv -->
@@ -29,9 +29,9 @@
     <LCMS_DEBUG_LIB>lcms2_staticd.lib</LCMS_DEBUG_LIB>
     <LCMS_RELEASE_LIB>lcms2_static.lib</LCMS_RELEASE_LIB>
 	<!-- Libjpeg -->
-    <LIBJPEG_DIR>F:\Scribus Libs\scribus-1.4.x-libs-msvc2012\libjpeg-8d</LIBJPEG_DIR>
-    <LIBJPEG_DEBUG_LIB>jpeg8d_d.lib</LIBJPEG_DEBUG_LIB>
-    <LIBJPEG_RELEASE_LIB>jpeg8d.lib</LIBJPEG_RELEASE_LIB>
+    <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>
 	<!-- 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>
@@ -45,8 +45,8 @@
     <LIBXML2_DEBUG_LIB>libxml2_d.lib</LIBXML2_DEBUG_LIB>
     <LIBXML2_RELEASE_LIB>libxml2.lib</LIBXML2_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'">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>
   </PropertyGroup>

Modified: branches/Version14x/Scribus/win32/vc9/Scribus-build-props.vsprops
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20183&path=/branches/Version14x/Scribus/win32/vc9/Scribus-build-props.vsprops
==============================================================================
--- branches/Version14x/Scribus/win32/vc9/Scribus-build-props.vsprops (original)
+++ branches/Version14x/Scribus/win32/vc9/Scribus-build-props.vsprops Sun Jun 21 18:57:13 2015
@@ -6,11 +6,11 @@
 	>
 	<!-- Qt4 -->
 	<UserMacro Name="QT4_DIR"
-		Value="F:\Libraries-vcall\Qt-4.8.6\msvc2008"
+		Value="F:\Libraries-vcall\Qt-4.8.7\msvc2008"
 	/>
 	<!-- Boost -->
 	<UserMacro Name="BOOST_DIR"
-		Value="F:\Scribus Libs\scribus-common-libs\boost-1.51.0"
+		Value="F:\Scribus Libs\scribus-common-libs\boost-1.58.0"
 	/>
 	<!-- Cairo -->
 	<UserMacro Name="CAIRO_DIR"
@@ -34,7 +34,7 @@
 	/>
 	<!-- Hunspell -->
 	<UserMacro Name="HUNSPELL_DIR"
-		Value="F:\Scribus Libs\scribus-1.4.x-libs-msvc2008\hunspell-1.3.2"
+		Value="F:\Scribus Libs\scribus-1.4.x-libs-msvc2008\hunspell-1.3.3"
 	/>
 	<UserMacro Name="HUNSPELL_DEBUG_LIB"
 		Value="libhunspell_staticD.lib"
@@ -44,7 +44,7 @@
 	/>
 	<!-- Iconv -->
 	<UserMacro Name="ICONV_DIR"
-		Value="F:\Scribus Libs\scribus-1.4.x-libs-msvc2008\iconv-1.14"
+		Value="F:\Scribus Libs\scribus-1.4.x-libs-msvc2008\libiconv-1.14"
 	/>
 	<UserMacro Name="ICONV_DEBUG_LIB"
 		Value="iconv_d.lib"
@@ -64,13 +64,13 @@
 	/>
 	<!-- Libjpeg -->
 	<UserMacro Name="LIBJPEG_DIR"
-		Value="F:\Scribus Libs\scribus-1.4.x-libs-msvc2008\libjpeg-8d"
+		Value="F:\Scribus Libs\scribus-1.4.x-libs-msvc2008\libjpeg-9a"
 	/>
 	<UserMacro Name="LIBJPEG_DEBUG_LIB"
-		Value="jpeg8d_d.lib"
+		Value="libjpeg9a_d.lib"
 	/>
 	<UserMacro Name="LIBJPEG_RELEASE_LIB"
-		Value="jpeg8d.lib"
+		Value="libjpeg9a.lib"
 	/>
 	<!-- Libtiff -->
 	<UserMacro Name="LIBTIFF_DIR"
@@ -104,7 +104,7 @@
 	/>
 	<!-- Python -->
 	<UserMacro Name="PYTHON_DIR"
-		Value="F:\Scribus Libs\scribus-common-libs\python-2.7.8-win32"
+		Value="F:\Scribus Libs\scribus-common-libs\python-2.7.10-win32"
 	/>
 	<UserMacro Name="PYTHON_DEBUG_LIB"
 		Value="python27_d.lib"




More information about the scribus-commit mailing list