diff options
| author |  Alexey Yakovenko <waker@users.sourceforge.net> | 2013-11-15 22:27:32 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <waker@users.sourceforge.net> | 2013-11-15 22:27:32 +0100 |
| commit | 5690e449f26f4c6e4e128873e8cdfc618f1fe53e (patch) | |
| tree | 6730e35798855b60ec66e0d95af10fe256eb1554 | |
| parent | 7248a65b85c78e7ac3d2985a3d13c272bf2b1564 (diff) | |
gtkui: fixed osx support
| -rw-r--r-- | plugins/gtkui/Makefile.am | 9 | ||||
| -rw-r--r-- | plugins/gtkui/gtkui.c | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/plugins/gtkui/Makefile.am b/plugins/gtkui/Makefile.am index 5278a483..3d4bbc51 100644 --- a/plugins/gtkui/Makefile.am +++ b/plugins/gtkui/Makefile.am @@ -13,6 +13,10 @@ gtkuidir = $(libdir)/$(PACKAGE) #endif #endif +if OS_OSX +OSXSRC = retina.m +endif + GTKUI_SOURCES = gtkui.c gtkui.h\ callbacks.c interface.c support.c callbacks.h interface.h support.h\ ddblistview.c ddblistview.h\ @@ -43,7 +47,7 @@ GTKUI_SOURCES = gtkui.c gtkui.h\ pltmenu.c\ ctmapping.c ctmapping.h\ namedicons.c namedicons.h\ - $(SM_SOURCES) + $(SM_SOURCES) $(OSXSRC) sdkdir = $(pkgincludedir) sdk_HEADERS = gtkui_api.h @@ -236,11 +240,12 @@ GTK_ROOT_300=@top_srcdir@/$(LIB)/gtk-3.0.0 ddb_gui_GTK3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT3_LIBS) ddb_gui_GTK3_la_CFLAGS = -std=c99 -I$(GTK_ROOT_300)/include/gtk-3.0 -I$(GTK_ROOT_300)/include/pango-1.0 -I$(GTK_ROOT_300)/include/gio-unix-2.0/ -I$(GTK_ROOT_300)/include/atk-1.0 -I$(GTK_ROOT_300)/include/cairo -I$(GTK_ROOT_300)/include/gdk-pixbuf-2.0 -I$(GTK_ROOT_300)/include/freetype2 -I$(GTK_ROOT_300)/include/glib-2.0 -I$(GTK_ROOT_300)/lib/glib-2.0/include $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3) - else ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3) ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT3_LIBS) ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3) +ddb_gui_GTK3_la_OBJCFLAGS = $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3) + endif endif diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c index 449fd281..27d4d650 100644 --- a/plugins/gtkui/gtkui.c +++ b/plugins/gtkui/gtkui.c @@ -18,9 +18,6 @@ */ #include "../../deadbeef.h" #include <gtk/gtk.h> -#ifdef __APPLE__ -#include "gtkosxapplication.h" -#endif #ifdef HAVE_CONFIG_H #include "../../config.h" #endif |