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

Add a variable for the Marble library name

Browse source 
I need that for a Marble installed somewhere other than the linker's
default search path.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Thiago Macieira 2013-05-18 11:40:53 -07:00 • committed by Dirk Hohndel
parent 29b99d4e1a
commit 80274b5788
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Configure.mk
View file

@ -149,6 +149,7 @@ SQLITE3FLAGS = $(strip $(shell $(PKGCONFIG) --cflags sqlite3))
# Before Marble 4.9, the GeoDataTreeModel.h header wasn't installed # Before Marble 4.9, the GeoDataTreeModel.h header wasn't installed
# Check if it's present by trying to compile # Check if it's present by trying to compile
MARBLEFLAGS = $(shell $(CXX) $(QTCXXFLAGS) -E -include marble/GeoDataTreeModel.h -xc++ /dev/null > /dev/null 2>&1 || echo " -DINCOMPLETE_MARBLE") MARBLEFLAGS = $(shell $(CXX) $(QTCXXFLAGS) -E -include marble/GeoDataTreeModel.h -xc++ /dev/null > /dev/null 2>&1 || echo " -DINCOMPLETE_MARBLE")
MARBLELIBS = -lmarblewidget
# Write the configure file # Write the configure file
all: configure all: configure
@ -186,6 +187,7 @@ configure $(CONFIGURE): Configure.mk
LIBSQLITE3 = $(LIBSQLITE3)\\\ LIBSQLITE3 = $(LIBSQLITE3)\\\
SQLITE3FLAGS = $(SQLITE3FLAGS)\\\ SQLITE3FLAGS = $(SQLITE3FLAGS)\\\
MARBLEFLAGS = $(MARBLEFLAGS)\\\ MARBLEFLAGS = $(MARBLEFLAGS)\\\
MARBLELIBS = $(MARBLELIBS)\\\
" | tr '\\' '\n' > $(CONFIGFILE) " | tr '\\' '\n' > $(CONFIGFILE)
else else

2
Makefile
View file

@ -119,7 +119,7 @@ else
endif endif
LIBS = $(LIBQT) $(LIBXML2) $(LIBXSLT) $(LIBSQLITE3) $(LIBGCONF2) $(LIBDIVECOMPUTER) \ LIBS = $(LIBQT) $(LIBXML2) $(LIBXSLT) $(LIBSQLITE3) $(LIBGCONF2) $(LIBDIVECOMPUTER) \
$(EXTRALIBS) $(LIBZIP) -lpthread -lm $(LIBOSMGPSMAP) $(LIBSOUP) $(LIBWINSOCK) -lmarblewidget $(EXTRALIBS) $(LIBZIP) -lpthread -lm $(LIBOSMGPSMAP) $(LIBSOUP) $(LIBWINSOCK) $(MARBLELIBS)
MSGLANGS=$(notdir $(wildcard po/*.po)) MSGLANGS=$(notdir $(wildcard po/*.po))