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 /Makefile | |
| parent | f210c59115358140bc76cda4f06283e0bd64ccbb (diff) | |
| parent | b92b498be29cb7db1e30a9eac8113388e0a95369 (diff) | |
Merge branch 'master' of github.com:pret/pokediamond into pikalax_work
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 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)) \ |