From b279dd8bdbb4f0ff3a8e1ff30ce5ca8a9567a2c5 Mon Sep 17 00:00:00 2001 From: jaby Date: Mon, 9 Oct 2023 20:52:19 +0200 Subject: [PATCH] Update Makefiles and Template --- examples/PoolBox/Makefile | 2 +- examples/PoolBox/application/Makefile | 6 +++--- examples/PoolBox/assets/Makefile | 4 ++-- examples/PoolBox/iso/Makefile | 2 ++ {lib => mkfile}/ExportPath.mk | 0 lib/ISOTarget.mk => mkfile/ISOMakefile.mk | 1 - {lib => mkfile}/Makefile | 2 +- {lib => mkfile}/PSEXETarget.mk | 0 {lib => mkfile}/RebuildTarget.mk | 0 {lib => mkfile}/Wildcard.mk | 0 {lib => mkfile}/psexe.ld | 0 src/Library/Makefile | 6 +++--- 12 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 examples/PoolBox/iso/Makefile rename {lib => mkfile}/ExportPath.mk (100%) rename lib/ISOTarget.mk => mkfile/ISOMakefile.mk (77%) rename {lib => mkfile}/Makefile (96%) rename {lib => mkfile}/PSEXETarget.mk (100%) rename {lib => mkfile}/RebuildTarget.mk (100%) rename {lib => mkfile}/Wildcard.mk (100%) rename {lib => mkfile}/psexe.ld (100%) diff --git a/examples/PoolBox/Makefile b/examples/PoolBox/Makefile index 6061d128..8a43de83 100644 --- a/examples/PoolBox/Makefile +++ b/examples/PoolBox/Makefile @@ -1,7 +1,7 @@ ARTIFACT = PoolBox make_assets = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -C assets 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) -C iso all clean rebuild: |assets_$(MAKECMDGOALS) application_$(MAKECMDGOALS) cd_$(MAKECMDGOALS) diff --git a/examples/PoolBox/application/Makefile b/examples/PoolBox/application/Makefile index 5b712e86..d0ac4ef3 100644 --- a/examples/PoolBox/application/Makefile +++ b/examples/PoolBox/application/Makefile @@ -2,11 +2,11 @@ BUILD_DIR = bin OVERLAY_CONFIG = Overlays.json -include $(JABY_ENGINE_DIR)/lib/Wildcard.mk +include $(JABY_ENGINE_DIR)/mkfile/Wildcard.mk SRCS = $(call rwildcard, src, c cpp) INCLUDES += -I$(JABY_ENGINE_DIR)/include CCFLAGS += -save-temps=obj -include $(JABY_ENGINE_DIR)/lib/Makefile -include $(JABY_ENGINE_DIR)/lib/PSEXETarget.mk \ No newline at end of file +include $(JABY_ENGINE_DIR)/mkfile/Makefile +include $(JABY_ENGINE_DIR)/mkfile/PSEXETarget.mk \ No newline at end of file diff --git a/examples/PoolBox/assets/Makefile b/examples/PoolBox/assets/Makefile index 75aea332..17b04c4a 100644 --- a/examples/PoolBox/assets/Makefile +++ b/examples/PoolBox/assets/Makefile @@ -1,5 +1,5 @@ -include $(JABY_ENGINE_DIR)/lib/ExportPath.mk -include $(JABY_ENGINE_DIR)/lib/RebuildTarget.mk +include $(JABY_ENGINE_DIR)/mkfile/ExportPath.mk +include $(JABY_ENGINE_DIR)/mkfile/RebuildTarget.mk OUTPUT_DIR = bin INPUT = $(OUTPUT_DIR)/TexturePage.bin $(OUTPUT_DIR)/IconTexture.bin $(OUTPUT_DIR)/YoshiFont.bin $(OUTPUT_DIR)/Paco.bin diff --git a/examples/PoolBox/iso/Makefile b/examples/PoolBox/iso/Makefile new file mode 100644 index 00000000..e5dcf2c8 --- /dev/null +++ b/examples/PoolBox/iso/Makefile @@ -0,0 +1,2 @@ +include $(JABY_ENGINE_DIR)/mkfile/ISOMakefile.mk +include $(JABY_ENGINE_DIR)/mkfile/RebuildTarget.mk \ No newline at end of file diff --git a/lib/ExportPath.mk b/mkfile/ExportPath.mk similarity index 100% rename from lib/ExportPath.mk rename to mkfile/ExportPath.mk diff --git a/lib/ISOTarget.mk b/mkfile/ISOMakefile.mk similarity index 77% rename from lib/ISOTarget.mk rename to mkfile/ISOMakefile.mk index 1fa1a984..3b00d8f8 100644 --- a/lib/ISOTarget.mk +++ b/mkfile/ISOMakefile.mk @@ -1,4 +1,3 @@ -include $(JABY_ENGINE_DIR)/lib/RebuildTarget.mk CD_OUTPUT ?= $(ARTIFACT).bin $(CD_OUTPUT): always diff --git a/lib/Makefile b/mkfile/Makefile similarity index 96% rename from lib/Makefile rename to mkfile/Makefile index 7528450b..39e7961b 100644 --- a/lib/Makefile +++ b/mkfile/Makefile @@ -60,7 +60,7 @@ CCFLAGS += -DJABYENGINE_$(TV_FORMAT) #Linker flags LDFLAGS_release += -Os -LDFLAGS_all += -Wl,-Map=$(TARGET).map -nostdlib -T$(JABY_ENGINE_DIR)/lib/psexe.ld -static -Wl,--gc-sections -Wl,--build-id=none -Wl,--no-check-sections +LDFLAGS_all += -Wl,-Map=$(TARGET).map -nostdlib -T$(JABY_ENGINE_DIR)/mkfile/psexe.ld -static -Wl,--gc-sections -Wl,--build-id=none -Wl,--no-check-sections LDFLAGS_all += $(ARCHFLAGS) -Wl,--oformat=$(FORMAT) LDFLAGS_all += $(LDFLAGS_$(BUILD_PROFILE)) diff --git a/lib/PSEXETarget.mk b/mkfile/PSEXETarget.mk similarity index 100% rename from lib/PSEXETarget.mk rename to mkfile/PSEXETarget.mk diff --git a/lib/RebuildTarget.mk b/mkfile/RebuildTarget.mk similarity index 100% rename from lib/RebuildTarget.mk rename to mkfile/RebuildTarget.mk diff --git a/lib/Wildcard.mk b/mkfile/Wildcard.mk similarity index 100% rename from lib/Wildcard.mk rename to mkfile/Wildcard.mk diff --git a/lib/psexe.ld b/mkfile/psexe.ld similarity index 100% rename from lib/psexe.ld rename to mkfile/psexe.ld diff --git a/src/Library/Makefile b/src/Library/Makefile index 216c4597..b54b5a39 100644 --- a/src/Library/Makefile +++ b/src/Library/Makefile @@ -1,4 +1,4 @@ -include ../../lib/RebuildTarget.mk +include ../../mkfile/RebuildTarget.mk JABY_ENGINE_DIR = ../../ ARTIFACT = libJabyEngine_$(TV_FORMAT) @@ -10,10 +10,10 @@ SPLASH_IMAGE_NTSC = src/BootLoader/splash_image_ntsc_boot.hpp CCFLAGS += -Iinclude -I../../include -D__friends=public CCFLAGS += -save-temps=obj -include ../../lib/Wildcard.mk +include ../../mkfile/Wildcard.mk SRCS = $(call rwildcard, src, c cpp s) -include ../../lib/Makefile +include ../../mkfile/Makefile LIB_DIR = ../../lib/$(CONFIG_NAME) MAIN_LIB_OBJS = $(filter-out $(MAIN_BOOT_OBJ) $(OVERLAY_BOOT_OBJ),$(OBJS))