Makefile.conf
branchENGINE-228
changeset 1958 433df9ee336d
parent 1953 e9f2e628cc12
child 1960 3e0027330faa
     1.1 --- a/Makefile.conf	Sun Aug 13 16:19:56 2017 +0200
     1.2 +++ b/Makefile.conf	Mon Aug 14 02:26:09 2017 +0200
     1.3 @@ -5,14 +5,13 @@
     1.4  
     1.5  # To use custom build configuration variables, put them in a new file at `build-config/<name>.conf`. Execute `export PLATFORM_OVERRIDE=<name>` before running make. If this environment variable is not set, make will load a default configuration for your platform.
     1.6  
     1.7 -BUILD_CONFIG=build-config
     1.8 -
     1.9 -include $(BUILD_CONFIG)/common.conf
    1.10 -ifdef PLATFORM_OVERRIDE
    1.11 -    include $(BUILD_CONFIG)/$(PLATFORM_OVERRIDE).conf
    1.12 +include build-config/common.conf
    1.13  # cross-compiling is currently not supported, but maybe you can hack something with `PLATFORM_OVERRIDE`
    1.14 -else ifeq ($(BUILD_ON),$(BUILD_FOR))
    1.15 -    include $(BUILD_CONFIG)/$(BUILD_ON).conf
    1.16 +ifeq ($(BUILD_ON),$(BUILD_FOR))
    1.17 +    include build-config/$(BUILD_ON).conf
    1.18  else
    1.19      $(error I don't know how to build for $(BUILD_FOR) on $(BUILD_ON))
    1.20  endif
    1.21 +ifdef PLATFORM_OVERRIDE
    1.22 +    include build-config/$(PLATFORM_OVERRIDE).conf
    1.23 +endif