diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-07-11 10:59:08 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-07-11 10:59:08 -0400 |
| commit | e53418435dd88a9a8db9ec6cf621da6540aeac29 (patch) | |
| tree | f15fd1eae4f28d85ac80035ed21dc441ade83dee | |
| parent | f210c59115358140bc76cda4f06283e0bd64ccbb (diff) | |
| parent | b92b498be29cb7db1e30a9eac8113388e0a95369 (diff) | |
Merge branch 'master' of github.com:pret/pokediamond into pikalax_work
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | arm7/Makefile | 5 | ||||
| -rw-r--r-- | arm9/Makefile | 14 |
3 files changed, 14 insertions, 10 deletions
@@ -65,8 +65,9 @@ BNR := $(BUILD_DIR)/$(TARGET).bnr SRC_DIRS := src ASM_DIRS := asm data files -C_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) -S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s)) +# sorting wildcards required for versions of make >= 3.8.2 and < 4.3 for consistent builds +C_FILES := $(foreach dir,$(SRC_DIRS),$(sort $(wildcard $(dir)/*.c))) +S_FILES := $(foreach dir,$(ASM_DIRS),$(sort $(wildcard $(dir)/*.s))) # Object files O_FILES := $(foreach file,$(C_FILES),$(BUILD_DIR)/$(file:.c=.o)) \ diff --git a/arm7/Makefile b/arm7/Makefile index abb7cf03..88f796a0 100644 --- a/arm7/Makefile +++ b/arm7/Makefile @@ -49,8 +49,9 @@ LD_TEMPLATE := ARM7-TS.lcf.template SRC_DIRS := src lib lib/src ASM_DIRS := asm data files -C_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) -S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s)) +# sorting wildcards required for versions of make >= 3.8.2 and < 4.3 for consistent builds +C_FILES := $(foreach dir,$(SRC_DIRS),$(sort $(wildcard $(dir)/*.c))) +S_FILES := $(foreach dir,$(ASM_DIRS),$(sort $(wildcard $(dir)/*.s))) C_OBJS = $(C_FILES:%.c=$(BUILD_DIR)/%.o) S_OBJS = $(S_FILES:%.s=$(BUILD_DIR)/%.o) diff --git a/arm9/Makefile b/arm9/Makefile index 4d4b553c..42228747 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -48,14 +48,16 @@ LD_SPEC := $(TARGET).lsf LD_TEMPLATE := ARM9-TS.lcf.template # Directories containing source files -SRC_DIRS := src lib lib/src $(wildcard modules/*/src) -ASM_DIRS := asm data files $(wildcard modules/*/asm) + +# sorting wildcards required for versions of make >= 3.8.2 and < 4.3 for consistent builds +SRC_DIRS := src lib lib/src $(sort $(wildcard modules/*/src)) +ASM_DIRS := asm data files $(sort $(wildcard modules/*/asm)) LIBASM_DIRS := lib/syscall -C_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) -CXX_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.cpp)) -S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s)) -LIBS_FILES := $(foreach dir,$(LIBASM_DIRS),$(wildcard $(dir)/*.s)) +C_FILES := $(foreach dir,$(SRC_DIRS),$(sort $(wildcard $(dir)/*.c))) +CXX_FILES := $(foreach dir,$(SRC_DIRS),$(sort $(wildcard $(dir)/*.cpp))) +S_FILES := $(foreach dir,$(ASM_DIRS),$(sort $(wildcard $(dir)/*.s))) +LIBS_FILES := $(foreach dir,$(LIBASM_DIRS),$(sort $(wildcard $(dir)/*.s))) C_OBJS = $(C_FILES:%.c=$(BUILD_DIR)/%.o) CXX_OBJS = $(CXX_FILES:%.cpp=$(BUILD_DIR)/%.o) |