From b89fd10bb5e1f1bf3698cafc43c5bb3b798135be Mon Sep 17 00:00:00 2001 From: Lokathor Date: Tue, 20 Nov 2018 03:05:34 -0700 Subject: [PATCH] forgot the other directory --- .travis.yml | 1 + book/src/ch00/index.md | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 57f351a..4ace1ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ script: - sudo dkp-pacman -Syu - sudo dkp-pacman -S -v --noconfirm gba-tools devkitARM - export PATH="$PATH:/opt/devkitpro/devkitARM/bin" + - export PATH="$PATH:/opt/devkitpro/tools/bin" # Test the lib and then compile all examples with `cargo make` - cargo test --lib && cargo test --lib --release - cargo make diff --git a/book/src/ch00/index.md b/book/src/ch00/index.md index f57510c..58dc2ca 100644 --- a/book/src/ch00/index.md +++ b/book/src/ch00/index.md @@ -32,10 +32,11 @@ reason, you'll still want devkitpro for the `gbafix` utility. `C:\devkitpro\tools\bin` to be [added to your PATH](https://stackoverflow.com/q/44272416/455232), depending on where you installed it to and such. -* On Linux you'll also want it to be added to your path, but if you're using - Linux I'll just assume you know how to do all that. I'm told that the default - installation path is `/opt/devkitpro/devkitARM/bin`, so look there first if - you didn't select some other place. +* On Linux you can use pacman to get it, and the default install puts the stuff + in `/opt/devkitpro/devkitARM/bin` and `/opt/devkitpro/tools/bin`. If you need + help you can look in our repository's + [.travis.yml](https://github.com/rust-console/gba/blob/master/.travis.yml) + file to see exactly what our CI does. Finally, you'll need `cargo-xbuild`. Just run `cargo install cargo-xbuild` and cargo will figure it all out for you.