diff options
| author |  waker <wakeroid@gmail.com> | 2012-04-09 16:29:23 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2012-04-09 16:29:23 +0200 |
| commit | 516f25073a726709abb83c3b73bd1e53404514c9 (patch) | |
| tree | 68113731910c0df756717191a9cfaf55be514130 /scripts | |
| parent | 6502057510696ea575a1cf0143dec02acb7cf01c (diff) | |
| parent | 1ed51a80ec0979bc0be453f75548c59965fbd6f5 (diff) | |
Merge branch 'master' into devel
Conflicts:
plugins/gtkui/callbacks.c
plugins/gtkui/callbacks.h
plugins/gtkui/gtkui.h
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/extract_translators.pl | 2 | ||||
| -rwxr-xr-x | scripts/portable_build.sh | 2 | ||||
| -rwxr-xr-x | scripts/portable_package_static.sh | 8 | ||||
| -rwxr-xr-x | scripts/portable_postbuild.sh | 9 |
4 files changed, 13 insertions, 8 deletions
diff --git a/scripts/extract_translators.pl b/scripts/extract_translators.pl index a3ad02a2..b233e86f 100755 --- a/scripts/extract_translators.pl +++ b/scripts/extract_translators.pl @@ -34,7 +34,7 @@ foreach my $f (@files) { if ($script) { print " ($script)"; } - print "\n"; + print " $code\n"; while (<F>) { if (/^#/) { if (/\@/ && !(/Yakovenko/) && !(/EMAIL/)) { diff --git a/scripts/portable_build.sh b/scripts/portable_build.sh index 36f2665e..6a047023 100755 --- a/scripts/portable_build.sh +++ b/scripts/portable_build.sh @@ -13,7 +13,7 @@ sed -i 's/-lstdc++ -lm -lgcc_s -lc -lgcc_s/-lm -lc/g' libtool make clean make -j9 -./scripts/portable_extraplugs.sh +#./scripts/portable_extraplugs.sh cd $ORIGIN diff --git a/scripts/portable_package_static.sh b/scripts/portable_package_static.sh index be8c75b6..2b8e5465 100755 --- a/scripts/portable_package_static.sh +++ b/scripts/portable_package_static.sh @@ -49,11 +49,11 @@ tar jcvf ../portable_out/build/deadbeef-$VERSION-static-i686.tar.bz2\ $PLUGDIR/vtx.so\ $PLUGDIR/wavpack.so\ $PLUGDIR/wildmidi.so\ - $PLUGDIR/ao.so\ - $PLUGDIR/shn.so\ - $PLUGDIR/dumb.so\ + $PLUGDIR/ddb_ao.so\ + $PLUGDIR/ddb_shn.so\ + $PLUGDIR/ddb_dumb.so\ $PLUGDIR/converter.so\ - $PLUGDIR/converter_gtkui.so\ + $PLUGDIR/converter_gtk2.so\ $PLUGDIR/convpresets\ $PLUGDIR/pulse.so\ $PLUGDIR/dsp_libsrc.so\ diff --git a/scripts/portable_postbuild.sh b/scripts/portable_postbuild.sh index ae9b7ec1..f572240f 100755 --- a/scripts/portable_postbuild.sh +++ b/scripts/portable_postbuild.sh @@ -24,12 +24,17 @@ for i in nullout cdda flac alsa mpgmad hotkeys vtx \ cp ./plugins/$i/.libs/$i.so $PLUGDIR/ elif [ -f ./plugins/$i/$i.so ]; then cp ./plugins/$i/$i.so $PLUGDIR/ + elif [ -f ./plugins/$i/.libs/ddb_$i.so ]; then + cp ./plugins/$i/.libs/ddb_$i.so $PLUGDIR/ else echo ./plugins/$i/.libs/$i.so not found fi - if [ -f ./plugins/$i/.libs/${i}_gtkui.so ]; then - cp ./plugins/$i/.libs/${i}_gtkui.so $PLUGDIR/ + if [ -f ./plugins/$i/.libs/${i}_gtk2.so ]; then + cp ./plugins/$i/.libs/${i}_gtk2.so $PLUGDIR/ + fi + if [ -f ./plugins/$i/.libs/${i}_gtk3.so ]; then + cp ./plugins/$i/.libs/${i}_gtk3.so $PLUGDIR/ fi if [ -f ./plugins/$i/.libs/$i.fallback.so ]; then |