From 879373a22f76b765a14a8e05668ba84cfcbe48c5 Mon Sep 17 00:00:00 2001 From: Andreas Stallinger Date: Thu, 10 Apr 2014 15:28:33 +0200 Subject: [PATCH] build: unix build - make replaced with ninja --- script/debug.sh | 2 +- script/release.sh | 2 +- script/setup.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/script/debug.sh b/script/debug.sh index 1763d412..0f335e2b 100755 --- a/script/debug.sh +++ b/script/debug.sh @@ -6,4 +6,4 @@ MY_PATH=`dirname "$0"` cd $MY_PATH/.. # Build and run target -make -C build/Debug "$1" && cd bin && Debug/"$1" +ninja -C build/Debug "$1" && cd bin && Debug/"$1" \ No newline at end of file diff --git a/script/release.sh b/script/release.sh index 89ae648c..3072b7e6 100755 --- a/script/release.sh +++ b/script/release.sh @@ -6,4 +6,4 @@ MY_PATH=`dirname "$0"` cd $MY_PATH/.. # Build and run target -make -C build/Release "$1" && cd bin && Release/"$1" +ninja -C build/Release "$1" && cd bin && Release/"$1" \ No newline at end of file diff --git a/script/setup.sh b/script/setup.sh index ce27cd4b..37a7cdef 100755 --- a/script/setup.sh +++ b/script/setup.sh @@ -50,10 +50,10 @@ if [ $PLATFORM == "Linux" ] || [ $PLATFORM == "MacOS" ]; then mkdir -p build/Release echo -e $INFO "run cmake with Debug configuration" - cd build/Debug && cmake -DCMAKE_BUILD_TYPE="Debug" ../.. + cd build/Debug && cmake -G Ninja -DCMAKE_BUILD_TYPE="Debug" ../.. echo -e $INFO "run cmake with Release configuration" - cd ../Release && cmake -DCMAKE_BUILD_TYPE="Release" ../.. + cd ../Release && cmake -G Ninja -DCMAKE_BUILD_TYPE="Release" ../.. fi echo -e $SUCCESS "setup complete"