Disable some MacOSX GTK dependencies

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

View file

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

View file

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