r22167 by jghali -
scribus-commit
scribus-commit at lists.scribus.net
Sun Sep 24 19:51:38 UTC 2017
Author: jghali
Date: Sun Sep 24 19:51:38 2017
New Revision: 22167
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22167
Log:
msvc 2012 project: import libraries path and names directly from the property sheet stored in library package
Modified:
trunk/Scribus/win32/msvc2012/Scribus-build-props.props
Modified: trunk/Scribus/win32/msvc2012/Scribus-build-props.props
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22167&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 24 19:51:38 2017
@@ -2,10 +2,13 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
</ImportGroup>
+ <!-- Import Scribus dependencies (other than Qt) -->
<PropertyGroup Label="UserMacros">
- <!-- 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>
+ </PropertyGroup>
+ <Import Project="$(SCRIBUS_LIB_ROOT)\scribus-lib-paths.props" />
+ <!-- Import Qt5 -->
+ <PropertyGroup Label="UserMacros">
<!-- Qt5 -->
<QT5_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)' == 'v110'" >F:\Libraries-vcall\Qt-5.6.2\msvc2012</QT5_DIR>
<QT5_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)' == 'v110_xp'">F:\Libraries-vcall\Qt-5.6.2\msvc2012_xp</QT5_DIR>
@@ -22,138 +25,13 @@
<QT5WIDGETS_LIB Condition="'$(Configuration)' == 'Release'">Qt5Widgets.lib</QT5WIDGETS_LIB>
<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.58.0</BOOST_DIR>
- <!-- Cairo -->
- <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>
- <CAIRO_LIB Condition="'$(Configuration)' == 'Release'">cairo2.lib</CAIRO_LIB>
- <!-- Freetype -->
- <FREETYPE_DIR>$(SCRIBUS_LIB_ROOT)\freetype-2.8</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>
- <!-- Harfbuzz -->
- <HARFBUZZ_DIR>$(SCRIBUS_LIB_ROOT)\harfbuzz-1.4.6</HARFBUZZ_DIR>
- <HARFBUZZ_INCLUDE_DIR>$(HARFBUZZ_DIR)\include</HARFBUZZ_INCLUDE_DIR>
- <HARFBUZZ_LIB_DIR>$(HARFBUZZ_DIR)\lib\$(Platform)-$(PlatformToolset)</HARFBUZZ_LIB_DIR>
- <HARFBUZZ_LIB Condition="'$(Configuration)' == 'Debug'">harfbuzz_d.lib</HARFBUZZ_LIB>
- <HARFBUZZ_LIB Condition="'$(Configuration)' == 'Release'">harfbuzz.lib</HARFBUZZ_LIB>
- <!-- Hunspell -->
- <HUNSPELL_DIR>$(SCRIBUS_LIB_ROOT)\hunspell-1.6.1</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>
- <!-- Iconv -->
- <ICONV_DIR>$(SCRIBUS_LIB_ROOT)\libiconv-1.15</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>
- <!-- Icu -->
- <ICU_INCLUDE_DIR>$(SCRIBUS_LIB_ROOT)\icu-57.1\include</ICU_INCLUDE_DIR>
- <ICU_LIB_DIR>$(SCRIBUS_LIB_ROOT)\icu-57.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.8</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>
- <!-- Libcdr -->
- <LIBCDR_DIR>$(SCRIBUS_LIB_ROOT)\libcdr-0.1.3</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_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>
- <!-- Libmspub -->
- <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_DIR>$(SCRIBUS_LIB_ROOT)\libpagemaker-0.0.3</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_DIR>$(SCRIBUS_LIB_ROOT)\librevenge-0.0.4</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_GENERATORS_LIB Condition="'$(Configuration)' == 'Debug'">librevenge-generators-0.0d.lib</LIBREVENGE_GENERATORS_LIB>
- <LIBREVENGE_GENERATORS_LIB Condition="'$(Configuration)' == 'Release'">librevenge-generators-0.0.lib</LIBREVENGE_GENERATORS_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>
- <!-- Libtiff -->
- <LIBTIFF_DIR>$(SCRIBUS_LIB_ROOT)\libtiff-4.0.7</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>
- <!-- Libvisio -->
- <LIBVISIO_DIR>$(SCRIBUS_LIB_ROOT)\libvisio-0.1.5</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.4</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>
- <!-- OpenSSL -->
- <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>
- <OPENSSL_LIB Condition="'$(Configuration)' == 'Release'">libeay32.lib</OPENSSL_LIB>
- <!-- PoDoFo -->
- <PODOFO_DIR>$(SCRIBUS_LIB_ROOT)\podofo-0.9.5</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'">podofo_d.lib</PODOFO_LIB>
- <PODOFO_LIB Condition="'$(Configuration)' == 'Release'">podofo.lib</PODOFO_LIB>
- <!-- Poppler -->
- <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.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>
- <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>
+ <!-- LittleCMS 2 -->
+ <LCMS_DIR>$(LCMS2_DIR)</LCMS_DIR>
+ <LCMS_INCLUDE_DIR>$(LCMS2_INCLUDE_DIR)</LCMS_INCLUDE_DIR>
+ <LCMS_LIB_DIR>$(LCMS2_LIB_DIR)</LCMS_LIB_DIR>
+ <LCMS_LIB>$(LCMS2_LIB)</LCMS_LIB>
</PropertyGroup>
+ <!-- MSVC stuff -->
<PropertyGroup>
<_ProjectFileVersion>11.0.60610.1</_ProjectFileVersion>
</PropertyGroup>
More information about the scribus-commit
mailing list