diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-08-21 12:22:59 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-21 12:25:49 +0300 |
commit | 15acbbdc1ecda8d1fe8df8b6bd4d8c4f1d26ae89 (patch) | |
tree | 73fd036f9d6b5fa44a928296be2ad7b448d739ae /GNUmakefile | |
parent | acc4507f1bc7c4b50b84661075ab0b656cfd091b (diff) | |
parent | 122ef17ab201cabed12f2a6854050bf88f19bf78 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'GNUmakefile')
-rw-r--r-- | GNUmakefile | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/GNUmakefile b/GNUmakefile index ad2c265f3a9..6485e90ea74 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -90,6 +90,16 @@ endif # ----------------------------------------------------------------------------- +# Blender binary path + +ifeq ($(OS), darwin) + BLENDER_BIN="$(BUILD_DIR)/bin/blender.app/Contents/MacOS/blender" +else + BLENDER_BIN="$(BUILD_DIR)/bin/blender" +endif + + +# ----------------------------------------------------------------------------- # Get the number of cores for threaded build ifndef NPROCS NPROCS:=1 @@ -140,7 +150,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 successfully built, run from: "$(BUILD_DIR)/bin/blender" + @echo Blender successfully built, run from: $(BLENDER_BIN) @echo debug: all @@ -414,7 +424,7 @@ check_spelling_osl: .FORCE "$(BLENDER_DIR)/intern/cycles/kernel/shaders" check_descriptions: .FORCE - "$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup --python \ + $(BLENDER_BIN) --background -noaudio --factory-startup --python \ "$(BLENDER_DIR)/source/tools/check_source/check_descriptions.py" # ----------------------------------------------------------------------------- @@ -429,7 +439,7 @@ icons: .FORCE "$(BLENDER_DIR)/release/datafiles/prvicons_update.py" icons_geom: .FORCE - BLENDER_BIN="$(BUILD_DIR)/bin/blender" \ + BLENDER_BIN=$(BLENDER_BIN) \ "$(BLENDER_DIR)/release/datafiles/blender_icons_geom_update.py" update: .FORCE @@ -452,7 +462,7 @@ update: .FORCE # Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation. doc_py: .FORCE - "$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup \ + $(BLENDER_BIN) --background -noaudio --factory-startup \ --python doc/python_api/sphinx_doc_gen.py cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out @echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/index.html'" @@ -462,12 +472,12 @@ doc_doxy: .FORCE @echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'" doc_dna: .FORCE - "$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup \ + $(BLENDER_BIN) --background -noaudio --factory-startup \ --python doc/blender_file_format/BlendFileDnaExporter_25.py @echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'" doc_man: .FORCE - $(PYTHON) doc/manpage/blender.1.py "$(BUILD_DIR)/bin/blender" + $(PYTHON) doc/manpage/blender.1.py $(BLENDER_BIN) blender.1 help_features: .FORCE @$(PYTHON) -c \ |