From f2480e0fd54b3379215846dcac4d87ad1611e81d Mon Sep 17 00:00:00 2001 From: Jesus Arechiga Date: Sat, 26 Mar 2022 00:30:21 -0700 Subject: [PATCH] Updates to INSTALL.md for Apple Silicon Macs Apple Silicon Macs new default bash installs Homebrew in a different directory than Intel macs, and thus breaks compatibility of some of the build commands. New notes are added specifically for Apple Silicon Mac users. There was previous discussion in the pokeemerald discord that helped verify these additional requirements for Apple Silicon Macs, and thus should also be changed in that repo's INSTALL.md --- INSTALL.md | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 0ae7a2eae..d9d9e0949 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -236,13 +236,19 @@ If this works, then proceed to [Installation](#installation). Otherwise, ask for > This guide installs libpng via Homebrew as it is the easiest method, however advanced users can install libpng through other means if they so desire. +
+ Note for Apple Silicon (M1) Mac users... + +> Currently, Homebrew and libng must be installed via Rosetta on Apple Silicon Macs. Before continuing, create a [Terminal shell profile with Rosetta](https://www.astroworldcreations.com/blog/apple-silicon-and-legacy-command-line-software). Be sure to run the commands corresponding to Apple Silicon (M1). +
1. Open the Terminal. 2. If Homebrew is not installed, then install [Homebrew](https://brew.sh/) by following the instructions on the website. 3. Run the following command to install libpng. ```bash - brew install libpng + brew install libpng # Intel Macs + /usr/local/bin/brew install libpng # Apple Silicon (M1) Macs ``` libpng is now installed. @@ -265,11 +271,14 @@ If this works, then proceed to [Installation](#installation). Otherwise, ask for ```bash export DEVKITPRO=/opt/devkitpro - echo "export DEVKITPRO=$DEVKITPRO" >> ~/.bashrc + echo "export DEVKITPRO=$DEVKITPRO" >> ~/.bashrc # Intel Macs + echo "export DEVKITPRO=$DEVKITPRO" >> ~/.zshrc # Apple Silicon (M1) Macs export DEVKITARM=$DEVKITPRO/devkitARM - echo "export DEVKITARM=$DEVKITARM" >> ~/.bashrc + echo "export DEVKITARM=$DEVKITARM" >> ~/.bashrc # Intel Macs + echo "export DEVKITARM=$DEVKITARM" >> ~/.zshrc # Apple Silicon (M1) Macs - echo "if [ -f ~/.bashrc ]; then . ~/.bashrc; fi" >> ~/.bash_profile + echo "if [ -f ~/.bashrc ]; then . ~/.bashrc; fi" >> ~/.bash_profile # Intel Macs + echo "if [ -f ~/.zshrc ]; then . ~/.zshrc; fi" >> ~/.zprofile # Apple Silicon (M1) Macs ``` ### Choosing where to store pokefirered (macOS) @@ -548,4 +557,4 @@ To compile the `modern` target with this toolchain, the subdirectories `lib`, `i * [porymap](https://github.com/huderlem/porymap) for viewing and editing maps * [poryscript](https://github.com/huderlem/poryscript) for scripting ([VS Code extension](https://marketplace.visualstudio.com/items?itemName=karathan.poryscript)) -* [Tilemap Studio](https://github.com/Rangi42/tilemap-studio) for viewing and editing tilemaps \ No newline at end of file +* [Tilemap Studio](https://github.com/Rangi42/tilemap-studio) for viewing and editing tilemaps