From a9113ff284efc939a490d65dc3eccc4e1154d139 Mon Sep 17 00:00:00 2001 From: Darafei Praliaskouski Date: Tue, 30 Jul 2013 18:05:09 +0300 Subject: [PATCH] [linux] don't statically link expat on systems that have it --- 3party/3party.pro | 6 +++++- coding/coding.pro | 6 +++++- coding/internal/expat_impl.h | 2 +- debian/control | 6 ++++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/3party/3party.pro b/3party/3party.pro index 081e5f1746..6d20222c9b 100644 --- a/3party/3party.pro +++ b/3party/3party.pro @@ -2,7 +2,11 @@ TEMPLATE = subdirs -SUBDIRS = expat freetype fribidi zlib bzip2 jansson tomcrypt protobuf +SUBDIRS = freetype fribidi zlib bzip2 jansson tomcrypt protobuf + +!linux*:android* { + SUBDIRS *= expat +} !iphone*:!bada*:!android* { SUBDIRS += gflags \ diff --git a/coding/coding.pro b/coding/coding.pro index 1b5a5f13fd..5b3ac82ad6 100644 --- a/coding/coding.pro +++ b/coding/coding.pro @@ -8,7 +8,11 @@ DEPENDENCIES = base bzip2 zlib tomcrypt include($$ROOT_DIR/common.pri) -INCLUDEPATH += ../3party/tomcrypt/src/headers ../3party/zlib +INCLUDEPATH *= ../3party/tomcrypt/src/headers ../3party/zlib + +!linux*:android* { + INCLUDEPATH *= ../3party/expat/lib +} SOURCES += \ internal/file_data.cpp \ diff --git a/coding/internal/expat_impl.h b/coding/internal/expat_impl.h index 72caaa5ec0..c11cfb7547 100644 --- a/coding/internal/expat_impl.h +++ b/coding/internal/expat_impl.h @@ -35,7 +35,7 @@ //----------------------------------------------------------------------------- #include -#include "../expat/lib/expat.h" +#include //----------------------------------------------------------------------------- // diff --git a/debian/control b/debian/control index 154876e0d4..a70cb9b880 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: mapswithme Section: utils Priority: extra Maintainer: Darafei A. Praliaskouski -Build-Depends: debhelper (>= 8), qt5-default|qt4-qmake, mesa-common-dev, qtbase5-dev|libqt4-dev, libqt5opengl5-dev|libqt4-opengl-dev, git, libssl-dev, ca-certificates +Build-Depends: debhelper (>= 8), qt5-default|qt4-qmake, mesa-common-dev, qtbase5-dev|libqt4-dev, libqt5opengl5-dev|libqt4-opengl-dev, git, libssl-dev, ca-certificates, libexpat-dev Standards-Version: 3.9.3 Homepage: http://mapswith.me/ @@ -34,7 +34,9 @@ Architecture: any Depends: fonts-roboto|fonts-mapswithme, ttf-dejavu-core|fonts-mapswithme, ttf-wqy-microhei|fonts-mapswithme, fonts-dzongkha|fonts-mapswithme, fonts-sil-padauk|fonts-mapswithme, fonts-khmeros-core|fonts-mapswithme, fonts-tlwg-umpush|fonts-mapswithme, fonts-sil-abyssinica|fonts-mapswithme, fonts-paktype|fonts-mapswithme, mapswithme-data, ${shlibs:Depends}, ${misc:Depends} Description: MapsWithMe server application This package contains server application for using MapsWithMe engine in - userless environments. + userless environments. Maps work everywhere! + . + If you're not a developer you probably don't need this package. Package: fonts-mapswithme Architecture: all