From 3c0cc3bb6ac803266288f5f097803cc436a8c94b Mon Sep 17 00:00:00 2001 From: jaby Date: Wed, 15 May 2024 19:48:55 +0200 Subject: [PATCH] Fix casing for 'Support' folder --- examples/PoolBox/PoolBox.code-workspace | 2 +- examples/PoolBox/application/Makefile | 2 +- mkfile/PSEXETarget.mk | 2 +- support/src/Makefile | 2 +- template/JabyEngine-PSX_Game/#{ProjectName}.code-workspace | 2 +- template/JabyEngine-PSX_Game/application/Makefile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/PoolBox/PoolBox.code-workspace b/examples/PoolBox/PoolBox.code-workspace index 2939de43..540f55ec 100644 --- a/examples/PoolBox/PoolBox.code-workspace +++ b/examples/PoolBox/PoolBox.code-workspace @@ -93,7 +93,7 @@ "settings": { "C_Cpp.default.includePath": [ "${env:JABY_ENGINE_PATH}/include", - "${env:JABY_ENGINE_PATH}/Support/include" + "${env:JABY_ENGINE_PATH}/support/include" ], "C_Cpp.default.compilerPath": "", "C_Cpp.default.cStandard": "c17", diff --git a/examples/PoolBox/application/Makefile b/examples/PoolBox/application/Makefile index 4ad6e032..cd3f4824 100644 --- a/examples/PoolBox/application/Makefile +++ b/examples/PoolBox/application/Makefile @@ -3,7 +3,7 @@ OVERLAY_CONFIG = Overlays.json 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 +INCLUDES += -I$(JABY_ENGINE_DIR)/support/include -I$(JABY_ENGINE_DIR)/include CCFLAGS += -save-temps=obj SUPPORT_LIBS += FontWriter diff --git a/mkfile/PSEXETarget.mk b/mkfile/PSEXETarget.mk index 85632fa6..ac315988 100644 --- a/mkfile/PSEXETarget.mk +++ b/mkfile/PSEXETarget.mk @@ -5,7 +5,7 @@ include $(AUTO_OVERLAY_DIR)/Overlays.mk include $(JABY_ENGINE_DIR)/mkfile/common/CustomConfigHelper.mk JABY_ENGINE_LIB_DIR = $(JABY_ENGINE_DIR)/lib/PSX-$(BUILD_PROFILE)/$(CUSTOM_CONFIG) -JABY_ENGINE_SUPPORT_LIB_DIR = $(JABY_ENGINE_DIR)/Support/lib/PSX-$(BUILD_PROFILE) +JABY_ENGINE_SUPPORT_LIB_DIR = $(JABY_ENGINE_DIR)/support/lib/PSX-$(BUILD_PROFILE) JABY_ENGINE_SUPPORT_LIBS = $(addprefix -l,$(SUPPORT_LIBS)) JABY_ENGINE_SUPPORT_DEPS = $(addsuffix .a,$(addprefix $(JABY_ENGINE_SUPPORT_LIB_DIR)/lib,$(SUPPORT_LIBS))) JABY_ENGINE_LIB_NAME = JabyEngine_$(PSX_TV_FORMAT) diff --git a/support/src/Makefile b/support/src/Makefile index c5efff53..923279d5 100644 --- a/support/src/Makefile +++ b/support/src/Makefile @@ -1,5 +1,5 @@ FontWriter: always - $(MAKE) -C $(JABY_ENGINE_DIR)/Support/src/FontWriter $(MAKECMDGOALS) + $(MAKE) -C $(JABY_ENGINE_DIR)/support/src/FontWriter $(MAKECMDGOALS) all: FontWriter diff --git a/template/JabyEngine-PSX_Game/#{ProjectName}.code-workspace b/template/JabyEngine-PSX_Game/#{ProjectName}.code-workspace index 866a6c77..4e1124dc 100644 --- a/template/JabyEngine-PSX_Game/#{ProjectName}.code-workspace +++ b/template/JabyEngine-PSX_Game/#{ProjectName}.code-workspace @@ -93,7 +93,7 @@ "settings": { "C_Cpp.default.includePath": [ "${env:JABY_ENGINE_PATH}/include", - "${env:JABY_ENGINE_PATH}/Support/include" + "${env:JABY_ENGINE_PATH}/support/include" ], "C_Cpp.default.compilerPath": "", "C_Cpp.default.cStandard": "c17", diff --git a/template/JabyEngine-PSX_Game/application/Makefile b/template/JabyEngine-PSX_Game/application/Makefile index 6432cda9..2de33a7b 100644 --- a/template/JabyEngine-PSX_Game/application/Makefile +++ b/template/JabyEngine-PSX_Game/application/Makefile @@ -4,7 +4,7 @@ include $(JABY_ENGINE_DIR)/mkfile/common/Wildcard.mk SRCS = $(call rwildcard, src, c cpp) INCLUDES += -I$(JABY_ENGINE_DIR)/include -#INCLUDES += -I$(JABY_ENGINE_DIR)/Support/include +#INCLUDES += -I$(JABY_ENGINE_DIR)/support/include #Example for using Support libs #SUPPORT_LIBS += FontWriter