Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change how lua version is determined to work with my mac

This commit is contained in:
Enno Rehling 2016-09-30 22:21:26 +02:00
parent 95872aabb8
commit 4fc4e8a588
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
s/cmake-init
View File

@ -46,9 +46,9 @@ if [ "$HAVE_TOLUA" = "0" ] || [ -z $path ] ; then
echo "tolua is not installed, building from source" echo "tolua is not installed, building from source"
cd $ROOT cd $ROOT
if [ ! -d tolua ]; then if [ ! -d tolua ]; then
LUA_VERSION="5.2" LUA_VERSION="5.1"
if [ ! -d /usr/include/lua5.2 ] ; then if [ -d /usr/include/lua5.2 ] || [ -d /usr/local/include/lua5.2 ]; then
LUA_VERSION="5.1" LUA_VERSION="5.2"
fi fi
echo "fetching tolua ${LUA_VERSION} from github..." echo "fetching tolua ${LUA_VERSION} from github..."
git clone https://github.com/ennorehling/tolua-${LUA_VERSION}.git tolua git clone https://github.com/ennorehling/tolua-${LUA_VERSION}.git tolua

1
s/travis-build
View File

@ -18,7 +18,6 @@ cd tests
set -e set -e
[ -z $BUILD ] && BUILD=Debug ; export BUILD [ -z $BUILD ] && BUILD=Debug ; export BUILD
cmake --version
s/cmake-init s/cmake-init
s/build s/build
cd $ROOT cd $ROOT