Improve rebuild behaviour
This commit is contained in:
parent
09e6aef606
commit
54c7a2f8fe
|
@ -3,10 +3,7 @@ make_assets = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -C assets
|
||||||
make_application = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -C application
|
make_application = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -C application
|
||||||
make_cd = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -f $(JABY_ENGINE_DIR)/lib/ISOTarget.mk -C iso
|
make_cd = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -f $(JABY_ENGINE_DIR)/lib/ISOTarget.mk -C iso
|
||||||
|
|
||||||
all clean rebuild: always
|
all clean rebuild: |assets_$(MAKECMDGOALS) application_$(MAKECMDGOALS) cd_$(MAKECMDGOALS)
|
||||||
$(call make_assets,$(MAKECMDGOALS))
|
|
||||||
$(call make_application,$(MAKECMDGOALS))
|
|
||||||
$(call make_cd,$(MAKECMDGOALS))
|
|
||||||
|
|
||||||
all_%: always
|
all_%: always
|
||||||
$(call make_assets,$*)
|
$(call make_assets,$*)
|
||||||
|
|
|
@ -87,7 +87,5 @@ $(OUTPUT_DIR)/%.o: $$(subst !super,..,%.s)
|
||||||
@mkdir -p $(dir $@)
|
@mkdir -p $(dir $@)
|
||||||
$(CC) $(ARCHFLAGS) -I$(PCSX_REDUX) -g -c -o $@ $<
|
$(CC) $(ARCHFLAGS) -I$(PCSX_REDUX) -g -c -o $@ $<
|
||||||
|
|
||||||
include $(SELF_DIR)RebuildTarget.mk
|
|
||||||
|
|
||||||
#Inclusion of dependencies (object files to source and includes)
|
#Inclusion of dependencies (object files to source and includes)
|
||||||
-include $(OBJS:%.o=%.d)
|
-include $(OBJS:%.o=%.d)
|
|
@ -31,3 +31,7 @@ all: $(TARGET).psexe $(OVERLAY_TARGET)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -fr $(OUTPUT_DIR)
|
rm -fr $(OUTPUT_DIR)
|
||||||
|
|
||||||
|
# For mkoverlay to function correctly this is required (otherwise Overlays.mk is not re-generated)
|
||||||
|
rebuild: clean
|
||||||
|
$(MAKE) all
|
||||||
|
|
|
@ -1,3 +1 @@
|
||||||
rebuild:
|
rebuild: |clean all
|
||||||
$(MAKE) clean
|
|
||||||
$(MAKE) all
|
|
|
@ -3,10 +3,7 @@ make_assets = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -C assets
|
||||||
make_application = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -C application
|
make_application = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -C application
|
||||||
make_cd = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -f $(JABY_ENGINE_DIR)/lib/ISOTarget.mk -C iso
|
make_cd = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -f $(JABY_ENGINE_DIR)/lib/ISOTarget.mk -C iso
|
||||||
|
|
||||||
all clean rebuild: always
|
all clean rebuild: |assets_$(MAKECMDGOALS) application_$(MAKECMDGOALS) cd_$(MAKECMDGOALS)
|
||||||
$(call make_assets,$(MAKECMDGOALS))
|
|
||||||
$(call make_application,$(MAKECMDGOALS))
|
|
||||||
$(call make_cd,$(MAKECMDGOALS))
|
|
||||||
|
|
||||||
all_%: always
|
all_%: always
|
||||||
$(call make_assets,$*)
|
$(call make_assets,$*)
|
||||||
|
|
Loading…
Reference in New Issue