Skip to content

Fix automatic build script #46

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

Merged
merged 3 commits into from
Aug 24, 2025
Merged

Fix automatic build script #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
211fbb5
Fix docker image version
Xzonn Aug 18, 2025
5a7802f
Fix calico directory
Xzonn Aug 24, 2025
a85bf61
Remove setup-python
Xzonn Aug 24, 2025
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
5 changes: 1 addition & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,11 @@ jobs:
compile-binaries:
runs-on: ubuntu-latest
container:
image: xzonn/devkitarm:latest
image: xzonn/devkitarm:20250824
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Merge messages
run: |
python scripts/merge_messages.py
Expand Down
3 changes: 2 additions & 1 deletion asm/DP/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ endef
export PORTLIBS := $(DEVKITPRO)/portlibs/arm
export PATH := $(DEVKITARM)/bin:$(PORTLIBS)/bin:$(PATH)
LIBNDS := $(DEVKITPRO)/libnds
CALICO := $(DEVKITPRO)/calico

#---------------------------------------------------------------------------------
# the prefix on the compiler executables
Expand Down Expand Up @@ -94,7 +95,7 @@ LIBS := -lnds9 -lc
# list of directories containing libraries, this must be the top level containing
# include and lib
#---------------------------------------------------------------------------------
LIBDIRS := $(LIBNDS) $(DEVKITARM) $(DEVKITARM)/arm-none-eabi
LIBDIRS := $(LIBNDS) $(CALICO) $(DEVKITARM) $(DEVKITARM)/arm-none-eabi

#---------------------------------------------------------------------------------
ifneq ($(BUILD),$(notdir $(CURDIR)))
Expand Down
3 changes: 2 additions & 1 deletion asm/HGSS/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ endef
export PORTLIBS := $(DEVKITPRO)/portlibs/arm
export PATH := $(DEVKITARM)/bin:$(PORTLIBS)/bin:$(PATH)
LIBNDS := $(DEVKITPRO)/libnds
CALICO := $(DEVKITPRO)/calico

#---------------------------------------------------------------------------------
# the prefix on the compiler executables
Expand Down Expand Up @@ -101,7 +102,7 @@ LIBS := -lnds9 -lc
# list of directories containing libraries, this must be the top level containing
# include and lib
#---------------------------------------------------------------------------------
LIBDIRS := $(LIBNDS) $(DEVKITARM) $(DEVKITARM)/arm-none-eabi
LIBDIRS := $(LIBNDS) $(CALICO) $(DEVKITARM) $(DEVKITARM)/arm-none-eabi

#---------------------------------------------------------------------------------
ifneq ($(BUILD),$(notdir $(CURDIR)))
Expand Down
3 changes: 2 additions & 1 deletion asm/Pt/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ endef
export PORTLIBS := $(DEVKITPRO)/portlibs/arm
export PATH := $(DEVKITARM)/bin:$(PORTLIBS)/bin:$(PATH)
LIBNDS := $(DEVKITPRO)/libnds
CALICO := $(DEVKITPRO)/calico

#---------------------------------------------------------------------------------
# the prefix on the compiler executables
Expand Down Expand Up @@ -85,7 +86,7 @@ LIBS := -lnds9 -lc
# list of directories containing libraries, this must be the top level containing
# include and lib
#---------------------------------------------------------------------------------
LIBDIRS := $(LIBNDS) $(DEVKITARM) $(DEVKITARM)/arm-none-eabi
LIBDIRS := $(LIBNDS) $(CALICO) $(DEVKITARM) $(DEVKITARM)/arm-none-eabi

#---------------------------------------------------------------------------------
ifneq ($(BUILD),$(notdir $(CURDIR)))
Expand Down
Loading