Allow parallel build

This commit is contained in:
Dave Murphy 2017-07-17 19:17:19 +01:00 committed by d0k3
parent 9aeac540e5
commit 748b77ad9c

View File

@ -108,9 +108,11 @@ else
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
endif endif
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
export HFILES := $(addsuffix .h,$(subst .,_,$(BINFILES)))
export OFILES := $(addsuffix .o,$(BINFILES)) \ export OFILES_BIN := $(addsuffix .o,$(BINFILES))
$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o) export OFILES_SOURCES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
export OFILES := $(OFILES_BIN) $(OFILES_SOURCES)
export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
$(foreach dir,$(LIBDIRS),-I$(dir)/include) \ $(foreach dir,$(LIBDIRS),-I$(dir)/include) \
@ -131,7 +133,7 @@ submodules:
@-git submodule update --init --recursive @-git submodule update --init --recursive
binary: common binary: common
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
firm: binary firm: binary
@firmtool build $(OUTPUT).firm -n 0x23F00000 -e 0 -D $(OUTPUT).elf -A 0x23F00000 -C NDMA -i @firmtool build $(OUTPUT).firm -n 0x23F00000 -e 0 -D $(OUTPUT).elf -A 0x23F00000 -C NDMA -i
@ -141,11 +143,11 @@ gateway: binary
@dd if=$(OUTPUT).bin of=$(OUTPUT_D)/Launcher.dat bs=1497296 seek=1 conv=notrunc @dd if=$(OUTPUT).bin of=$(OUTPUT_D)/Launcher.dat bs=1497296 seek=1 conv=notrunc
cakehax: submodules binary cakehax: submodules binary
@make dir_out=$(OUTPUT_D) name=$(TARGET).dat -C CakeHax bigpayload @$(MAKE) dir_out=$(OUTPUT_D) name=$(TARGET).dat -C CakeHax bigpayload
@dd if=$(OUTPUT).bin of=$(OUTPUT).dat bs=512 seek=160 @dd if=$(OUTPUT).bin of=$(OUTPUT).dat bs=512 seek=160
cakerop: cakehax cakerop: cakehax
@make DATNAME=$(TARGET).dat DISPNAME=$(TARGET) GRAPHICS=../resources/CakesROP -C CakesROP @$(MAKE) DATNAME=$(TARGET).dat DISPNAME=$(TARGET) GRAPHICS=../resources/CakesROP -C CakesROP
@mv CakesROP/CakesROP.nds $(OUTPUT_D)/$(TARGET).nds @mv CakesROP/CakesROP.nds $(OUTPUT_D)/$(TARGET).nds
brahma: submodules binary brahma: submodules binary
@ -153,14 +155,14 @@ brahma: submodules binary
@cp $(OUTPUT).bin BrahmaLoader/data/payload.bin @cp $(OUTPUT).bin BrahmaLoader/data/payload.bin
@cp resources/BrahmaAppInfo BrahmaLoader/resources/AppInfo @cp resources/BrahmaAppInfo BrahmaLoader/resources/AppInfo
@cp resources/BrahmaIcon.png BrahmaLoader/resources/icon.png @cp resources/BrahmaIcon.png BrahmaLoader/resources/icon.png
@make --no-print-directory -C BrahmaLoader APP_TITLE=$(TARGET) @$(MAKE) --no-print-directory -C BrahmaLoader APP_TITLE=$(TARGET)
@mv BrahmaLoader/output/*.3dsx $(OUTPUT_D) @mv BrahmaLoader/output/*.3dsx $(OUTPUT_D)
@mv BrahmaLoader/output/*.smdh $(OUTPUT_D) @mv BrahmaLoader/output/*.smdh $(OUTPUT_D)
release: release:
@rm -fr $(BUILD) $(OUTPUT_D) $(RELEASE) @rm -fr $(BUILD) $(OUTPUT_D) $(RELEASE)
@make --no-print-directory binary @$(MAKE) --no-print-directory binary
@make --no-print-directory firm @$(MAKE) --no-print-directory firm
#@-make --no-print-directory cakerop #@-make --no-print-directory cakerop
#@-make --no-print-directory brahma #@-make --no-print-directory brahma
@[ -d $(RELEASE) ] || mkdir -p $(RELEASE) @[ -d $(RELEASE) ] || mkdir -p $(RELEASE)
@ -179,9 +181,9 @@ release:
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
clean: clean:
@echo clean ... @echo clean ...
@-make clean --no-print-directory -C CakeHax @-$(MAKE) clean --no-print-directory -C CakeHax
@-make clean --no-print-directory -C CakesROP @-$(MAKE) clean --no-print-directory -C CakesROP
@-make clean --no-print-directory -C BrahmaLoader @-$(MAKE) clean --no-print-directory -C BrahmaLoader
@rm -fr $(BUILD) $(OUTPUT_D) $(RELEASE) @rm -fr $(BUILD) $(OUTPUT_D) $(RELEASE)
@ -194,9 +196,9 @@ DEPENDS := $(OFILES:.o=.d)
# main targets # main targets
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
$(OUTPUT).bin : $(OUTPUT).elf $(OUTPUT).bin : $(OUTPUT).elf
$(OFILES_SOURCES) : $(HFILES)
$(OUTPUT).elf : $(OFILES) $(OUTPUT).elf : $(OFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
%.bin: %.elf %.bin: %.elf
@$(OBJCOPY) --set-section-flags .bss=alloc,load,contents -O binary $< $@ @$(OBJCOPY) --set-section-flags .bss=alloc,load,contents -O binary $< $@
@ -205,7 +207,7 @@ $(OUTPUT).elf : $(OFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# you need a rule like this for each extension you use as binary data # you need a rule like this for each extension you use as binary data
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
%.qlz.o: %.qlz %_qlz.h %.qlz.o: %.qlz
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
@echo $(notdir $<) @echo $(notdir $<)
@$(bin2o) @$(bin2o)