From eb814ab0158986a5e9714c07ce0e9ee2bb4bb9a3 Mon Sep 17 00:00:00 2001 From: midipix Date: Sun, 16 Dec 2018 10:11:27 -0500 Subject: build system: Makefile.in: include custom config defs before project files. --- Makefile.in | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Makefile.in b/Makefile.in index cc4e332..25a6a55 100644 --- a/Makefile.in +++ b/Makefile.in @@ -119,13 +119,20 @@ include $(PROJECT_DIR)/sysinfo/compiler/$(COMPILER).mk include $(PROJECT_DIR)/sysinfo/toolchain/$(TOOLCHAIN).mk include $(PROJECT_DIR)/sysinfo/os/$(OS).mk -include $(PROJECT_DIR)/project/osforce.mk +ifeq ($(USE_CUSTOM_CFGDEFS),yes) +include ./cfgdefs.mk +endif + +ifeq ($(USE_CUSTOM_USRDEFS),yes) +include ./usrdefs.mk +endif include $(PROJECT_DIR)/sofort/defs.mk include $(PROJECT_DIR)/sofort/version.mk include $(PROJECT_DIR)/sofort/custom.mk include $(PROJECT_DIR)/sofort/pkgconf.mk +include $(PROJECT_DIR)/project/osforce.mk include $(PROJECT_DIR)/project/tree.mk include $(PROJECT_DIR)/project/depends.mk include $(PROJECT_DIR)/project/headers.mk @@ -134,14 +141,6 @@ include $(PROJECT_DIR)/project/arch.mk include $(PROJECT_DIR)/project/extras.mk include $(PROJECT_DIR)/project/overrides.mk -ifeq ($(USE_CUSTOM_CFGDEFS),yes) -include ./cfgdefs.mk -endif - -ifeq ($(USE_CUSTOM_USRDEFS),yes) -include ./usrdefs.mk -endif - $(APP_SRCS:%.c=%.o): CFLAGS_STATIC = $(CFLAGS_APP) -- cgit v1.2.3