From 4c8369a7baf5bc3021b8c4aacc2ecf492ac2c583 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 21 Apr 2014 08:41:11 -0700 Subject: More cross building stuff This is all mostly to make my life easier. I'm not thrilled with the marble changes - as Linus pointed out before the way we do these "LIBxxxDEVEL" changes is broken as it will still first link against any library installed in the system. But since I have removed any globally installed copies of these libraries this actually works for me and it does help when experimenting with different build options for the main libraries that we depend on. Signed-off-by: Dirk Hohndel --- subsurface-configure.pri | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'subsurface-configure.pri') diff --git a/subsurface-configure.pri b/subsurface-configure.pri index 5177c9d68..be79eff32 100644 --- a/subsurface-configure.pri +++ b/subsurface-configure.pri @@ -144,9 +144,16 @@ contains(QMAKE_PLATFORM, android): DEFINES += NO_MARBLE NO_USERMANUAL NO_PRINTIN # # Find libmarble # -# Before Marble 4.9, the GeoDataTreeModel.h header wasn't installed -# Check if it's present by trying to compile -# ### FIXME: implement that +!isEmpty(LIBMARBLEDEVEL) { + # find it next to our sources + INCLUDEPATH += $$LIBMARBLEDEVEL/src/lib + INCLUDEPATH += $$LIBMARBLEDEVEL/src/lib/marble + INCLUDEPATH += $$LIBMARBLEDEVEL/src/lib/marble/graphicsview + INCLUDEPATH += $$LIBMARBLEDEVEL/src/lib/marble/geodata + INCLUDEPATH += $$LIBMARBLEDEVEL/src/lib/marble/geodata/parser + INCLUDEPATH += $$LIBMARBLEDEVEL/src/lib/marble/geodata/data + LIBS += -L$$LIBMARBLEDEVEL/build/src/lib/marble +} !contains(DEFINES, NO_MARBLE) { win32: CONFIG(debug, debug|release): LIBS += -lmarblewidgetd else: LIBS += -lmarblewidget -- cgit v1.2.3-70-g09d2