r19750 by jghali - update msvc props file

scribus-commit scribus-commit at lists.scribus.net
Tue Jan 13 01:13:49 UTC 2015


Author: jghali
Date: Tue Jan 13 01:13:49 2015
New Revision: 19750

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19750
Log:
update msvc props file

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=19750&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 Tue Jan 13 01:13:49 2015
@@ -3,34 +3,50 @@
   <ImportGroup Label="PropertySheets">
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <QT4_DIR>C:\Libraries-vc11\qt-4.8.4</QT4_DIR>
-    <BOOST_DIR>C:\Libraries-vc11\boost-1.51.0</BOOST_DIR>
-    <CAIRO_DIR>C:\Libraries-vc11\cairo-1.8.6</CAIRO_DIR>
+	<!-- 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>
+	<!-- Boost -->
+    <BOOST_DIR>F:\Scribus Libs\scribus-common-libs\boost-1.51.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>
-    <FREETYPE_DIR>C:\Libraries-vc11\freetype-2.4.6</FREETYPE_DIR>
+	<!-- 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>
-    <HUNSPELL_DIR>C:\Libraries-vc11\hunspell-1.3.2</HUNSPELL_DIR>
+	<!-- Hunspell -->
+    <HUNSPELL_DIR>F:\Scribus Libs\scribus-1.4.x-libs-msvc2012\hunspell-1.3.2</HUNSPELL_DIR>
     <HUNSPELL_DEBUG_LIB>libhunspell_staticD.lib</HUNSPELL_DEBUG_LIB>
     <HUNSPELL_RELEASE_LIB>libhunspell_static.lib</HUNSPELL_RELEASE_LIB>
-    <ICONV_DIR>C:\Libraries-vc11\libiconv-1.14</ICONV_DIR>
-    <LCMS_DIR>C:\Libraries-vc11\lcms2-2.3</LCMS_DIR>
+	<!-- 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>
+	<!-- 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>
-    <LIBJPEG_DIR>C:\Libraries-vc11\libjpeg-8d</LIBJPEG_DIR>
+	<!-- 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>
-    <LIBTIFF_DIR>C:\Libraries-vc11\libtiff-3.9.5</LIBTIFF_DIR>
+	<!-- 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>
-    <PODOFO_DIR>C:\Libraries-vc11\podofo-0.9.1</PODOFO_DIR>
+	<!-- 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>
-    <LIBXML2_DIR>C:\Libraries-vc11\libxml2-2.7.8</LIBXML2_DIR>
+	<!-- 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>
-    <PYTHON_DIR>C:\Libraries-vc11\Python-2.7.5</PYTHON_DIR>
+	<!-- 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_DEBUG_LIB>python27_d.lib</PYTHON_DEBUG_LIB>
     <PYTHON_RELEASE_LIB>python27.lib</PYTHON_RELEASE_LIB>
   </PropertyGroup>
@@ -74,6 +90,12 @@
     </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>

Modified: branches/Version14x/Scribus/win32/vc9/Scribus-build-props.vsprops
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19750&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 Tue Jan 13 01:13:49 2015
@@ -4,124 +4,112 @@
 	Version="8.00"
 	Name="Scribus-build-props"
 	>
-	<UserMacro
-		Name="QT4_DIR"
-		Value="F:\Libraries-vc9\qt-4.7.3"
+	<!-- Qt4 -->
+	<UserMacro Name="QT4_DIR"
+		Value="F:\Libraries-vcall\Qt-4.8.6\msvc2008"
 	/>
-	<UserMacro
-		Name="BOOST_DIR"
-		Value="F:\Libraries-vc9\boost-1.35.0"
+	<!-- Boost -->
+	<UserMacro Name="BOOST_DIR"
+		Value="F:\Scribus Libs\scribus-common-libs\boost-1.51.0"
 	/>
-	<UserMacro
-		Name="CAIRO_DIR"
-		Value="F:\Libraries-vc9\cairo-1.8.6"
+	<!-- Cairo -->
+	<UserMacro Name="CAIRO_DIR"
+		Value="F:\Scribus Libs\scribus-1.4.x-libs-msvc2008\cairo-1.8.6"
 	/>
-	<UserMacro
-		Name="CAIRO_DEBUG_LIB"
+	<UserMacro Name="CAIRO_DEBUG_LIB"
 		Value="cairo2d.lib"
 	/>
-	<UserMacro
-		Name="CAIRO_RELEASE_LIB"
+	<UserMacro Name="CAIRO_RELEASE_LIB"
 		Value="cairo2.lib"
 	/>
-	<UserMacro
-		Name="FREETYPE_DIR"
-		Value="F:\Libraries-vc9\freetype-2.4.6"
+	<!-- Freetype -->
+	<UserMacro Name="FREETYPE_DIR"
+		Value="F:\Scribus Libs\scribus-1.4.x-libs-msvc2008\freetype-2.4.6"
 	/>
-	<UserMacro
-		Name="FREETYPE_DEBUG_LIB"
+	<UserMacro Name="FREETYPE_DEBUG_LIB"
 		Value="freetypeD.lib"
 	/>
-	<UserMacro
-		Name="FREETYPE_RELEASE_LIB"
+	<UserMacro Name="FREETYPE_RELEASE_LIB"
 		Value="freetype.lib"
 	/>
-	<UserMacro
-		Name="HUNSPELL_DIR"
-		Value="F:\Libraries-vc9\hunspell-1.3.2"
+	<!-- Hunspell -->
+	<UserMacro Name="HUNSPELL_DIR"
+		Value="F:\Scribus Libs\scribus-1.4.x-libs-msvc2008\hunspell-1.3.2"
 	/>
-	<UserMacro
-		Name="HUNSPELL_DEBUG_LIB"
+	<UserMacro Name="HUNSPELL_DEBUG_LIB"
 		Value="libhunspell_staticD.lib"
 	/>
-	<UserMacro
-		Name="HUNSPELL_RELEASE_LIB"
+	<UserMacro Name="HUNSPELL_RELEASE_LIB"
 		Value="libhunspell_static.lib"
 	/>
-	<UserMacro
-		Name="ICONV_DIR"
-		Value="F:\Libraries-vc9\iconv-1.9.2"
+	<!-- Iconv -->
+	<UserMacro Name="ICONV_DIR"
+		Value="F:\Scribus Libs\scribus-1.4.x-libs-msvc2008\iconv-1.14"
 	/>
-	<UserMacro
-		Name="LCMS_DIR"
-		Value="F:\Libraries-vc9\lcms2-2.3"
+	<UserMacro Name="ICONV_DEBUG_LIB"
+		Value="iconv_d.lib"
 	/>
-	<UserMacro
-		Name="LCMS_DEBUG_LIB"
+	<UserMacro Name="ICONV_RELEASE_LIB"
+		Value="iconv.lib"
+	/>
+	<!-- Littlecms -->
+	<UserMacro Name="LCMS_DIR"
+		Value="F:\Scribus Libs\scribus-1.4.x-libs-msvc2008\lcms2-2.3"
+	/>
+	<UserMacro Name="LCMS_DEBUG_LIB"
 		Value="lcms2_staticd.lib"
 	/>
-	<UserMacro
-		Name="LCMS_RELEASE_LIB"
+	<UserMacro Name="LCMS_RELEASE_LIB"
 		Value="lcms2_static.lib"
 	/>
-	<UserMacro
-		Name="LIBJPEG_DIR"
-		Value="F:\Libraries-vc9\libjpeg-6b-3"
+	<!-- Libjpeg -->
+	<UserMacro Name="LIBJPEG_DIR"
+		Value="F:\Scribus Libs\scribus-1.4.x-libs-msvc2008\libjpeg-8d"
 	/>
-	<UserMacro
-		Name="LIBJPEG_DEBUG_LIB"
-		Value="libjpeg.a"
+	<UserMacro Name="LIBJPEG_DEBUG_LIB"
+		Value="jpeg8d_d.lib"
 	/>
-	<UserMacro
-		Name="LIBJPEG_RELEASE_LIB"
-		Value="libjpeg.a"
+	<UserMacro Name="LIBJPEG_RELEASE_LIB"
+		Value="jpeg8d.lib"
 	/>
-	<UserMacro
-		Name="LIBTIFF_DIR"
-		Value="F:\Libraries-vc9\libtiff-3.8.2"
+	<!-- Libtiff -->
+	<UserMacro Name="LIBTIFF_DIR"
+		Value="F:\Scribus Libs\scribus-1.4.x-libs-msvc2008\libtiff-3.9.7"
 	/>
-	<UserMacro
-		Name="LIBTIFF_DEBUG_LIB"
-		Value="libtiff.lib"
+	<UserMacro Name="LIBTIFF_DEBUG_LIB"
+		Value="libtiff3_d.lib"
 	/>
-	<UserMacro
-		Name="LIBTIFF_RELEASE_LIB"
-		Value="libtiff.lib"
+	<UserMacro Name="LIBTIFF_RELEASE_LIB"
+		Value="libtiff3.lib"
 	/>
-	<UserMacro
-		Name="PODOFO_DIR"
-		Value="F:\Libraries-vc9\podofo-0.8.4"
+	<!-- PoDoFo -->
+	<UserMacro Name="PODOFO_DIR"
+		Value="F:\Scribus Libs\scribus-1.4.x-libs-msvc2008\podofo-0.9.1"
 	/>
-	<UserMacro
-		Name="PODOFO_DEBUG_LIB"
+	<UserMacro Name="PODOFO_DEBUG_LIB"
 		Value="PoDoFoLibD.lib"
 	/>
-	<UserMacro
-		Name="PODOFO_RELEASE_LIB"
+	<UserMacro Name="PODOFO_RELEASE_LIB"
 		Value="PoDoFoLib.lib"
 	/>
-	<UserMacro
-		Name="LIBXML2_DIR"
-		Value="F:\Libraries-vc9\libxml2-2.6.32+"
+	<!-- Libxml2 -->
+	<UserMacro Name="LIBXML2_DIR"
+		Value="F:\Scribus Libs\scribus-1.4.x-libs-msvc2008\libxml2-2.9.1"
 	/>
-	<UserMacro
-		Name="LIBXML2_DEBUG_LIB"
+	<UserMacro Name="LIBXML2_DEBUG_LIB"
+		Value="libxml2_d.lib"
+	/>
+	<UserMacro Name="LIBXML2_RELEASE_LIB"
 		Value="libxml2.lib"
 	/>
-	<UserMacro
-		Name="LIBXML2_RELEASE_LIB"
-		Value="libxml2.lib"
+	<!-- Python -->
+	<UserMacro Name="PYTHON_DIR"
+		Value="F:\Scribus Libs\scribus-common-libs\python-2.7.8-win32"
 	/>
-	<UserMacro
-		Name="PYTHON_DIR"
-		Value="F:\Libraries-vc9\Python-2.7.3"
-	/>
-	<UserMacro
-		Name="PYTHON_DEBUG_LIB"
+	<UserMacro Name="PYTHON_DEBUG_LIB"
 		Value="python27_d.lib"
 	/>
-	<UserMacro
-		Name="PYTHON_RELEASE_LIB"
+	<UserMacro Name="PYTHON_RELEASE_LIB"
 		Value="python27.lib"
 	/>
 </VisualStudioPropertySheet>




More information about the scribus-commit mailing list