From a1367515dfe53b152c936eed120fcfff0421caeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gaier?= Date: Fri, 9 Feb 2024 15:41:56 -0500 Subject: [PATCH] Clean up MakeFiles --- examples/PoolBox/application/Makefile | 2 +- examples/PoolBox/assets/Makefile | 4 ++-- examples/PoolBox/iso/Makefile | 2 +- mkfile/Makefile | 2 +- mkfile/{ => common}/ExportPath.mk | 0 mkfile/{ => common}/RebuildTarget.mk | 0 mkfile/{ => common}/Wildcard.mk | 0 src/Library/Makefile | 7 +++---- support/src/FontWriter/Makefile | 4 ++-- template/JabyEngine-PSX_Game/application/Makefile | 2 +- template/JabyEngine-PSX_Game/assets/Makefile | 4 ++-- template/JabyEngine-PSX_Game/iso/Makefile | 2 +- 12 files changed, 14 insertions(+), 15 deletions(-) rename mkfile/{ => common}/ExportPath.mk (100%) rename mkfile/{ => common}/RebuildTarget.mk (100%) rename mkfile/{ => common}/Wildcard.mk (100%) diff --git a/examples/PoolBox/application/Makefile b/examples/PoolBox/application/Makefile index 2b94dbf6..4ad6e032 100644 --- a/examples/PoolBox/application/Makefile +++ b/examples/PoolBox/application/Makefile @@ -1,6 +1,6 @@ OVERLAY_CONFIG = Overlays.json -include $(JABY_ENGINE_DIR)/mkfile/Wildcard.mk +include $(JABY_ENGINE_DIR)/mkfile/common/Wildcard.mk SRCS = $(call rwildcard, src, c cpp) INCLUDES += -I$(JABY_ENGINE_DIR)/Support/include -I$(JABY_ENGINE_DIR)/include diff --git a/examples/PoolBox/assets/Makefile b/examples/PoolBox/assets/Makefile index 2f0f0a7b..f859be34 100644 --- a/examples/PoolBox/assets/Makefile +++ b/examples/PoolBox/assets/Makefile @@ -1,5 +1,5 @@ -include $(JABY_ENGINE_DIR)/mkfile/ExportPath.mk -include $(JABY_ENGINE_DIR)/mkfile/RebuildTarget.mk +include $(JABY_ENGINE_DIR)/mkfile/common/ExportPath.mk +include $(JABY_ENGINE_DIR)/mkfile/common/RebuildTarget.mk OUTPUT_DIR = bin INPUT = $(OUTPUT_DIR)/TexturePage.bin $(OUTPUT_DIR)/IconTexture.bin $(OUTPUT_DIR)/Paco.bin $(OUTPUT_DIR)/Controller.bin $(OUTPUT_DIR)/doener_fish.bin diff --git a/examples/PoolBox/iso/Makefile b/examples/PoolBox/iso/Makefile index 6887609e..925d0bd1 100644 --- a/examples/PoolBox/iso/Makefile +++ b/examples/PoolBox/iso/Makefile @@ -1,2 +1,2 @@ include $(JABY_ENGINE_DIR)/mkfile/ISOMakefile.mk -include $(JABY_ENGINE_DIR)/mkfile/RebuildTarget.mk \ No newline at end of file +include $(JABY_ENGINE_DIR)/mkfile/common/RebuildTarget.mk \ No newline at end of file diff --git a/mkfile/Makefile b/mkfile/Makefile index 1c54609f..5a0e4ae4 100644 --- a/mkfile/Makefile +++ b/mkfile/Makefile @@ -1,5 +1,5 @@ SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST))) -include $(SELF_DIR)ExportPath.mk +include $(SELF_DIR)common/ExportPath.mk substitute = $(subst $(JABY_ENGINE_DIR)/include/modules,!JABYENGINEMODULES,$(subst ..,!super,$1)) desubstitute = $(subst !JABYENGINEMODULES,$(JABY_ENGINE_DIR)/include/modules,$(subst !super,..,$1)) diff --git a/mkfile/ExportPath.mk b/mkfile/common/ExportPath.mk similarity index 100% rename from mkfile/ExportPath.mk rename to mkfile/common/ExportPath.mk diff --git a/mkfile/RebuildTarget.mk b/mkfile/common/RebuildTarget.mk similarity index 100% rename from mkfile/RebuildTarget.mk rename to mkfile/common/RebuildTarget.mk diff --git a/mkfile/Wildcard.mk b/mkfile/common/Wildcard.mk similarity index 100% rename from mkfile/Wildcard.mk rename to mkfile/common/Wildcard.mk diff --git a/src/Library/Makefile b/src/Library/Makefile index df9c5e92..e5422673 100644 --- a/src/Library/Makefile +++ b/src/Library/Makefile @@ -1,4 +1,4 @@ -include ../../mkfile/RebuildTarget.mk +include ../../mkfile/common/RebuildTarget.mk JABY_ENGINE_DIR = ../../ ARTIFACT = libJabyEngine_$(TV_FORMAT) @@ -6,14 +6,13 @@ ARTIFACT = libJabyEngine_$(TV_FORMAT) SPLASH_IMAGE = src/BootLoader/splash_image_pal_boot.hpp SPLASH_IMAGE_NTSC = src/BootLoader/splash_image_ntsc_boot.hpp -#TODO: v Check if we need this include still -CCFLAGS += -Iinclude -I../../include -D__friends=public +CCFLAGS += -I../../include -D__friends=public CCFLAGS += -save-temps=obj include ../../mkfile/common/CustomConfigHelper.mk CONFIG_NAME = $(PLATFORM)-$(BUILD_PROFILE)/$(CUSTOM_CONFIG) -include ../../mkfile/Wildcard.mk +include ../../mkfile/common/Wildcard.mk SRCS = $(call rwildcard, src, c cpp s) include ../../mkfile/Makefile diff --git a/support/src/FontWriter/Makefile b/support/src/FontWriter/Makefile index 9db8758f..4d75f761 100644 --- a/support/src/FontWriter/Makefile +++ b/support/src/FontWriter/Makefile @@ -1,5 +1,5 @@ JABY_ENGINE_DIR = ../../.. -include $(JABY_ENGINE_DIR)/mkfile/RebuildTarget.mk +include $(JABY_ENGINE_DIR)/mkfile/common/RebuildTarget.mk ARTIFACT = libFontWriter BUILD_DIR = bin @@ -9,7 +9,7 @@ DEFAULT_FONT_IMAGE = src/default_font_data.hpp CCFLAGS += -I../../include -I$(JABY_ENGINE_DIR)/include CCFLAGS += -save-temps=obj -include $(JABY_ENGINE_DIR)/mkfile/Wildcard.mk +include $(JABY_ENGINE_DIR)/mkfile/common/Wildcard.mk SRCS = $(call rwildcard, src, c cpp s) include $(JABY_ENGINE_DIR)/mkfile/Makefile diff --git a/template/JabyEngine-PSX_Game/application/Makefile b/template/JabyEngine-PSX_Game/application/Makefile index 0f45f52a..6432cda9 100644 --- a/template/JabyEngine-PSX_Game/application/Makefile +++ b/template/JabyEngine-PSX_Game/application/Makefile @@ -1,6 +1,6 @@ #OVERLAY_CONFIG = Overlays.json -include $(JABY_ENGINE_DIR)/mkfile/Wildcard.mk +include $(JABY_ENGINE_DIR)/mkfile/common/Wildcard.mk SRCS = $(call rwildcard, src, c cpp) INCLUDES += -I$(JABY_ENGINE_DIR)/include diff --git a/template/JabyEngine-PSX_Game/assets/Makefile b/template/JabyEngine-PSX_Game/assets/Makefile index 36885406..00a88343 100644 --- a/template/JabyEngine-PSX_Game/assets/Makefile +++ b/template/JabyEngine-PSX_Game/assets/Makefile @@ -1,5 +1,5 @@ -include $(JABY_ENGINE_DIR)/mkfile/ExportPath.mk -include $(JABY_ENGINE_DIR)/mkfile/RebuildTarget.mk +include $(JABY_ENGINE_DIR)/mkfile/common/ExportPath.mk +include $(JABY_ENGINE_DIR)/mkfile/common/RebuildTarget.mk OUTPUT_DIR = bin diff --git a/template/JabyEngine-PSX_Game/iso/Makefile b/template/JabyEngine-PSX_Game/iso/Makefile index 6887609e..925d0bd1 100644 --- a/template/JabyEngine-PSX_Game/iso/Makefile +++ b/template/JabyEngine-PSX_Game/iso/Makefile @@ -1,2 +1,2 @@ include $(JABY_ENGINE_DIR)/mkfile/ISOMakefile.mk -include $(JABY_ENGINE_DIR)/mkfile/RebuildTarget.mk \ No newline at end of file +include $(JABY_ENGINE_DIR)/mkfile/common/RebuildTarget.mk \ No newline at end of file