diff options
| author |  waker <wakeroid@gmail.com> | 2012-08-08 13:49:50 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2012-08-08 13:49:50 +0200 |
| commit | fa3d7b5639963005869673a540594360133a70d9 (patch) | |
| tree | cf875d03d621c2eb4350540481f1730579e742ae | |
| parent | 29941e7640ca89227d008dc207957404ae5392c0 (diff) | |
added support for compiling static gtkui with gtk2.16
| -rw-r--r-- | PORTABLE_VERSION | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | plugins/gtkui/Makefile.am | 11 |
3 files changed, 13 insertions, 2 deletions
diff --git a/PORTABLE_VERSION b/PORTABLE_VERSION index d1d899fa..94ee4293 100644 --- a/PORTABLE_VERSION +++ b/PORTABLE_VERSION @@ -1 +1 @@ -0.5.5 +0.5.6-test1 diff --git a/configure.ac b/configure.ac index de78e45f..12630efd 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT([deadbeef], [devel]) AC_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE([1.11 dist-bzip2]) -AM_SILENT_RULES([yes]) +dnl AM_SILENT_RULES([yes]) AM_MAINTAINER_MODE() AC_USE_SYSTEM_EXTENSIONS diff --git a/plugins/gtkui/Makefile.am b/plugins/gtkui/Makefile.am index e630ef0d..2f6461ca 100644 --- a/plugins/gtkui/Makefile.am +++ b/plugins/gtkui/Makefile.am @@ -65,11 +65,22 @@ endif # normal lib if HAVE_GTK2 + ddb_gui_GTK2_la_SOURCES = $(GTKUI_SOURCES) ddb_gui_GTK2_la_LDFLAGS = -module + +if STATICLINK +GTK_ROOT_216=@top_srcdir@/$(LIB)/gtk-2.16.0 + +ddb_gui_GTK2_la_LIBADD = $(LDADD) -L$(GTK_ROOT_216)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 $(SM_LIBADD) + +ddb_gui_GTK2_la_CFLAGS = -std=c99 -I$(GTK_ROOT_216)/include/gtk-2.0 -I$(GTK_ROOT_216)/lib/gtk-2.0/include -I$(GTK_ROOT_216)/include/atk-1.0 -I$(GTK_ROOT_216)/include/cairo -I$(GTK_ROOT_216)/include/pango-1.0 -I$(GTK_ROOT_216)/include -I$(GTK_ROOT_216)/include/glib-2.0 -I$(GTK_ROOT_216)/lib/glib-2.0/include -DULTRA_COMPATIBLE=1 $(SM_CFLAGS) +else ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) endif + +endif if HAVE_GTK3 ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES) ddb_gui_GTK3_la_LDFLAGS = -module |