[PATCH] Disable some MacOSX GTK dependencies

subsurface at henrik.synth.no subsurface at henrik.synth.no
Wed May 22 05:35:42 PDT 2013


From: Henrik Brautaset Aronsen <subsurface at henrik.synth.no>

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

Signed-off-by: Henrik Brautaset Aronsen <subsurface at henrik.synth.no>
---
 Configure.mk | 3 +--
 macos.c      | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Configure.mk b/Configure.mk
index e482de6..ff003fd 100644
--- a/Configure.mk
+++ b/Configure.mk
@@ -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
 
diff --git a/macos.c b/macos.c
index b43849f..75c86ed 100644
--- a/macos.c
+++ b/macos.c
@@ -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()
 {
-- 
1.8.2.2



More information about the subsurface mailing list