From 15d98cd37da896ad209e2abbcf40422d46f09973 Mon Sep 17 00:00:00 2001 From: Alexey Yakovenko Date: Mon, 21 Oct 2013 23:29:12 +0200 Subject: static build fixes --- scripts/portable_package_static.sh | 1 + scripts/portable_postbuild.sh | 2 +- scripts/static_build.sh | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'scripts') 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 -- cgit v1.2.3