summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2012-01-01 14:37:38 -0800
committerGravatar Linus Torvalds <torvalds@linux-foundation.org>2012-01-01 14:37:38 -0800
commit1d51c7772996705fb69b2b3433cd94af3543583d (patch)
treec269437a6fc35ed24c2ac675c1a4bd0ba740b303 /Makefile
parent16b6df559f7b5aabbcbec7d7d08f3687b30384dc (diff)
parent605e063203f8a2a35a5c3be1e7129e80099dd68a (diff)
downloadsubsurface-1d51c7772996705fb69b2b3433cd94af3543583d.tar.gz
Merge branch 'mac' of git://git.hohndel.org/subsurface
* 'mac' of git://git.hohndel.org/subsurface: Turn subsurface into a real Mac application
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f7c883999..ab933c5ce 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,8 @@ else ifeq ($(UNAME), darwin)
OSSUPPORT_CFLAGS = $(GTK2CFLAGS)
MACOSXINSTALL = /Applications/Subsurface.app
MACOSXFILES = packaging/macosx
- EXTRALIBS = -framework CoreFoundation
+ EXTRALIBS = `$(PKGCONFIG) --libs gtk-mac-integration` -framework CoreFoundation
+ CFLAGS += `$(PKGCONFIG) --cflags gtk-mac-integration`
else
OSSUPPORT = windows
OSSUPPORT_CFLAGS = $(GTK2CFLAGS)