mirror of
https://github.com/HackerN64/HackerOoT.git
synced 2026-01-21 10:37:37 -08:00
Fix various issues and update F3DEX3 (#178)
* fix sMoonDL build issues on gc-eu-mq-dbg and add both versions to CI * it's oot_version actually * update F3DEX3 patches/gbi * turns out language enum isn't shiftable * format * fix ci issues --------- Co-authored-by: Yanis002 <Yanis002@users.noreply.github.com>
This commit is contained in:
8
.github/workflows/build.yml
vendored
8
.github/workflows/build.yml
vendored
@@ -13,12 +13,16 @@ jobs:
|
||||
include:
|
||||
- name: "Debug, No F3DEX3"
|
||||
args: DEBUG_FEATURES=1 CPP_DEFINES=-DENABLE_F3DEX3=0
|
||||
version: gc-eu-mq-dbg
|
||||
- name: "Debug, F3DEX3"
|
||||
args: DEBUG_FEATURES=1 CPP_DEFINES=-DENABLE_F3DEX3=1
|
||||
version: ntsc-1.2
|
||||
- name: "Release, No F3DEX3"
|
||||
args: DEBUG_FEATURES=0 CPP_DEFINES=-DENABLE_F3DEX3=0
|
||||
version: ntsc-1.2
|
||||
- name: "Release, F3DEX3"
|
||||
args: DEBUG_FEATURES=0 CPP_DEFINES=-DENABLE_F3DEX3=1
|
||||
version: gc-eu-mq-dbg
|
||||
defaults:
|
||||
run:
|
||||
shell: bash
|
||||
@@ -49,8 +53,8 @@ jobs:
|
||||
|
||||
# Setup the project
|
||||
- name: Setup
|
||||
run: make setup -j$(nproc)
|
||||
run: make setup -j$(nproc) VERSION=${{ matrix.version }}
|
||||
|
||||
# Build the project
|
||||
- name: Build
|
||||
run: ${{ matrix.args }} make -j$(nproc)
|
||||
run: ${{ matrix.args }} make -j$(nproc) VERSION=${{ matrix.version }}
|
||||
|
||||
@@ -190,7 +190,7 @@ patch:
|
||||
# Create F3DEX3 bps patches
|
||||
# Steps:
|
||||
# - run Flips and create the patches
|
||||
create_f3dex3_patches: F3DEX3/f3dzex2.code F3DEX3/f3dzex2.data
|
||||
create_f3dex3_patches: $(F3DEX3_DIR)/f3dzex2.code $(F3DEX3_DIR)/f3dzex2.data
|
||||
$(call print_no_args,Creating F3DEX3 patches...)
|
||||
$(V)$(FLIPS) --create --bps $(F3DEX3_DIR)/f3dzex2.code $(F3DEX3_DIR)/F3DEX3_BrW.code $(F3DEX3_DIR)/F3DEX3_BrW.code.bps
|
||||
$(V)$(FLIPS) --create --bps $(F3DEX3_DIR)/f3dzex2.data $(F3DEX3_DIR)/F3DEX3_BrW.data $(F3DEX3_DIR)/F3DEX3_BrW.data.bps
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user