summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-04-28 19:24:47 -0700
committerGitHub <noreply@github.com>2018-04-28 19:24:47 -0700
commit13b710f83b010584d807526e64f9f28071fd4133 (patch)
tree1f303211307751e6f0e5d88b020c79b5e5e74a96
parentaa111f33373e0481df975e6e8298dbec9ececc3f (diff)
parentcfc5093a9336bcdf701f6daf4631e30b8db2a4fa (diff)
Merge pull request #607 from yenatch/fix-mac-install
mac install instructions are not the same as linux
-rw-r--r--INSTALL.md56
1 files changed, 29 insertions, 27 deletions
diff --git a/INSTALL.md b/INSTALL.md
index d8f60f3e1..5f7eecbd2 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -2,10 +2,11 @@
Install [**devkitARM**](http://devkitpro.org/wiki/Getting_Started/devkitARM).
-Make sure that there is an environment variable called DEVKITARM with the path of the directory before the "bin" directory containing "arm-none-eabi-as", "arm-none-eabi-cpp", "arm-none-eabi-ld" and "arm-none-eabi-objcopy".
-
Then run the following commands.
+ export DEVKITARM=/opt/devkitPro/devkitARM
+ echo "export DEVKITARM=/opt/devkitPro/devkitARM" >> ~/.bashrc
+
git clone https://github.com/pret/pokeruby
git clone https://github.com/pret/agbcc
@@ -22,11 +23,27 @@ To build **pokeruby.gba**:
# Mac
-In **Terminal**, run the following command:
+Install [**devkitARM**](http://devkitpro.org/wiki/Getting_Started/devkitARM).
+
+Then in **Terminal**, run the following commands.
xcode-select --install
-Then follow the Linux instructions.
+ export DEVKITARM=${HOME}/devkitPro/devkitARM
+ echo "export DEVKITARM=${HOME}/devkitPro/devkitARM" >> ~/.bashrc
+
+ git clone https://github.com/pret/pokeruby
+ git clone https://github.com/pret/agbcc
+
+ cd agbcc
+ ./build.sh
+ ./install.sh ../pokeruby
+
+ cd ../pokeruby
+
+To build **pokeruby.gba**:
+
+ make -j4
# Windows
@@ -66,29 +83,14 @@ To build **pokeruby.gba**:
When you simply enter `make` and don't specify a target, then Pokémon Ruby 1.0 will be built. However, Sapphire can also be built, along with revisions 1 and 2 of both Ruby and Sapphire. Here is a listing of each ROM that can be made, along with the command to make the ROM.
-Pokémon Ruby 1.0
-
- make ruby
-
-Pokémon Ruby 1.1
-
- make ruby_rev1
-
-Pokémon Ruby 1.2
-
- make ruby_rev2
-
-Pokémon Sapphire 1.0
-
- make sapphire
-
-Pokémon Sapphire 1.1
-
- make sapphire_rev1
-
-Pokémon Sapphire 1.2
-
- make sapphire_rev2
+Version | Command
+-------------|---------------------
+Ruby 1.0 | `make ruby`
+Ruby 1.1 | `make ruby_rev1`
+Ruby 1.2 | `make ruby_rev2`
+Sapphire 1.0 | `make sapphire`
+Sapphire 1.1 | `make sapphire_rev1`
+Sapphire 1.2 | `make sapphire_rev2`
# Faster builds