diff options
| author | midipix <writeonce@midipix.org> | 2018-12-16 10:11:27 -0500 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2018-12-16 10:14:19 -0500 |
| commit | 164c1f5636081e5537c84f7fe7e7aa855b307f79 (patch) | |
| tree | c9218efcb149fe5528a29a7512317d58cbabdd35 | |
| parent | 2d4980932a3ccbef30e50b331ebbb823c0f7f0ea (diff) | |
| download | w32lib-164c1f5636081e5537c84f7fe7e7aa855b307f79.tar.bz2 w32lib-164c1f5636081e5537c84f7fe7e7aa855b307f79.tar.xz | |
build system: Makefile.in: include custom config defs before project files.
| -rw-r--r-- | Makefile.in | 17 |
1 files 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) |