164c1f
build system: Makefile.in: include custom config defs before project files.
@@ -119,13 +119,20 @@ include $(PROJECT_DIR)/sysinfo/compiler/$(COMPILER).mk
|
|
119
119
|
include $(PROJECT_DIR)/sysinfo/toolchain/$(TOOLCHAIN).mk
|
120
120
|
include $(PROJECT_DIR)/sysinfo/os/$(OS).mk
|
121
121
|
|
122
|
-
|
122
|
+
ifeq ($(USE_CUSTOM_CFGDEFS),yes)
|
123
|
+
include ./cfgdefs.mk
|
124
|
+
endif
|
125
|
+
|
126
|
+
ifeq ($(USE_CUSTOM_USRDEFS),yes)
|
127
|
+
include ./usrdefs.mk
|
128
|
+
endif
|
123
129
|
|
124
130
|
include $(PROJECT_DIR)/sofort/defs.mk
|
125
131
|
include $(PROJECT_DIR)/sofort/version.mk
|
126
132
|
include $(PROJECT_DIR)/sofort/custom.mk
|
127
133
|
include $(PROJECT_DIR)/sofort/pkgconf.mk
|
128
134
|
|
135
|
+
include $(PROJECT_DIR)/project/osforce.mk
|
129
136
|
include $(PROJECT_DIR)/project/tree.mk
|
130
137
|
include $(PROJECT_DIR)/project/depends.mk
|
131
138
|
include $(PROJECT_DIR)/project/headers.mk
|
@@ -134,14 +141,6 @@ include $(PROJECT_DIR)/project/arch.mk
|
|
134
141
|
include $(PROJECT_DIR)/project/extras.mk
|
135
142
|
include $(PROJECT_DIR)/project/overrides.mk
|
136
143
|
|
137
|
-
ifeq ($(USE_CUSTOM_CFGDEFS),yes)
|
138
|
-
include ./cfgdefs.mk
|
139
|
-
endif
|
140
|
-
|
141
|
-
ifeq ($(USE_CUSTOM_USRDEFS),yes)
|
142
|
-
include ./usrdefs.mk
|
143
|
-
endif
|
144
|
-
|
145
144
|
|
146
145
|
(APP_SRCS:%.c=%.o): CFLAGS_STATIC = $(CFLAGS_APP)
|
147
146
|
|