diff options
| -rw-r--r-- | configure.ac | 25 | ||||
| -rw-r--r-- | plugins/gtkui/Makefile.am | 4 | ||||
| -rw-r--r-- | plugins/gtkui/gtkui.c | 12 | ||||
| -rw-r--r-- | plugins/supereq/Makefile.am | 2 |
4 files changed, 36 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 5ee8ef4b..dc2e1511 100644 --- a/configure.ac +++ b/configure.ac @@ -27,21 +27,31 @@ test "$prefix" = NONE && prefix=/usr/local AC_DEFINE_UNQUOTED(LOCALEDIR, "${prefix}/${DATADIRNAME}/locale", [Name of gettext locale directory]) case "$host" in + *-*-gnu) + NOCPPLIB="-nostdlib -lsupc++";; +esac + +case "$host" in i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*) AC_DEFINE(ARCH_X86_32, 1, [architecture is x86]) LIB="../deadbeef-deps/lib-x86-32" YASM_FLAGS="-f elf -D ARCH_X86_32 -m x86" APE_USE_YASM=yes ;; - x86_64-apple-*) - AC_DEFINE(ARCH_X86_64_OSX, 1, [architecture is x86_64 for OSX]) - LIB="../deadbeef-deps/lib-x86-64-osx" - ;; x86_64-*-* | amd64-*-*) AC_DEFINE(ARCH_X86_64, 1, [architecture is x86_64]) LIB="../deadbeef-deps/lib-x86-64" YASM_FLAGS="-f elf -D ARCH_X86_64 -m amd64" APE_USE_YASM=yes + KILLCPPFLAGS="-nostdlib -lsupc++" + ;; + i686-apple-*) + AC_DEFINE(ARCH_X86_32_OSX, 1, [architecture is x86]) + LIB="../deadbeef-deps/lib-x86-32-apple" + ;; + x86_64-apple-*) + AC_DEFINE(ARCH_X86_64_OSX, 1, [architecture is x86_64 for OSX]) + LIB="../deadbeef-deps/lib-x86-64-osx" ;; powerpc-*-* ) AC_DEFINE(ARCH_PPC_32, 1, [architecture is ppc32]) @@ -188,6 +198,13 @@ AS_IF([test "${enable_gtk3}" = "yes"], [ ]) AC_CHECK_LIB([SM], [main], [HAVE_SM=yes;SM_LIBS="-lSM";AC_SUBST(SM_LIBS)]) AC_CHECK_LIB([ICE], [main], [HAVE_ICE=yes;ICE_LIBS="-lICE";AC_SUBST(ICE_LIBS)]) + GTK_CHECK_BACKEND([quartz], [3.0], [os_osx=yes], [os_osx=no]) + if test "$os_osx" = "yes"; then + PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration) + AC_SUBST(GTK_MAC_LIBS) + AC_SUBST(GTK_MAC_CFLAGS) + fi + ], [ HAVE_GTK3=no ]) diff --git a/plugins/gtkui/Makefile.am b/plugins/gtkui/Makefile.am index b6651f8a..8ba410b9 100644 --- a/plugins/gtkui/Makefile.am +++ b/plugins/gtkui/Makefile.am @@ -164,8 +164,8 @@ ddb_gui_GTK3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1. 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) else -ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) $(GTKGLEXT_LIBS) -ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS) +ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) $(GTKGLEXT_LIBS) $(GTK_MAC_LIBS) +ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS) $(GTK_MAC_CFLAGS) endif endif diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c index c4ed1f74..808f50c4 100644 --- a/plugins/gtkui/gtkui.c +++ b/plugins/gtkui/gtkui.c @@ -18,6 +18,9 @@ */ #include "../../deadbeef.h" #include <gtk/gtk.h> +#ifdef __APPLE__ +#include "gtkosxapplication.h" +#endif #ifdef HAVE_CONFIG_H #include "../../config.h" #endif @@ -1071,6 +1074,15 @@ gtkui_thread (void *ctx) { progress_init (); cover_art_init (); +#ifdef __APPLE__ +#if 0 + GtkWidget *menubar = lookup_widget (mainwin, "menubar"); + gtk_widget_hide (menubar); + GtkosxApplication *theApp = g_object_new(GTKOSX_TYPE_APPLICATION, NULL); + gtkosx_application_set_menu_bar(theApp, GTK_MENU_SHELL(menubar)); +#endif +#endif + gtk_widget_show (mainwin); init_widget_layout (); diff --git a/plugins/supereq/Makefile.am b/plugins/supereq/Makefile.am index ad476ee6..86abe308 100644 --- a/plugins/supereq/Makefile.am +++ b/plugins/supereq/Makefile.am @@ -6,7 +6,7 @@ supereq_la_SOURCES = supereq.c Equ.cpp Equ.h Fftsg_fl.c paramlist.hpp AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_OOURA AM_CPPFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -nostdlib -fno-unwind-tables -DUSE_OOURA -supereq_la_LDFLAGS = -module +supereq_la_LDFLAGS = -module $(NOCPPLIB) supereq_la_LIBADD = $(LDADD) endif |