summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexey Yakovenko <waker@users.sourceforge.net>2013-10-21 23:51:12 +0200
committerGravatar Alexey Yakovenko <waker@users.sourceforge.net>2013-10-21 23:51:12 +0200
commita4d247b163c4ac22807b4fd3ea0f03987cf4246f (patch)
tree6c74b4451b45b0a81caff197a82ebef54135f722
parent15d98cd37da896ad209e2abbcf40422d46f09973 (diff)
fixed static build of cpp plugins; make works with -j again
-rw-r--r--configure.ac1
-rw-r--r--plugins/adplug/adplug-db.cpp8
-rw-r--r--plugins/gme/cgme.c7
-rw-r--r--plugins/sid/csid.cpp7
-rw-r--r--plugins/supereq/Equ.cpp7
-rwxr-xr-xscripts/static_build.sh2
6 files changed, 3 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac
index b1faabe4..7b63603a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,6 +72,7 @@ case "$host" in
AC_DEFINE(ARCH_UNKNOWN, 1, [architecture is unknown])
;;
esac
+AC_SUBST(NOCPPLIB)
AC_SUBST(LIB)
AC_SUBST(YASM_FLAGS)
diff --git a/plugins/adplug/adplug-db.cpp b/plugins/adplug/adplug-db.cpp
index 046bd07b..17f52ccf 100644
--- a/plugins/adplug/adplug-db.cpp
+++ b/plugins/adplug/adplug-db.cpp
@@ -44,13 +44,7 @@ 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;
+
extern "C" {
extern DB_decoder_t adplug_plugin;
diff --git a/plugins/gme/cgme.c b/plugins/gme/cgme.c
index 9040c955..5bedacc3 100644
--- a/plugins/gme/cgme.c
+++ b/plugins/gme/cgme.c
@@ -34,13 +34,6 @@ 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/sid/csid.cpp b/plugins/sid/csid.cpp
index d7790b2c..af258f34 100644
--- a/plugins/sid/csid.cpp
+++ b/plugins/sid/csid.cpp
@@ -42,13 +42,6 @@ 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 6010e77d..49413ab2 100644
--- a/plugins/supereq/Equ.cpp
+++ b/plugins/supereq/Equ.cpp
@@ -35,13 +35,6 @@ 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/static_build.sh b/scripts/static_build.sh
index 97138285..a4c9e9dd 100755
--- a/scripts/static_build.sh
+++ b/scripts/static_build.sh
@@ -18,7 +18,7 @@ export CXX=$AP/apgcc
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
-make DESTDIR=`pwd`/static/$ARCH/deadbeef-$VERSION
+make -j8 DESTDIR=`pwd`/static/$ARCH/deadbeef-$VERSION
make DESTDIR=`pwd`/static/$ARCH/deadbeef-$VERSION install
echo "building pluginfo tool..."