Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Setting Modern as default #3305

Merged
merged 7 commits into from
Oct 24, 2023
Merged

Setting Modern as default #3305

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b222068
Setting Modern as default
AsparagusEduardo Sep 12, 2023
15a9cd0
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/modern
AsparagusEduardo Oct 2, 2023
60cb4b2
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/modern
AsparagusEduardo Oct 13, 2023
a3af515
Updated CI to run modern
AsparagusEduardo Oct 13, 2023
179b244
Makefile changes
mrgriffin Oct 24, 2023
c7477ce
Merge remote-tracking branch 'rhh/upcoming' into HEAD
mrgriffin Oct 24, 2023
73365ba
Merge pull request #24 from mrgriffin/edu-modern
AsparagusEduardo Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ jobs:
working-directory: agbcc

- name: Agbcc
env:
MODERN: 0
COMPARE: 0
run: make -j${nproc} -O all

- name: Modern
Expand All @@ -49,7 +52,8 @@ jobs:

- name: Test
env:
MODERN: 1
TEST: 1
run: |
make -j${nproc} -O pokeemerald-test.elf
make -j${nproc} -O pokeemerald_modern-test.elf
make -j${nproc} check
8 changes: 5 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ TITLE := POKEMON EMER
GAME_CODE := BPEE
MAKER_CODE := 01
REVISION := 0
MODERN ?= 0
MODERN ?= 1
TEST ?= 0
ANALYZE ?= 0

ifeq (modern,$(MAKECMDGOALS))
MODERN := 1
ifeq (agbcc,$(MAKECMDGOALS))
MODERN := 0
endif

ifeq (check,$(MAKECMDGOALS))
Expand Down Expand Up @@ -480,6 +480,8 @@ $(ROM): $(ELF)
$(OBJCOPY) -O binary $< $@
$(FIX) $@ -p --silent

agbcc: all

modern: all

LD_SCRIPT_TEST := ld_script_test.txt
Expand Down
Loading