diff options
| author | Campbell Barton <campbell@blender.org> | 2022-09-13 06:24:49 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-09-13 06:28:22 +0300 |
| commit | 03885fe1208361330bc58de4beb5502e4fe22f5d (patch) | |
| tree | c9c4070e7d9eaf71e9e7206b7a6bffc594e4318e /GNUmakefile | |
| parent | 90fb212a9353f2cbdcd7884a92807c6eba54d8a9 (diff) | |
Makefile: support 'make bpy lite' / 'make bpy release'
Re-order configuration loading so 'bpy' is loaded after others.
Needed as `bpy` disables options other configurations enable.
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/GNUmakefile b/GNUmakefile index a218b1d226c..884d2232d71 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -230,9 +230,18 @@ endif # ----------------------------------------------------------------------------- -# additional targets for the build configuration +# Additional targets for the build configuration -# support 'make debug' +# NOTE: These targets can be combined and are applied in reverse order listed here. +# So it's important that `bpy` comes before `release` (for example) +# `make bpy release` first loads `release` configuration, then `bpy`. +# This is important as `bpy` will turn off some settings enabled by release. + +ifneq "$(findstring bpy, $(MAKECMDGOALS))" "" + BUILD_DIR:=$(BUILD_DIR)_bpy + CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/bpy_module.cmake" $(CMAKE_CONFIG_ARGS) + BLENDER_IS_PYTHON_MODULE:=1 +endif ifneq "$(findstring debug, $(MAKECMDGOALS))" "" BUILD_DIR:=$(BUILD_DIR)_debug BUILD_TYPE:=Debug @@ -257,11 +266,6 @@ ifneq "$(findstring headless, $(MAKECMDGOALS))" "" BUILD_DIR:=$(BUILD_DIR)_headless CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/blender_headless.cmake" $(CMAKE_CONFIG_ARGS) endif -ifneq "$(findstring bpy, $(MAKECMDGOALS))" "" - BUILD_DIR:=$(BUILD_DIR)_bpy - CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/bpy_module.cmake" $(CMAKE_CONFIG_ARGS) - BLENDER_IS_PYTHON_MODULE:=1 -endif ifneq "$(findstring developer, $(MAKECMDGOALS))" "" CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/blender_developer.cmake" $(CMAKE_CONFIG_ARGS) |