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

Disable some MacOSX GTK dependencies

Browse source 
Now it's actually possible to build the Qt variant on MacOSX
with MacPorts and marble support.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Henrik Brautaset Aronsen 2013-05-22 14:35:42 +02:00 • committed by Dirk Hohndel
parent 478baf1076
commit 375faa5cff
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Configure.mk
View file

@ -124,8 +124,7 @@ ifneq (,$(filter $(UNAME),linux kfreebsd gnu))
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)
else ifeq ($(UNAME), darwin) else ifeq ($(UNAME), darwin)
LIBGTK += $(shell $(PKGCONFIG) --libs gtk-mac-integration) -framework CoreFoundation -framework CoreServices LDFLAGS += -framework CoreFoundation -framework CoreServices
GTKCFLAGS += $(shell $(PKGCONFIG) --cflags gtk-mac-integration)
GTK_MAC_BUNDLER = ~/.local/bin/gtk-mac-bundler GTK_MAC_BUNDLER = ~/.local/bin/gtk-mac-bundler
endif endif

5
macos.c
View file

@ -9,11 +9,8 @@
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <CoreServices/CoreServices.h> #include <CoreServices/CoreServices.h>
#include <mach-o/dyld.h> #include <mach-o/dyld.h>
#include "gtkosxapplication.h"
#include <sys/syslimits.h> #include <sys/syslimits.h>
static GtkosxApplication *osx_app;
/* macos defines CFSTR to create a CFString object from a constant, /* macos defines CFSTR to create a CFString object from a constant,
* but no similar macros if a C string variable is supposed to be * but no similar macros if a C string variable is supposed to be
* the argument. We add this here (hardcoding the default allocator * the argument. We add this here (hardcoding the default allocator
@ -98,6 +95,7 @@ void subsurface_close_conf(void)
/* Nothing */ /* Nothing */
} }
#if USE_GTK_UI
int subsurface_fill_device_list(GtkListStore *store) int subsurface_fill_device_list(GtkListStore *store)
{ {
int i = 0; int i = 0;
@ -149,6 +147,7 @@ int subsurface_fill_device_list(GtkListStore *store)
} }
return index; return index;
} }
#endif
const char *subsurface_icon_name() const char *subsurface_icon_name()
{ {