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

Add support for building on ARM64 MacOS #854

Open
wants to merge 12 commits into
base: develop/2.4.0
Choose a base branch
from
Open

Add support for building on ARM64 MacOS #854

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
974fb1f
preliminary attempt
FazanaJ Jan 6, 2025
12813f2
simplify a bit
FazanaJ Jan 6, 2025
c6e59e2
oops
FazanaJ Jan 6, 2025
5ab4d17
Merge remote-tracking branch 'upstream/develop/2.4.0' into mac-support
FazanaJ Jan 6, 2025
19f0744
Move declaration
FazanaJ Jan 6, 2025
40aed3e
error out if you try to make patch
FazanaJ Jan 6, 2025
7805624
style fix
FazanaJ Jan 6, 2025
c4be969
Update Makefile
FazanaJ Jan 6, 2025
9894eb9
Merge branch 'mac-support' of https://github.com/FazanaJ/HackerSM64 i…
FazanaJ Jan 6, 2025
994f6ab
I hate makefile
FazanaJ Jan 6, 2025
cd93a7a
Update Makefile
FazanaJ Jan 6, 2025
55da916
Merge branch 'mac-support' of https://github.com/FazanaJ/HackerSM64 i…
FazanaJ Jan 6, 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: 5 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,12 @@ unf: $(ROM) $(LOADER_EXEC)
libultra: $(BUILD_DIR)/libultra.a

patch: $(ROM)
ifeq ($(shell uname), Darwin)
$(error "The 'make patch' command is not supported on macOS.")
gheskett marked this conversation as resolved.
Show resolved Hide resolved
else
$(FLIPS) --create --bps $(shell python3 tools/detect_baseroms.py $(VERSION)) $(ROM) $(BUILD_DIR)/$(TARGET_STRING).bps
endif


# Extra object file dependencies
$(BUILD_DIR)/asm/ipl3.o: $(IPL3_RAW_FILES)
Expand Down