jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Integrate all the progress into master #6

Merged
jaby merged 595 commits from ToolBox into main 2025-01-01 13:17:44 +00:00
Conversation 0 Commits 595 Files Changed 361 +9 -15
6 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6c181cd3d2 - Show all commits

5
examples/PoolBox/Makefile
View File

@ -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,$*)

2
lib/Makefile
View File

@ -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)

4
lib/PSEXETarget.mk
View File

@ -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

4
lib/RebuildTarget.mk
View File

@ -1,3 +1 @@
rebuild: rebuild: |clean all
$(MAKE) clean
$(MAKE) all

5
template/JabyEngine-PSX_Game/Makefile
View File

@ -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,$*)