diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-06-06 09:19:35 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-06-06 10:06:12 -0700 |
| commit | 1120379b2bcdc2d941bb2e036bacf34d226e74a1 (patch) | |
| tree | f42a482eec292a6a07d5a3b3cbff0b30cda9f2f0 | |
| parent | 049b6c0426cdcadf566beb0c6286e4ae9595bc95 (diff) | |
| download | subsurface-1120379b2bcdc2d941bb2e036bacf34d226e74a1.tar.gz | |
qmake: change the folder structure assumed for LIBMARBLEDEVEL
LIBMARBLEDEVEL is now assumed to point to the install prefix used for a
marble install (instead of into a mix of source and build trees as it did
in the past).
This makes it much easier to have Qt4 and Qt5 versions of this library and
link to the right one as needed.
Of course this requires a matching LD_LIBRARY_PATH when launching a
such-built Subsurface.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | subsurface-configure.pri | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/subsurface-configure.pri b/subsurface-configure.pri index be79eff32..b87e5b241 100644 --- a/subsurface-configure.pri +++ b/subsurface-configure.pri @@ -146,13 +146,8 @@ contains(QMAKE_PLATFORM, android): DEFINES += NO_MARBLE NO_USERMANUAL NO_PRINTIN # !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 + INCLUDEPATH += $$LIBMARBLEDEVEL/include + LIBS += -L$$LIBMARBLEDEVEL/lib } !contains(DEFINES, NO_MARBLE) { win32: CONFIG(debug, debug|release): LIBS += -lmarblewidgetd |