forked from github/server
raspberry pi fixes
This commit is contained in:
parent
3f57431e0b
commit
b89c9a2401
2
cmake
2
cmake
|
@ -1 +1 @@
|
|||
Subproject commit b0059eb8b0e3258c1350ad72a1c25ac95582ea2f
|
||||
Subproject commit 80fd16533e8c4b76e1164e5ebf543d832cf3a9f2
|
4
s/build
4
s/build
|
@ -25,9 +25,11 @@ if [ ! -d $ROOT/$BUILD ]; then
|
|||
exit
|
||||
fi
|
||||
|
||||
git submodule update
|
||||
if [ -z `which tolua` ]; then
|
||||
echo "build tolua"
|
||||
cd $ROOT/tolua ; make
|
||||
fi
|
||||
|
||||
echo "build eressea"
|
||||
cd $ROOT/$BUILD
|
||||
make $MAKEOPTS && make test
|
||||
|
|
14
s/cmake-init
14
s/cmake-init
|
@ -34,12 +34,24 @@ if [ -d $HOME/usr ]; then
|
|||
PREFIX_PATH=$HOME/usr:$HOME/usr/local:$PREFIX_PATH
|
||||
fi
|
||||
|
||||
if [ "$HAVE_TOLUA" = "0" ] || [ ! -e "$(which tolua)" ]; then
|
||||
path=`which tolua`
|
||||
echo "TOLUA $path"
|
||||
if [ "$HAVE_TOLUA" = "0" ] || [ ! -e $path ]; then
|
||||
echo "tolua is not installed, building from source"
|
||||
cd $ROOT/tolua ; make
|
||||
ARGS="$ARGS -DPC_TOLUA_DIR=$ROOT/tolua"
|
||||
fi
|
||||
|
||||
path=`which lua`
|
||||
if [ -e $path ]; then
|
||||
path=`dirname $path` # /opt/bin
|
||||
path=`dirname $path` # /opt
|
||||
if [ -e $path/include/lua.h ] && [ -d $path/lib ] ; then
|
||||
echo "lua is installed in $path"
|
||||
ARGS="$ARGS -DPC_LUA_DIR=$LUA"
|
||||
fi
|
||||
fi
|
||||
|
||||
cd $BIN_DIR
|
||||
cmake .. \
|
||||
$ARGS \
|
||||
|
|
2
tolua
2
tolua
|
@ -1 +1 @@
|
|||
Subproject commit b6e8304055a28f490aa347dfe51528324bb8575d
|
||||
Subproject commit e53fe09e5789083698d2efb1fd36250efa700c34
|
Loading…
Reference in New Issue