1 files changed, 17 insertions, 4 deletions
diff --git a/development/bbcsdl/bbcsdl.SlackBuild b/development/bbcsdl/bbcsdl.SlackBuild
index 84e1bc9531..820cf9c466 100644
--- a/development/bbcsdl/bbcsdl.SlackBuild
+++ b/development/bbcsdl/bbcsdl.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=bbcsdl
 VERSION=${VERSION:-1.37a}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 TARBALL=${TARBALL:-BBCSDL-5fbdc964becd87f31a92f87fec29c2f67cf3b908}
@@ -71,7 +71,9 @@ rm -rf $PRGNAM-$VERSION
 tar xvfz $CWD/$TARBALL.tar.gz
 mv $TARBALL $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-tar xvfz $CWD/Box2D231.tar.gz
+
+# Correct path in makefile
+patch console/linux/makefile $CWD/makefile.patch
 
 chown -R root:root .
 find -L . \
@@ -80,25 +82,36 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Build sdl and console versions
 cd bin/linux
 make
+cd ../../console/linux
+make
 cd ../..
 
+# Setup package files
 mkdir -p $PKG/usr/bin $PKG/opt/$PRGNAM $PKG/usr/share/pixmaps $PKG/usr/share/applications
 
 install -D -m0755 bbcsdl $PKG/opt/$PRGNAM/bbcsdl
 install -D -m0755 libstb.so $PKG/opt/$PRGNAM/libstb.so
-install -D -m0755 Box2D231.so $PKG/opt/$PRGNAM/Box2D231.so
+install -D -m0755 bbcbasic $PKG/opt/$PRGNAM/bbcbasic
 cp bbcsdl.bbc $PKG/opt/$PRGNAM/
-
 cp -avxu lib $PKG/opt/$PRGNAM/
 cp -avxu examples $PKG/opt/$PRGNAM/
 
+# Optionally exclude the Box2D library
+if [ "${BOX2D:-yes}" = "yes" ]; then
+    tar xvfz $CWD/Box2D231.tar.gz
+    install -D -m0755 Box2D231.so $PKG/opt/$PRGNAM/Box2D231.so
+fi
+
 cp $CWD/bbc256x.png $PKG/usr/share/pixmaps
 cp $CWD/bbcsdl.desktop $PKG/usr/share/applications
 
 ( cd $PKG/usr/bin ; rm -rf bbcsdl )
 ( cd $PKG/usr/bin ; ln -s /opt/bbcsdl/bbcsdl bbcsdl )
+( cd $PKG/usr/bin ; rm -rf bbcbasic )
+( cd $PKG/usr/bin ; ln -s /opt/bbcsdl/bbcbasic bbcbasic )
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true