Actually fix Unix scripts this time. :)

This commit is contained in:
Ryan C. Gordon 2014-12-24 13:23:48 -05:00
parent 9c38244f5d
commit 629c13fbf1
1 changed files with 3 additions and 4 deletions

View File

@ -47,12 +47,11 @@ echo "Setting up..."
set -x set -x
cd "$SDLBASE" cd "$SDLBASE"
rm -rf buildbot rm -rf buildbot
rm -rf emscripten-sdl2-installed
mkdir buildbot mkdir buildbot
pushd buildbot pushd buildbot
echo "Configuring..." echo "Configuring..."
emconfigure ../configure --host=asmjs-unknown-emscripten --disable-assembly --disable-threads --enable-cpuinfo=false CFLAGS="-O2 -Wno-warn-absolute-paths -Wdeclaration-after-statement -Werror=declaration-after-statement" --prefix="$SDLBASE/emscripten-sdl2-installed" emconfigure ../configure --host=asmjs-unknown-emscripten --disable-assembly --disable-threads --enable-cpuinfo=false CFLAGS="-O2 -Wno-warn-absolute-paths -Wdeclaration-after-statement -Werror=declaration-after-statement" --prefix="$PWD/emscripten-sdl2-installed"
echo "Building..." echo "Building..."
emmake $MAKE emmake $MAKE
@ -60,9 +59,9 @@ emmake $MAKE
echo "Moving things around..." echo "Moving things around..."
emmake $MAKE install emmake $MAKE install
# Fix up a few things to a real install path # Fix up a few things to a real install path
perl -w -pi -e "s#$SDLBASE/emscripten-sdl2-installed#/usr/local#g;" ./emscripten-sdl2-installed/lib/libSDL2.la ./emscripten-sdl2-installed/lib/pkgconfig/sdl2.pc ./emscripten-sdl2-installed/bin/sdl2-config perl -w -pi -e "s#$PWD/emscripten-sdl2-installed#/usr/local#g;" ./emscripten-sdl2-installed/lib/libSDL2.la ./emscripten-sdl2-installed/lib/pkgconfig/sdl2.pc ./emscripten-sdl2-installed/bin/sdl2-config
mkdir -p ./usr mkdir -p ./usr
mv "$SDLBASE/emscripten-sdl2-installed" ./usr/local mv ./emscripten-sdl2-installed ./usr/local
popd popd
tar -cJvvf $TARBALL -C buildbot usr tar -cJvvf $TARBALL -C buildbot usr
rm -rf buildbot rm -rf buildbot