diff options
author | waker <wakeroid@gmail.com> | 2012-10-05 17:46:33 +0200 |
---|---|---|
committer | waker <wakeroid@gmail.com> | 2012-10-05 17:46:33 +0200 |
commit | ce2923c8f0cac7a563d1ecf22085ac62281c74d7 (patch) | |
tree | 20ce1a2fd0cebc36231882b011e34230778a1db9 /scripts/portable_build.sh | |
parent | 527ba48d8209a8e854c791d571106a5daf2fdd29 (diff) | |
parent | 708c8ba9f7aefe9f795c9c4eb30ab128f09c8b3d (diff) |
Merge branch 'master' into devel
Conflicts:
README
configure.ac
deadbeef.h
plugins.c
plugins/gtkui/Makefile.am
plugins/gtkui/ddbcellrenderertextmultiline.c
plugins/gtkui/ddblistview.c
plugins/gtkui/deadbeef.glade
plugins/gtkui/gtkui.c
plugins/gtkui/interface.c
plugins/gtkui/plcommon.c
plugins/shellexec/shellexec.c
plugins/supereq/Makefile.am
Diffstat (limited to 'scripts/portable_build.sh')
-rwxr-xr-x | scripts/portable_build.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/portable_build.sh b/scripts/portable_build.sh index 6a047023..3a11ea99 100755 --- a/scripts/portable_build.sh +++ b/scripts/portable_build.sh @@ -1,9 +1,10 @@ #!/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 +AP=$ORIGIN/tools/apbuild +export CC=$AP/apgcc +export CXX=$AP/apgcc + export APBUILD_STATIC_LIBGCC=1 ./autogen.sh @@ -22,5 +23,3 @@ cd tools/pluginfo make cd ../../ -./scripts/portable_postbuild.sh - |