diff --git a/Makefile b/Makefile index b267233..a3bfd73 100644 --- a/Makefile +++ b/Makefile @@ -581,10 +581,9 @@ $(BUILD_DIR)/%.elf: $(BUILD_DIR)/%.o $(call print,Linking ELF file:,$<,$@) $(V)$(LD) -e 0 -Ttext=$(SEGMENT_ADDRESS) -Map $@.map -o $@ $< # Override for leveldata.elf, which otherwise matches the above pattern -.SECONDEXPANSION: -$(BUILD_DIR)/levels/%/leveldata.elf: $(BUILD_DIR)/levels/%/leveldata.o $(BUILD_DIR)/bin/$$(TEXTURE_BIN).elf +$(BUILD_DIR)/levels/%/leveldata.elf: $(BUILD_DIR)/levels/%/leveldata.o $(wildcard $(BUILD_DIR)/bin/*.elf) $(call print,Linking ELF file:,$<,$@) - $(V)$(LD) -e 0 -Ttext=$(SEGMENT_ADDRESS) -Map $@.map --just-symbols=$(BUILD_DIR)/bin/$(TEXTURE_BIN).elf -o $@ $< + $(V)$(LD) -e 0 -Ttext=$(SEGMENT_ADDRESS) -Map $@.map $(foreach texture,$(wildcard $(BUILD_DIR)/bin/*.elf),--just-symbols=$(texture)) -o $@ $< $(BUILD_DIR)/%.bin: $(BUILD_DIR)/%.elf $(call print,Extracting compressible data from:,$<,$@)