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

Clean up MakeFiles

This commit is contained in:
jaby 2024-02-09 15:41:56 -05:00
parent 72b6d6ad43
commit 8c1d806f45
12 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/PoolBox/application/Makefile
View File

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

4
examples/PoolBox/assets/Makefile
View File

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

2
examples/PoolBox/iso/Makefile
View File

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

2
mkfile/Makefile
View File

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

0
mkfile/ExportPath.mk → mkfile/common/ExportPath.mk
View File

0
mkfile/RebuildTarget.mk → mkfile/common/RebuildTarget.mk
View File

0
mkfile/Wildcard.mk → mkfile/common/Wildcard.mk
View File

7
src/Library/Makefile
View File

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

4
support/src/FontWriter/Makefile
View File

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

2
template/JabyEngine-PSX_Game/application/Makefile
View File

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

4
template/JabyEngine-PSX_Game/assets/Makefile
View File

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

2
template/JabyEngine-PSX_Game/iso/Makefile
View File

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