griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Minor edits to sync make.bat & makefile

Browse Source
This commit is contained in:
Campbell Barton
2016-01-04 20:38:27 +11:00
parent 4c37d910de
commit 236fabcc41
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
View File

@@ -136,7 +136,7 @@ all: FORCE
$(MAKE) -C "$(BUILD_DIR)" -s -j $(NPROCS) install $(MAKE) -C "$(BUILD_DIR)" -s -j $(NPROCS) install
@echo @echo
@echo edit build configuration with: "$(BUILD_DIR)/CMakeCache.txt" run make again to rebuild. @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 @echo
debug: all debug: all

9
make.bat
View File

@@ -48,7 +48,7 @@ if NOT EXIST %BLENDER_DIR%..\lib\nul (
if NOT "%1" == "" ( if NOT "%1" == "" (
REM Help Message REM Help Message
if "%1" == "--help" ( if "%1" == "help" (
echo. echo.
echo Convenience targets echo Convenience targets
echo - debug echo - debug
@@ -103,7 +103,9 @@ if NOT "%1" == "" (
/target:clean ^ /target:clean ^
/property:Configuration=%BUILD_TYPE% ^ /property:Configuration=%BUILD_TYPE% ^
/verbosity:minimal /verbosity:minimal
echo Cleaned "%BUILD_DIR%" if %ERRORLEVEL% NEQ 0 (
echo Cleaned "%BUILD_DIR%"
)
goto EOF goto EOF
) else ( ) else (
echo Command "%1" unknown, aborting! echo Command "%1" unknown, aborting!
@@ -157,7 +159,8 @@ msbuild ^
/verbosity:minimal /verbosity:minimal
echo. 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. echo.
:EOF :EOF