From 995d94da05135eaa61b906775a5464ccee831de7 Mon Sep 17 00:00:00 2001 From: Sacha Date: Fri, 29 Nov 2013 00:23:47 +1000 Subject: [PATCH] Add a headless switch to b.sh. --- .travis.yml | 2 +- b.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c89276573..6cf0fff51c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ before_install: script: # Compile PPSSPP - - if [ "$PPSSPP_BUILD_TYPE" == "Linux" ]; then mkdir build-travis && cd build-travis && cmake -DHEADLESS=ON .. && make && cd ..; fi + - if [ "$PPSSPP_BUILD_TYPE" == "Linux" ]; then ./b.sh --headless; fi - if [ "$PPSSPP_BUILD_TYPE" == "Android" ]; then pushd android && ./ab.sh && popd; fi - if [ "$PPSSPP_BUILD_TYPE" == "Blackberry" ]; then pushd Blackberry && ./build.sh --no-package && popd; fi diff --git a/b.sh b/b.sh index cbc12bf46c..11d9d185df 100755 --- a/b.sh +++ b/b.sh @@ -1,3 +1,8 @@ cp -r android/assets . mkdir -p build -(cd build; cmake .. && make -j3 $1; cd ..) +if [[ "$1" == "--headless" ]]; then + HEADLESS="-DHEADLESS=ON" +else + MAKE_OPT="$1" +fi +(cd build; cmake $HEADLESS .. && make -j3 $MAKE_OPT; cd ..)