Update Makefiles and Template

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)  
 

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
+include $(JABY_ENGINE_DIR)/mkfile/Makefile
+include $(JABY_ENGINE_DIR)/mkfile/PSEXETarget.mk

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

examples/PoolBox/iso/Makefile

@@ -0,0 +1,2 @@
+include $(JABY_ENGINE_DIR)/mkfile/ISOMakefile.mk
+include $(JABY_ENGINE_DIR)/mkfile/RebuildTarget.mk

mkfile/ISOMakefile.mk

@@ -1,4 +1,3 @@
-include $(JABY_ENGINE_DIR)/lib/RebuildTarget.mk
 CD_OUTPUT ?= $(ARTIFACT).bin
 
 $(CD_OUTPUT): always

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

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