From 32a11747dd6849867b0bb934d6a7e89b496ee230 Mon Sep 17 00:00:00 2001
From: Alexey Yakovenko <waker@users.sourceforge.net>
Date: Sat, 8 Feb 2014 23:12:15 +0100
Subject: take static build dependencies from static-deps folder, instead of
 ../deadbeef-deps

---
 scripts/portable_extraplugs.sh | 19 -------------------
 scripts/static_build.sh        | 17 +++++++++--------
 2 files changed, 9 insertions(+), 27 deletions(-)
 delete mode 100755 scripts/portable_extraplugs.sh

(limited to 'scripts')

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
-- 
cgit v1.2.3