static build fixes

8 files changed, 43 insertions, 25 deletions

diff --git a/plugins/adplug/adplug-db.cpp b/plugins/adplug/adplug-db.cpp
index 9fa9ef82..046bd07b 100644
--- a/plugins/adplug/adplug-db.cpp
+++ b/plugins/adplug/adplug-db.cpp
@@ -44,13 +44,13 @@ int _Unwind_GetDataRelBase;
 int _Unwind_GetRegionStart;
 int _Unwind_SetGR;
 int _Unwind_GetIPInfo;
-//int __cxa_pure_virtual;
-////int _Znaj;
-////int _ZdaPv;
-//int __cxa_guard_release;
-////int _ZdlPv;
-//int __cxa_guard_acquire;
-
+int __cxa_pure_virtual;
+int __cxa_guard_release;
+int __cxa_guard_acquire;
+int _Znaj;
+int _ZdaPv;
+int _Znwj;
+int _ZdlPv;
 extern "C" {
 
 extern DB_decoder_t adplug_plugin;
diff --git a/plugins/gme/cgme.c b/plugins/gme/cgme.c
index 5bedacc3..9040c955 100644
--- a/plugins/gme/cgme.c
+++ b/plugins/gme/cgme.c
@@ -34,6 +34,13 @@ int _Unwind_GetDataRelBase;
 int _Unwind_GetRegionStart;
 int _Unwind_SetGR;
 int _Unwind_GetIPInfo;
+int __cxa_pure_virtual;
+int __cxa_guard_release;
+int __cxa_guard_acquire;
+int _Znaj;
+int _ZdaPv;
+int _Znwj;
+int _ZdlPv;
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
diff --git a/plugins/gtkui/Makefile.am b/plugins/gtkui/Makefile.am
index 9fe62058..1dc2f42d 100644
--- a/plugins/gtkui/Makefile.am
+++ b/plugins/gtkui/Makefile.am
@@ -80,7 +80,7 @@ endif
 
 # normal lib
 if HAVE_GTK2
-GTKGLEXT_SOURCES_GTK2 = \
+GTKUI_SOURCES_GTK2 = $(GTKUI_SOURCES)\
 	gtkglext-gtk2/gdk/x11/gdkglconfig-x11.c\
 	gtkglext-gtk2/gdk/x11/gdkglconfig-x11.h\
 	gtkglext-gtk2/gdk/x11/gdkglcontext-x11.c\
@@ -140,7 +140,7 @@ GTKGLEXT_SOURCES_GTK2 = \
 
 GTKGLEXT_CFLAGS_GTK2 = -I@top_srcdir@/plugins/gtkui/gtkglext-gtk2 -I@top_srcdir@/plugins/gtkui/gtkglext-gtk2/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION
 
-ddb_gui_GTK2_la_SOURCES = $(GTKUI_SOURCES) $(GTKGLEXT_SOURCES_GTK2)
+ddb_gui_GTK2_la_SOURCES = $(GTKUI_SOURCES_GTK2)
 ddb_gui_GTK2_la_LDFLAGS = -module
 
 if STATICLINK
@@ -158,12 +158,8 @@ endif
 endif
 
 if HAVE_GTK3
-if OS_OSX
-AM_CPPFLAGS = $(CXXFLAGS) $(GTK3_DEPS_CFLAGS)
-GTK3_OSX_SOURCES = retina.m
-GTKGLEXT_SOURCES_GTK3 =
-else
-GTKGLEXT_SOURCES_GTK3 = \
+GTK3_OSX_SOURCES =
+GTKUI_SOURCES_GTK3 = $(GTKUI_SOURCES)\
 	gtkglext-gtk3/gtk/gtkglinit.c\
 	gtkglext-gtk3/gtk/gtkglversion.c\
 	gtkglext-gtk3/gtk/gtkglwidget.c\
@@ -221,23 +217,23 @@ GTKGLEXT_SOURCES_GTK3 = \
 	gtkglext-gtk3/gdk/x11/gdkx11glwindow.h\
 	gtkglext-gtk3/gdk/gdkglext-config.h\
 	gtkglext-gtk3/gdk/gdkglversion.h
-endif
 
 GTKGLEXT_CFLAGS_GTK3 = -I@top_srcdir@/plugins/gtkui/gtkglext-gtk3 -I@top_srcdir@/plugins/gtkui/gtkglext-gtk3/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION
 
-ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES) $(GTKGLEXT_SOURCES_GTK3) $(GTK3_OSX_SOURCES)
 ddb_gui_GTK3_la_LDFLAGS = -module
 
 if STATICLINK
+ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3)
 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) $(GTKGLEXT_LIBS) ../libparser/libparser.a
+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 $(GTKGLEXT_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_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) $(GTKGLEXT_LIBS) $(GTK_MAC_LIBS) ../libparser/libparser.a
-ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3) $(GTK_MAC_CFLAGS)
+ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3)
+ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT_LIBS)
+ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
 endif
 endif
 
@@ -245,7 +241,7 @@ endif
 if STATICLINK
 GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr
 
-ddb_gui_GTK2_fallback_la_SOURCES = $(GTKUI_SOURCES)
+ddb_gui_GTK2_fallback_la_SOURCES = $(GTKUI_SOURCES_GTK2)
 ddb_gui_GTK2_fallback_la_LDFLAGS = -module
 
 ddb_gui_GTK2_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT_LIBS)
diff --git a/plugins/sid/csid.cpp b/plugins/sid/csid.cpp
index af258f34..d7790b2c 100644
--- a/plugins/sid/csid.cpp
+++ b/plugins/sid/csid.cpp
@@ -42,6 +42,13 @@ int _Unwind_GetDataRelBase;
 int _Unwind_GetRegionStart;
 int _Unwind_SetGR;
 int _Unwind_GetIPInfo;
+int __cxa_pure_virtual;
+int __cxa_guard_release;
+int __cxa_guard_acquire;
+int _Znaj;
+int _ZdaPv;
+int _Znwj;
+int _ZdlPv;
 #endif
 
 extern DB_decoder_t sid_plugin;
diff --git a/plugins/supereq/Equ.cpp b/plugins/supereq/Equ.cpp
index 49413ab2..6010e77d 100644
--- a/plugins/supereq/Equ.cpp
+++ b/plugins/supereq/Equ.cpp
@@ -35,6 +35,13 @@ int _Unwind_GetDataRelBase;
 int _Unwind_GetRegionStart;

 int _Unwind_SetGR;

 int _Unwind_GetIPInfo;

+int __cxa_pure_virtual;

+int __cxa_guard_release;

+int __cxa_guard_acquire;

+int _Znaj;

+int _ZdaPv;

+int _Znwj;

+int _ZdlPv;

 

 #ifdef USE_OOURA

 extern "C" void rdft(int, int, REAL *, int *, REAL *);

diff --git a/scripts/portable_package_static.sh b/scripts/portable_package_static.sh
index bbac7f1a..641609b9 100755
--- a/scripts/portable_package_static.sh
+++ b/scripts/portable_package_static.sh
@@ -70,6 +70,7 @@ tar jcvf ../../portable_out/build/$OUTNAME\
     $PLUGDIR/dsp_libsrc.so\
     $PLUGDIR/ddb_mono2stereo.so\
     $PLUGDIR/alac.so\
+    $PLUGDIR/wma.so\
     $PIXMAPDIR\
     $SRCDIR/locale
 cd ../..
diff --git a/scripts/portable_postbuild.sh b/scripts/portable_postbuild.sh
index c1de99c7..540db99d 100755
--- a/scripts/portable_postbuild.sh
+++ b/scripts/portable_postbuild.sh
@@ -21,7 +21,7 @@ for i in nullout cdda flac alsa mpgmad hotkeys vtx \
 	 lastfm sid adplug sndfile artwork alac \
 	 supereq gme dumb notify musepack wildmidi \
 	 tta dca aac mms shn ao shellexec shellexecui vfs_zip \
-	 m3u converter pulse dsp_libsrc mono2stereo ; do
+	 m3u converter pulse dsp_libsrc mono2stereo wma ; do
     if [ -f ./plugins/$i/.libs/$i.so ]; then
 		 cp ./plugins/$i/.libs/$i.so $PLUGDIR/
 	elif [ -f ./plugins/$i/$i.so ]; then
diff --git a/scripts/static_build.sh b/scripts/static_build.sh
index 77e4e1d4..97138285 100755
--- a/scripts/static_build.sh
+++ b/scripts/static_build.sh
@@ -8,13 +8,13 @@ cd tools/apbuild
 ./apinit
 cd ../../
 
-./autogen.sh
-
 export APBUILD_STATIC_LIBGCC=1
 export CC=$AP/apgcc
 export CXX=$AP/apgcc
 
-./configure --enable-staticlink --disable-artwork-imlib2 --disable-gtk3 --prefix=/opt/deadbeef
+./autogen.sh
+
+./configure --enable-staticlink --disable-artwork-imlib2 --prefix=/opt/deadbeef
 sed -i 's/-lstdc++ -lm -lgcc_s -lc -lgcc_s/-lm -lc/g' libtool
 sed -i 's/hardcode_into_libs=yes/hardcode_into_libs=no/g' libtool
 make clean