diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-04-21 08:41:11 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-04-21 08:54:04 -0700 |
| commit | 4c8369a7baf5bc3021b8c4aacc2ecf492ac2c583 (patch) | |
| tree | ffeb6899d9c801dbaf4970f4094e653570d9491a /subsurface-configure.pri | |
| parent | 24792f402dd40b36c0833c0854e112bf117d079e (diff) | |
| download | subsurface-4c8369a7baf5bc3021b8c4aacc2ecf492ac2c583.tar.gz | |
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 <dirk@hohndel.org>
Diffstat (limited to 'subsurface-configure.pri')
| -rw-r--r-- | subsurface-configure.pri | 13 |
1 files changed, 10 insertions, 3 deletions
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 |