diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-21 12:20:01 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-21 12:20:01 +0300 |
| commit | 122ef17ab201cabed12f2a6854050bf88f19bf78 (patch) | |
| tree | c06c9558c07c5781cdd7cfa96b9775ffff58de33 /GNUmakefile | |
| parent | 0734541bc43005609a390ab2e32020ae175d328a (diff) | |
GNUmakefile: correct blender binary for macOS
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/GNUmakefile b/GNUmakefile index 049040f29dd..2599cb19e3e 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 @@ -411,7 +421,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" # ----------------------------------------------------------------------------- @@ -445,7 +455,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/contents.html'" @@ -455,12 +465,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 \ |