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

Improve custom configuration support

Browse Source
This commit is contained in:
Björn Gaier
2024-02-09 15:35:25 -05:00
parent efe28a9718
commit 44fd021b99
5 changed files with 18 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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)