From 236fabcc41eb769112a1d61ded82f6b913d0d434 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 4 Jan 2016 20:38:27 +1100 Subject: [PATCH] Minor edits to sync make.bat & makefile --- GNUmakefile | 2 +- make.bat | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index c73aaa7bfbb..2732fdb6c8c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -136,7 +136,7 @@ all: FORCE $(MAKE) -C "$(BUILD_DIR)" -s -j $(NPROCS) install @echo @echo edit build configuration with: "$(BUILD_DIR)/CMakeCache.txt" run make again to rebuild. - @echo blender installed, run from: "$(BUILD_DIR)/bin/blender" + @echo Blender successfully built, run from: "$(BUILD_DIR)/bin/blender" @echo debug: all diff --git a/make.bat b/make.bat index c62efbd0503..42f49f3ae2b 100644 --- a/make.bat +++ b/make.bat @@ -48,7 +48,7 @@ if NOT EXIST %BLENDER_DIR%..\lib\nul ( if NOT "%1" == "" ( REM Help Message - if "%1" == "--help" ( + if "%1" == "help" ( echo. echo Convenience targets echo - debug @@ -103,7 +103,9 @@ if NOT "%1" == "" ( /target:clean ^ /property:Configuration=%BUILD_TYPE% ^ /verbosity:minimal - echo Cleaned "%BUILD_DIR%" + if %ERRORLEVEL% NEQ 0 ( + echo Cleaned "%BUILD_DIR%" + ) goto EOF ) else ( echo Command "%1" unknown, aborting! @@ -157,7 +159,8 @@ msbuild ^ /verbosity:minimal echo. -echo Your build is complete at: "%BUILD_DIR%\bin\%BUILD_TYPE%" +echo edit build configuration with: "%BUILD_DIR%\CMakeCache.txt" run make again to rebuild. +echo Blender successfully built, run from: "%BUILD_DIR%\bin\%BUILD_TYPE%" echo. :EOF