take static build dependencies from static-deps folder, instead of ../deadbeef-deps

4 files changed, 16 insertions, 33 deletions

diff --git a/.gitignore b/.gitignore
index 7a31b361..523da8a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,3 +80,4 @@ tools/pluginfo/x86_64
 portable_out
 static
 INSTALL
+/static-deps
diff --git a/configure.ac b/configure.ac
index a36f2a70..5db0f91d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,37 +30,37 @@ AC_DEFINE_UNQUOTED(LOCALEDIR, "${prefix}/${DATADIRNAME}/locale", [Name of gettex
 case "$host" in
   i686-apple-*)
     AC_DEFINE(ARCH_X86_32, 1, [architecture is x86 on OSX])
-    LIB="../deadbeef-deps/lib-x86-32-apple"
+    LIB="static-deps/lib-x86-32-apple"
     YASM_FLAGS="-f macho32 -D ARCH_X86_32 -m x86 -DPREFIX"
     APE_USE_YASM=yes
     OS_OSX=yes
     ;;
   x86_64-apple-*)
     AC_DEFINE(ARCH_X86_64, 1, [architecture is x86_64 on OSX])
-    LIB="../deadbeef-deps/lib-x86-64-apple"
+    LIB="static-deps/lib-x86-64-apple"
     YASM_FLAGS="-f macho64 -D ARCH_X86_64 -m amd64 -DPIC -DPREFIX"
     APE_USE_YASM=yes
     OS_OSX=yes
     ;;
   i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
     AC_DEFINE(ARCH_X86_32, 1, [architecture is x86])
-    LIB="../deadbeef-deps/lib-x86-32"
+    LIB="static-deps/lib-x86-32"
     YASM_FLAGS="-f elf -D ARCH_X86_32 -m x86"
     APE_USE_YASM=yes
     ;;
   x86_64-*-* | amd64-*-*)
     AC_DEFINE(ARCH_X86_64, 1, [architecture is x86_64])
-    LIB="../deadbeef-deps/lib-x86-64"
+    LIB="static-deps/lib-x86-64"
     YASM_FLAGS="-f elf -D ARCH_X86_64 -m amd64"
     APE_USE_YASM=yes
     ;;
   powerpc-*-* )
     AC_DEFINE(ARCH_PPC_32, 1, [architecture is ppc32])
-    LIB="../deadbeef-deps/lib-ppc-32"
+    LIB="static-deps/lib-ppc-32"
     ;;
   powerpc64-*-* )
     AC_DEFINE(ARCH_PPC_64, 1, [architecture is ppc64])
-    LIB="../deadbeef-deps/lib-ppc-64"
+    LIB="static-deps/lib-ppc-64"
     ;;
   *)
     AC_DEFINE(ARCH_UNKNOWN, 1, [architecture is unknown])
diff --git a/scripts/portable_extraplugs.sh b/scripts/portable_extraplugs.sh
deleted file mode 100755
index 982ec15d..00000000
--- a/scripts/portable_extraplugs.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'`
-ORIGIN=`pwd | perl -ne 'chomp and print'`
-AP=$HOME/bin/autopackage
-export CC=$AP/apbuild/apgcc
-export CXX=$AP/apbuild/apgcc 
-export APBUILD_STATIC_LIBGCC=1
-
-ZLIB_LIBS="$ORIGIN/../deadbeef-deps/lib-x86-32/lib/libz.a"
-CFLAGS="-I$ORIGIN/../deadbeef-deps/lib-x86-32/include"
-
-for i in shn dumb ao ; do
-    echo cd
-    cd $ORIGIN/plugins/$i
-    make clean
-    echo making $ORIGIN/plugins/$i
-    make -j8 STATIC_CFLAGS="$CFLAGS" CC=$CC CXX=$CXX ZLIB_LIBS=$ZLIB_LIBS
-done
-
diff --git a/scripts/static_build.sh b/scripts/static_build.sh
index 87183589..e7763a53 100755
--- a/scripts/static_build.sh
+++ b/scripts/static_build.sh
@@ -1,21 +1,22 @@
 #!/bin/bash
 VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'`
 ORIGIN=`pwd | perl -ne 'chomp and print'`
+STATIC_DEPS=static-deps
 AP=$ORIGIN/tools/apbuild
 #ARCH=`uname -m | perl -ne 'chomp and print'`
 if [[ "$ARCH" == "i686" ]]; then
-    export CFLAGS="-m32 -I$ORIGIN/../deadbeef-deps/lib-x86-32/include/i386-linux-gnu"
+    export CFLAGS="-m32 -I$ORIGIN/$STATIC_DEPS/lib-x86-32/include/i386-linux-gnu"
     export CXXFLAGS=$CFLAGS
-    export LDFLAGS="-m32 -L$ORIGIN/../deadbeef-deps/lib-x86-32/lib -L$ORIGIN/../deadbeef-deps/lib-x86-32/lib/i386-linux-gnu"
+    export LDFLAGS="-m32 -L$ORIGIN/$STATIC_DEPS/lib-x86-32/lib -L$ORIGIN/$STATIC_DEPS/lib-x86-32/lib/i386-linux-gnu"
     export CONFIGURE_FLAGS="--build=i686-unknown-linux-gnu"
-    export LD_LIBRARY_PATH="$ORIGIN/../deadbeef-deps/lib-x86-32/lib"
-    export PKG_CONFIG_PATH="$ORIGIN/../deadbeef-deps/lib-x86-32/lib/pkgconfig"
+    export LD_LIBRARY_PATH="$ORIGIN/$STATIC_DEPS/lib-x86-32/lib"
+    export PKG_CONFIG_PATH="$ORIGIN/$STATIC_DEPS/lib-x86-32/lib/pkgconfig"
 elif [[ "$ARCH" == "x86_64" ]]; then
-    export CFLAGS='-m64 -I$ORIGIN/../deadbeef-deps/lib-x86-64/include/x86_64-linux-gnu'
-    export LDFLAGS="-m64 -L$ORIGIN/../deadbeef-deps/lib-x86-64/lib -L$ORIGIN/../deadbeef-deps/lib-x86-64/lib/x86_64-linux-gnu"
+    export CFLAGS="-m64 -I$ORIGIN/$STATIC_DEPS/lib-x86-64/include/x86_64-linux-gnu"
+    export LDFLAGS="-m64 -L$ORIGIN/$STATIC_DEPS/lib-x86-64/lib -L$ORIGIN/$STATIC_DEPS/lib-x86-64/lib/x86_64-linux-gnu"
     export CONFIGURE_FLAGS="--build=x86_64-unknown-linux-gnu"
-    export LD_LIBRARY_PATH="$ORIGIN/../deadbeef-deps/lib-x86-64/lib"
-    export PKG_CONFIG_PATH="$ORIGIN/../deadbeef-deps/lib-x86-64/lib/pkgconfig"
+    export LD_LIBRARY_PATH="$ORIGIN/$STATIC_DEPS/lib-x86-64/lib"
+    export PKG_CONFIG_PATH="$ORIGIN/$STATIC_DEPS/lib-x86-64/lib/pkgconfig"
 else
     echo unknown arch $ARCH
     exit -1