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

Integrate all the progress into master #6

Merged
jaby merged 595 commits from ToolBox into main 2025-01-01 13:17:44 +00:00
Conversation 0 Commits 595 Files Changed 361 +18 -37
5 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 44fd021b99 - Show all commits

10
examples/PoolBox/PoolBox.code-workspace
View File

@ -11,11 +11,11 @@
{
"label": "build",
"type": "shell",
"windows": { // v re-export for WSL v re-export for WSL
"command": "wsl make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} REGION=${input:region} ${input:test} PSX_LICENSE_PATH=$(wslpath ${env:PSX_LICENSE_PATH}) JABY_ENGINE_DIR=$(wslpath ${env:JABY_ENGINE_PATH})",
"windows": { // v re-export for WSL v re-export for WSL
"command": "wsl make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} REGION=${input:region} CUSTOM_CONFIG=${input:custom config} PSX_LICENSE_PATH=$(wslpath ${env:PSX_LICENSE_PATH}) JABY_ENGINE_DIR=$(wslpath ${env:JABY_ENGINE_PATH})",
},
"linux": {
"command": "make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} REGION=${input:region}",
"command": "make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} REGION=${input:region} CUSTOM_CONFIG=${input:custom config}",
},
"group": {
"kind": "build",
@ -69,9 +69,9 @@
"description": "Region profile to use"
},
{
"id": "test",
"id": "custom config",
"type": "pickString",
"options": ["", "CUSTOM_CONFIG=MyConfig"],
"options": ["", "MyConfig"],
"default": "",
"description": "Simple custom config test"
},

11
mkfile/PSEXETarget.mk
View File

@ -2,16 +2,9 @@
AUTO_OVERLAY_DIR = $(OUTPUT_DIR)/auto_overlay
include $(AUTO_OVERLAY_DIR)/Overlays.mk
include $(JABY_ENGINE_DIR)/mkfile/common/CustomConfigHelper.mk
#We use the JabyEngine so we will include ourselves
ifdef CUSTOM_CONFIG
CCFLAGS += -I$(JABY_ENGINE_DIR)/config/$(CUSTOM_CONFIG) -imacros $(JABY_ENGINE_DIR)/config/$(CUSTOM_CONFIG)/jabyengine_custom_defines.hpp
# TODO: v can this be empty maybe??
JABY_ENGINE_LIB_DIR = $(JABY_ENGINE_DIR)/lib/PSX-$(BUILD_PROFILE)/$(CUSTOM_CONFIG)
else
JABY_ENGINE_LIB_DIR = $(JABY_ENGINE_DIR)/lib/PSX-$(BUILD_PROFILE)
endif
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_LIBS = $(addprefix -l,$(SUPPORT_LIBS))
JABY_ENGINE_SUPPORT_DEPS = $(addsuffix .a,$(addprefix $(JABY_ENGINE_SUPPORT_LIB_DIR)/lib,$(SUPPORT_LIBS)))

5
mkfile/common/CustomConfigHelper.mk Normal file
View File

@ -0,0 +1,5 @@
JABY_ENGINE_CONFIG_DIR = $(JABY_ENGINE_DIR)config
ifdef CUSTOM_CONFIG
# TODO: Use same header for -I and -imacros?
CCFLAGS += -I$(JABY_ENGINE_CONFIG_DIR)/$(CUSTOM_CONFIG) -imacros $(JABY_ENGINE_CONFIG_DIR)/$(CUSTOM_CONFIG)/jabyengine_custom_defines.hpp
endif

19
src/Library/Library.code-workspace
View File

@ -19,17 +19,6 @@
{
"label": "make",
"type": "shell",
"windows": {
"command": "wsl make ${input:target} BUILD_PROFILE=${input:build cfg} TV_FORMAT=${input:tv format}",
},
"linux": {
"command": "make ${input:target} BUILD_PROFILE=${input:build cfg} TV_FORMAT=${input:tv format}",
},
"group": "build"
},
{
"label": "make custom config",
"type": "shell",
"windows": {
"command": "wsl make ${input:target} BUILD_PROFILE=${input:build cfg} TV_FORMAT=${input:tv format} CUSTOM_CONFIG=${input:custom config}",
},
@ -42,10 +31,10 @@
"label": "combi make",
"type": "shell",
"windows": {
"command": "wsl make -f CombiMake.mk ${input:target} BUILD_PROFILE=${input:build cfg}",
"command": "wsl make -f CombiMake.mk ${input:target} BUILD_PROFILE=${input:build cfg} CUSTOM_CONFIG=${input:custom config}",
},
"linux": {
"command": "make -f CombiMake.mk ${input:target} BUILD_PROFILE=${input:build cfg}",
"command": "make -f CombiMake.mk ${input:target} BUILD_PROFILE=${input:build cfg} CUSTOM_CONFIG=${input:custom config}",
},
"group": "build"
},
@ -68,8 +57,8 @@
{
"id": "custom config",
"type": "pickString",
"options": ["MyConfig"],
"default": "MyConfig",
"options": ["", "MyConfig"],
"default": "",
"description": "The custom configuration to use for this build"
},
{

10
src/Library/Makefile
View File

@ -10,14 +10,8 @@ SPLASH_IMAGE_NTSC = src/BootLoader/splash_image_ntsc_boot.hpp
CCFLAGS += -Iinclude -I../../include -D__friends=public
CCFLAGS += -save-temps=obj
ifdef CUSTOM_CONFIG
#TODO: Custom config build var
CCFLAGS += -I../../config/$(CUSTOM_CONFIG) -imacros ../../config/$(CUSTOM_CONFIG)/jabyengine_custom_defines.hpp
#TODO: v Or here? v Do we want this here?
CONFIG_NAME = $(PLATFORM)-$(BUILD_PROFILE)/$(CUSTOM_CONFIG)
else
CONFIG_NAME = $(PLATFORM)-$(BUILD_PROFILE)
endif
include ../../mkfile/common/CustomConfigHelper.mk
CONFIG_NAME = $(PLATFORM)-$(BUILD_PROFILE)/$(CUSTOM_CONFIG)
include ../../mkfile/Wildcard.mk
SRCS = $(call rwildcard, src, c cpp s)