From bd05ff65490e29de6c75451f9dd6437dd770efe0 Mon Sep 17 00:00:00 2001
From: waker <wakeroid@gmail.com>
Date: Mon, 7 May 2012 23:06:43 +0200
Subject: fixed portable and static build scripts

---
 scripts/portable_postbuild.sh |  2 +-
 scripts/static_build.sh       | 23 ++++-------------------
 2 files changed, 5 insertions(+), 20 deletions(-)

(limited to 'scripts')

diff --git a/scripts/portable_postbuild.sh b/scripts/portable_postbuild.sh
index 46d6ec5b..65bf55fd 100755
--- a/scripts/portable_postbuild.sh
+++ b/scripts/portable_postbuild.sh
@@ -55,7 +55,7 @@ fi
 
 #pixmaps
 
-for i in pause_16.png play_16.png noartwork.jpg buffering_16.png; do
+for i in pause_16.png play_16.png noartwork.png buffering_16.png; do
 	cp ./pixmaps/$i $PIXMAPDIR/
 done
 
diff --git a/scripts/static_build.sh b/scripts/static_build.sh
index 7ebc85ca..e7a0bacc 100755
--- a/scripts/static_build.sh
+++ b/scripts/static_build.sh
@@ -2,27 +2,12 @@
 VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'`
 ORIGIN=`pwd | perl -ne 'chomp and print'`
 AP=$ORIGIN/tools/apbuild
-export CC=$AP/apgcc
-export CXX=$AP/apgcc
-
-export APBUILD_STATIC_LIBGCC=1
+ARCH=`uname -m | perl -ne 'chomp and print'`
 
 ./autogen.sh
 
-./configure --enable-staticlink --disable-artwork-imlib2 --prefix=/opt/deadbeef
+export APBUILD_STATIC_LIBGCC=1
+CC=$AP/apgcc CXX=$AP/apgcc  ./configure --enable-staticlink=yes --disable-artwork-imlib2 --prefix=/opt/deadbeef
 sed -i 's/-lstdc++ -lm -lgcc_s -lc -lgcc_s/-lm -lc/g' libtool
-make clean
-make -j9
-
-#./scripts/portable_extraplugs.sh
-
-cd $ORIGIN
-
-echo "building pluginfo tool..."
-cd tools/pluginfo
-make
-cd ../../
-
-#./scripts/portable_postbuild.sh
-fakeroot -- ./scripts/static_install.sh
+make DESTDIR=`pwd`/static/$ARCH/deadbeef-$VERSION -j8 install
 
-- 
cgit v1.2.3