mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

qmake: change the folder structure assumed for LIBMARBLEDEVEL

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2014-06-06 09:19:35 -07:00
parent 049b6c0426
commit 1120379b2b
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
subsurface-configure.pri
View file

@ -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