Enable PAL and NTSC build
This commit is contained in:
@@ -11,7 +11,12 @@
|
||||
{
|
||||
"label": "build",
|
||||
"type": "shell",
|
||||
"command": "wsl make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} 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} TV_FORMAT=${input:tv format} 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} TV_FORMAT=${input:tv format}",
|
||||
},
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
@@ -25,7 +30,7 @@
|
||||
{
|
||||
"label": "read memory map",
|
||||
"type": "shell",
|
||||
"command": "psxreadmap.exe ${input:output memory map} application/bin/PSX-${input:build profile}/#{ProjectName}.elf",
|
||||
"command": "psxreadmap.exe ${input:output memory map} application/bin/${input:tv format}/PSX-${input:build profile}/#{ProjectName}.elf",
|
||||
"problemMatcher": [],
|
||||
"options": {
|
||||
"env": {
|
||||
@@ -56,6 +61,13 @@
|
||||
"default": "all",
|
||||
"description": "the build target"
|
||||
},
|
||||
{
|
||||
"id": "tv format",
|
||||
"type": "pickString",
|
||||
"options": ["PAL", "NTSC"],
|
||||
"default": "PAL",
|
||||
"description": "TV format to use"
|
||||
},
|
||||
{
|
||||
"id": "output memory map",
|
||||
"type": "pickString",
|
||||
@@ -67,7 +79,8 @@
|
||||
},
|
||||
"settings": {
|
||||
"C_Cpp.default.includePath": [
|
||||
"${env:JABY_ENGINE_PATH}/include"
|
||||
"${env:JABY_ENGINE_PATH}/include",
|
||||
"${env:JABY_ENGINE_PATH}/Support/include"
|
||||
],
|
||||
"C_Cpp.default.compilerPath": "",
|
||||
"C_Cpp.default.cStandard": "c17",
|
||||
|
@@ -1,7 +1,7 @@
|
||||
ARTIFACT = #{ProjectName}
|
||||
make_assets = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -C assets
|
||||
make_application = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -C application
|
||||
make_cd = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -f $(JABY_ENGINE_DIR)/lib/ISOTarget.mk -C iso
|
||||
make_cd = $(MAKE) $(1) ARTIFACT=$(ARTIFACT) -C iso
|
||||
|
||||
all clean rebuild: |assets_$(MAKECMDGOALS) application_$(MAKECMDGOALS) cd_$(MAKECMDGOALS)
|
||||
|
||||
|
@@ -1,14 +1,13 @@
|
||||
BUILD_DIR = bin
|
||||
|
||||
#OVERLAY_CONFIG = Overlays.json
|
||||
|
||||
include $(JABY_ENGINE_DIR)/lib/Wildcard.mk
|
||||
SRCS = $(call rwildcard, src, c cpp)
|
||||
|
||||
INCLUDES += -I$(JABY_ENGINE_DIR)/include
|
||||
#INCLUDES += -I$(JABY_ENGINE_DIR)/Support/include
|
||||
|
||||
#Example for using Support libs
|
||||
#SUPPORT_LIBS += FontWriter
|
||||
|
||||
include $(JABY_ENGINE_DIR)/lib/Makefile
|
||||
include $(JABY_ENGINE_DIR)/lib/PSEXETarget.mk
|
||||
include $(JABY_ENGINE_DIR)/mkfile/Makefile
|
||||
include $(JABY_ENGINE_DIR)/mkfile/PSEXETarget.mk
|
@@ -1,5 +1,5 @@
|
||||
include $(JABY_ENGINE_DIR)/lib/ExportPath.mk
|
||||
include $(JABY_ENGINE_DIR)/lib/RebuildTarget.mk
|
||||
include $(JABY_ENGINE_DIR)/mkfile/ExportPath.mk
|
||||
include $(JABY_ENGINE_DIR)/mkfile/RebuildTarget.mk
|
||||
|
||||
OUTPUT_DIR = bin
|
||||
|
||||
|
@@ -5,6 +5,6 @@
|
||||
</Description>
|
||||
<Track>
|
||||
<File name="SYSTEM.CNF">System.cnf</File>
|
||||
<Main name="XXXX_AAA.AA">../application/bin/PSX-release/#{ProjectName}.psexe</Main>
|
||||
<Main name="XXXX_AAA.AA">../application/bin/%TV_FORMAT%/PSX-release/#{ProjectName}.psexe</Main>
|
||||
</Track>
|
||||
</ISO_Project>
|
2
template/JabyEngine-PSX_Game/iso/Makefile
Normal file
2
template/JabyEngine-PSX_Game/iso/Makefile
Normal file
@@ -0,0 +1,2 @@
|
||||
include $(JABY_ENGINE_DIR)/mkfile/ISOMakefile.mk
|
||||
include $(JABY_ENGINE_DIR)/mkfile/RebuildTarget.mk
|
Reference in New Issue
Block a user