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

Improve Makefile for MacOS

Browse source 
Some macs appear to need "-framework CoreFoundation" added to the linking
step, others (which appear to have the exact same OS and tools installed),
don't. But as it doesn't appeart to hurt, I unconditionally add this.

Switched to using pkgconfig to find libdivecomputer on the Mac.

Tried to clean up the Makefile a bit

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Acked-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
This commit is contained in:
Dirk Hohndel 2011-12-14 11:22:12 -08:00
parent 4b77a5def6
commit 6245b700a4
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Makefile
View file

@ -25,11 +25,10 @@ DESKTOPFILE = $(NAME).desktop
MANFILES = $(NAME).1 MANFILES = $(NAME).1
XSLTFILES = xslt/*.xslt XSLTFILES = xslt/*.xslt
MACOSXINSTALL = /Applications/Subsurface.app UNAME := $(shell $(CC) -dumpmachine 2>&1 | grep -E -o "linux|darwin|win")
MACOSXFILES = packaging/macosx
# find libdivecomputer # find libdivecomputer
# First deal with the cross compile environment. # First deal with the cross compile environment and with Mac.
# For the native case, Linus doesn't want to trust pkg-config given # For the native case, Linus doesn't want to trust pkg-config given
# how young libdivecomputer still is - so we check the typical # how young libdivecomputer still is - so we check the typical
# subdirectories of /usr/local and /usr and then we give up. You can # subdirectories of /usr/local and /usr and then we give up. You can
@ -37,13 +36,14 @@ MACOSXFILES = packaging/macosx
# #
ifeq ($(CC), i686-w64-mingw32-gcc) ifeq ($(CC), i686-w64-mingw32-gcc)
# ok, we are cross building for Windows # ok, we are cross building for Windows
LIBDIVECOMPUTERDIR = /usr/i686-w64-mingw32/sys-root/mingw/include/libdivecomputer
LIBDIVECOMPUTERINCLUDES = `$(PKGCONFIG) --cflags libdivecomputer` LIBDIVECOMPUTERINCLUDES = `$(PKGCONFIG) --cflags libdivecomputer`
LIBDIVECOMPUTERARCHIVE = `$(PKGCONFIG) --libs libdivecomputer` LIBDIVECOMPUTERARCHIVE = `$(PKGCONFIG) --libs libdivecomputer`
RESFILE = packaging/windows/subsurface.res RESFILE = packaging/windows/subsurface.res
LDFLAGS += -Wl,-subsystem,windows LDFLAGS += -Wl,-subsystem,windows
else ifeq ($(UNAME), darwin)
LIBDIVECOMPUTERINCLUDES = `$(PKGCONFIG) --cflags libdivecomputer`
LIBDIVECOMPUTERARCHIVE = `$(PKGCONFIG) --libs libdivecomputer`
else else
libdc-local := $(wildcard /usr/local/lib/libdivecomputer.a) libdc-local := $(wildcard /usr/local/lib/libdivecomputer.a)
libdc-local64 := $(wildcard /usr/local/lib64/libdivecomputer.a) libdc-local64 := $(wildcard /usr/local/lib64/libdivecomputer.a)
libdc-usr := $(wildcard /usr/lib/libdivecomputer.a) libdc-usr := $(wildcard /usr/lib/libdivecomputer.a)
@ -87,9 +87,6 @@ GLIB2CFLAGS = $(shell $(PKGCONFIG) --cflags glib-2.0)
GTK2CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-2.0) GTK2CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-2.0)
CFLAGS += $(shell $(XSLCONFIG) --cflags) CFLAGS += $(shell $(XSLCONFIG) --cflags)
UNAME := $(shell $(CC) -dumpmachine 2>&1 | grep -E -o "linux|darwin|win")
ifeq ($(UNAME), linux) ifeq ($(UNAME), linux)
LIBGCONF2 = $(shell $(PKGCONFIG) --libs gconf-2.0) LIBGCONF2 = $(shell $(PKGCONFIG) --libs gconf-2.0)
GCONF2CFLAGS = $(shell $(PKGCONFIG) --cflags gconf-2.0) GCONF2CFLAGS = $(shell $(PKGCONFIG) --cflags gconf-2.0)
@ -98,6 +95,9 @@ ifeq ($(UNAME), linux)
else ifeq ($(UNAME), darwin) else ifeq ($(UNAME), darwin)
OSSUPPORT = macos OSSUPPORT = macos
OSSUPPORT_CFLAGS = $(GTK2CFLAGS) OSSUPPORT_CFLAGS = $(GTK2CFLAGS)
MACOSXINSTALL = /Applications/Subsurface.app
MACOSXFILES = packaging/macosx
EXTRALIBS = -framework CoreFoundation
else else
OSSUPPORT = windows OSSUPPORT = windows
OSSUPPORT_CFLAGS = $(GTK2CFLAGS) OSSUPPORT_CFLAGS = $(GTK2CFLAGS)
@ -110,7 +110,7 @@ ifneq ($(strip $(LIBXSLT)),)
endif endif
endif endif
LIBS = $(LIBXML2) $(LIBXSLT) $(LIBGTK) $(LIBGCONF2) $(LIBDIVECOMPUTER) -lpthread LIBS = $(LIBXML2) $(LIBXSLT) $(LIBGTK) $(LIBGCONF2) $(LIBDIVECOMPUTER) $(EXTRALIBS) -lpthread
OBJS = main.o dive.o profile.o info.o equipment.o divelist.o \ OBJS = main.o dive.o profile.o info.o equipment.o divelist.o \
parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o \ parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o \