r22152 by jghali -
scribus-commit
scribus-commit at lists.scribus.net
Sun Sep 3 21:12:13 UTC 2017
Author: jghali
Date: Sun Sep 3 21:12:13 2017
New Revision: 22152
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22152
Log:
msvc project update
Modified:
trunk/Scribus/BUILDING_win32_msvc.txt
trunk/Scribus/win32/msvc2012/Scribus-build-props.props
trunk/Scribus/win32/msvc2015/Scribus-build-props.props
Modified: trunk/Scribus/BUILDING_win32_msvc.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22152&path=/trunk/Scribus/BUILDING_win32_msvc.txt
==============================================================================
--- trunk/Scribus/BUILDING_win32_msvc.txt (original)
+++ trunk/Scribus/BUILDING_win32_msvc.txt Sun Sep 3 21:12:13 2017
@@ -8,11 +8,11 @@
You will need:
- Microsoft Vista, 7 or a more recent version
- Microsoft Visual Studio 2012 or later (for 32/64bit build)
-- A recent Qt release built with corresponding Visual Studio version (minimum 5.2, recommended >= 5.3.2)
+- A recent Qt release built with corresponding Visual Studio version (minimum 5.5, recommended >= 5.6.0)
- Scribus common libraries kit downloaded from http://sourceforge.net/projects/scribus/files/scribus-libs/
- Scribus 15x libraries kit downloaded from http://sourceforge.net/projects/scribus/files/scribus-libs/
-It is possible to use Microsoft Visual Studio 2012 or 2013 Express editions.
+It is possible to use Microsoft Visual Studio 2012, 2013 or 2015 Express editions.
GETTING DEPENDENCIES
====================
@@ -38,7 +38,8 @@
Now cd to C:\Developer\qt-everywhere-whatever and run configure:
- Visual Studio 2012 : configure -platform win32-msvc2012 -prefix /path/where/you/want/qt5/to/be/installed -nomake examples -nomake tests -opengl desktop -opensource -mp
-- Visual Studio 2013 : configure -platform win32-msvc2013 -prefix /path/where/you/want/qt5/to/be/installed -nomake examples -nomake tests -opengl desktop -opensource -mp
+- Visual Studio 2013 : configure -platform win32-msvc2013 -prefix /path/where/you/want/qt5/to/be/installed -nomake examples -nomake tests -opengl desktop -opensource -mp
+- Visual Studio 2015 : configure -platform win32-msvc2015 -prefix /path/where/you/want/qt5/to/be/installed -nomake examples -nomake tests -opengl desktop -opensource -mp
After configure has finished its work, run nmake. Depending on the number of processors available on your machine, a complete Qt build may
take from a few hours to several days. Once Qt has finished building, run following command to install Qt to its install directory:
@@ -66,27 +67,28 @@
- msvcXXXX represents the Visual Studio version needed to compile provided Visual Studio solution
- YYYYMMDD represents the date where the archive has been prepared/uploaded to Sourceforge.
-For building 15x dependencies, an archive for Visual Studio 2012 is provided. This archive allows to build libraries
-for 32bit and 64bit platforms using the different available toolsets, excluding the v110_xp and v120_xp ones. The default
-configuration, corresponding to the msvc 2012 default toolset (v110), allows to build binaries compatible with Windows Vista and up.
+For building 15x dependencies, archives for Visual Studio 2012 and Visual Studio 2015 are provided. These archives allows to
+build libraries for 32bit and 64bit platforms using the different available toolsets, including the Windows XP compatible ones.
+The default configuration allows to build binaries compatible with Windows Vista and up.
Once you downloaded the two appropriate archives :
- decompress them in the *same* directory so as to get a layout similar to this one :
- your_script_libs_directory
- |- scribus-1.5.x-libs-msvc2012
+ |- scribus-1.5.x-libs-msvc2015
|- scribus-common-libs
- open the visual studio solution (*.sln) located in the scribus-1.5.x-libs-* directory
- build debug and release configurations for all platforms (Win32 and/or x64) you plan to execute scribus on
If you want to build using a different toolset, you can use msbuild through the command line. To do so you can use the provided
build-all-platform-libs.bat script. For example :
-- to build with Visual Studio 2010 toolset for Win32 platform: build-all-platform-libs.bat Win32 v100
-- to build with Visual Studio 2012 XP compatible toolset for Win32 platform: build-all-platform-libs.bat Win32 v110_xp
+- to build with Visual Studio 2015 default toolset for x64 platform: build-all-platform-libs.bat x64 v140
+- to build with Visual Studio 2015 Windows XP toolset for Win32 platform: build-all-platform-libs.bat Win32 v140_xp
BUILDING SCRIBUS
====================
-After having compiled all dependencies, open Scribus-build-props.props files located in Scribus\win32\vc11 in a text editor
+After having compiled all dependencies, open the Scribus-build-props.props file located in Scribus\win32\msvc2012 or
+Scribus\win32\msvc2015 depending on the Visual Studio version you are using in a text editor.
Update the dependency paths to match your system.
Open the Visual Studio solution located in same directoy and start building. Note: if you built dependencies with a different
@@ -104,7 +106,7 @@
set SCRIBUS_SRC_PATH=.\Scribus
set SCRIBUS_BUILD_ROOT=.\Scribus-builds
-set SCRIBUS_INSTALL_PATH=.\Scribus-builds\scribus-debug-win32-v110
+set SCRIBUS_INSTALL_PATH=.\Scribus-builds\scribus-debug-win32-v140
if not exist %SCRIBUS_INSTALL_PATH%\libs mkdir %SCRIBUS_INSTALL_PATH%\libs
if not exist %SCRIBUS_INSTALL_PATH%\share mkdir %SCRIBUS_INSTALL_PATH%\share
Modified: trunk/Scribus/win32/msvc2012/Scribus-build-props.props
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22152&path=/trunk/Scribus/win32/msvc2012/Scribus-build-props.props
==============================================================================
--- trunk/Scribus/win32/msvc2012/Scribus-build-props.props (original)
+++ trunk/Scribus/win32/msvc2012/Scribus-build-props.props Sun Sep 3 21:12:13 2017
@@ -18,10 +18,6 @@
<QT5NETWORK_LIB Condition="'$(Configuration)' == 'Release'">Qt5Network.lib</QT5NETWORK_LIB>
<QT5PRINTSUPPORT_LIB Condition="'$(Configuration)' == 'Debug'">Qt5PrintSupportd.lib</QT5PRINTSUPPORT_LIB>
<QT5PRINTSUPPORT_LIB Condition="'$(Configuration)' == 'Release'">Qt5PrintSupport.lib</QT5PRINTSUPPORT_LIB>
- <QT5QML_LIB Condition="'$(Configuration)' == 'Debug'">Qt5Qmld.lib</QT5QML_LIB>
- <QT5QML_LIB Condition="'$(Configuration)' == 'Release'">Qt5Qml.lib</QT5QML_LIB>
- <QT5QUICK_LIB Condition="'$(Configuration)' == 'Debug'">Qt5Quickd.lib</QT5QUICK_LIB>
- <QT5QUICK_LIB Condition="'$(Configuration)' == 'Release'">Qt5Quick.lib</QT5QUICK_LIB>
<QT5WIDGETS_LIB Condition="'$(Configuration)' == 'Debug'">Qt5Widgetsd.lib</QT5WIDGETS_LIB>
<QT5WIDGETS_LIB Condition="'$(Configuration)' == 'Release'">Qt5Widgets.lib</QT5WIDGETS_LIB>
<QT5XML_LIB Condition="'$(Configuration)' == 'Debug'">Qt5Xmld.lib</QT5XML_LIB>
@@ -29,7 +25,7 @@
<!-- Boost -->
<BOOST_DIR>$(SCRIBUS_COMMON_LIB_ROOT)\boost-1.58.0</BOOST_DIR>
<!-- Cairo -->
- <CAIRO_DIR>$(SCRIBUS_LIB_ROOT)\cairo-1.14.6</CAIRO_DIR>
+ <CAIRO_DIR>$(SCRIBUS_LIB_ROOT)\cairo-1.14.10</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>
@@ -127,7 +123,7 @@
<LIBXML2_LIB Condition="'$(Configuration)' == 'Debug'">libxml2_d.lib</LIBXML2_LIB>
<LIBXML2_LIB Condition="'$(Configuration)' == 'Release'">libxml2.lib</LIBXML2_LIB>
<!-- OpenSSL -->
- <OPENSSL_DIR>$(SCRIBUS_LIB_ROOT)\openssl-1.0.2k</OPENSSL_DIR>
+ <OPENSSL_DIR>$(SCRIBUS_LIB_ROOT)\openssl-1.0.2l</OPENSSL_DIR>
<OPENSSL_INCLUDE_DIR>$(OPENSSL_DIR)\include</OPENSSL_INCLUDE_DIR>
<OPENSSL_LIB_DIR>$(OPENSSL_DIR)\lib\$(Platform)-$(PlatformToolset)</OPENSSL_LIB_DIR>
<OPENSSL_LIB Condition="'$(Configuration)' == 'Debug'">libeay32_d.lib</OPENSSL_LIB>
@@ -139,14 +135,14 @@
<PODOFO_LIB Condition="'$(Configuration)' == 'Debug'">podofo_d.lib</PODOFO_LIB>
<PODOFO_LIB Condition="'$(Configuration)' == 'Release'">podofo.lib</PODOFO_LIB>
<!-- Poppler -->
- <POPPLER_DIR>$(SCRIBUS_LIB_ROOT)\poppler-0.53.0</POPPLER_DIR>
+ <POPPLER_DIR>$(SCRIBUS_LIB_ROOT)\poppler-0.56.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>
<!-- Python -->
- <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_DIR Condition="'$(Platform)' == 'Win32'">$(SCRIBUS_COMMON_LIB_ROOT)\python-2.7.13-win32</PYTHON_DIR>
+ <PYTHON_DIR Condition="'$(Platform)' == 'x64'">$(SCRIBUS_COMMON_LIB_ROOT)\python-2.7.13-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>
Modified: trunk/Scribus/win32/msvc2015/Scribus-build-props.props
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22152&path=/trunk/Scribus/win32/msvc2015/Scribus-build-props.props
==============================================================================
--- trunk/Scribus/win32/msvc2015/Scribus-build-props.props (original)
+++ trunk/Scribus/win32/msvc2015/Scribus-build-props.props Sun Sep 3 21:12:13 2017
@@ -123,7 +123,7 @@
<LIBXML2_LIB Condition="'$(Configuration)' == 'Debug'">libxml2_d.lib</LIBXML2_LIB>
<LIBXML2_LIB Condition="'$(Configuration)' == 'Release'">libxml2.lib</LIBXML2_LIB>
<!-- OpenSSL -->
- <OPENSSL_DIR>$(SCRIBUS_LIB_ROOT)\openssl-1.0.2k</OPENSSL_DIR>
+ <OPENSSL_DIR>$(SCRIBUS_LIB_ROOT)\openssl-1.0.2l</OPENSSL_DIR>
<OPENSSL_INCLUDE_DIR>$(OPENSSL_DIR)\include</OPENSSL_INCLUDE_DIR>
<OPENSSL_LIB_DIR>$(OPENSSL_DIR)\lib\$(Platform)-$(PlatformToolset)</OPENSSL_LIB_DIR>
<OPENSSL_LIB Condition="'$(Configuration)' == 'Debug'">libeay32_d.lib</OPENSSL_LIB>
@@ -135,14 +135,14 @@
<PODOFO_LIB Condition="'$(Configuration)' == 'Debug'">podofo_d.lib</PODOFO_LIB>
<PODOFO_LIB Condition="'$(Configuration)' == 'Release'">podofo.lib</PODOFO_LIB>
<!-- Poppler -->
- <POPPLER_DIR>$(SCRIBUS_LIB_ROOT)\poppler-0.53.0</POPPLER_DIR>
+ <POPPLER_DIR>$(SCRIBUS_LIB_ROOT)\poppler-0.56.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>
<!-- Python -->
- <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_DIR Condition="'$(Platform)' == 'Win32'">$(SCRIBUS_COMMON_LIB_ROOT)\python-2.7.13-win32</PYTHON_DIR>
+ <PYTHON_DIR Condition="'$(Platform)' == 'x64'">$(SCRIBUS_COMMON_LIB_ROOT)\python-2.7.13-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>
More information about the scribus-commit
mailing list