Merge pull request #32 from sphinxc0re/patch-1

Updated example file in init.sh
This commit is contained in:
Lokathor 2018-12-13 10:46:49 -07:00 committed by GitHub
commit 6ee00c0a2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions

View file

@ -14,7 +14,7 @@ A crate that helps you make GBA games
This crate requires a fair amount of special setup. All of the steps are This crate requires a fair amount of special setup. All of the steps are
detailed for you [in the 0th chapter of the detailed for you [in the 0th chapter of the
book](https://rust-console.github.io/gba/ch00/index.html) that goes with this book](https://rust-console.github.io/gba/00-introduction/03-development-setup.html) that goes with this
crate. crate.
If you've done the global setup once before and just want to get a new project If you've done the global setup once before and just want to get a new project

View file

@ -30,12 +30,15 @@ mv linker.ld $APP_NAME/linker.ld
# substitute cargo main file with a new basic one # substitute cargo main file with a new basic one
rm -rf $APP_NAME/src/main.rs rm -rf $APP_NAME/src/main.rs
wget https://raw.githubusercontent.com/rust-console/gba/master/examples/hello1.rs wget https://raw.githubusercontent.com/rust-console/gba/master/examples/hello_world.rs
mv hello1.rs $APP_NAME/src/main.rs mv hello_world.rs $APP_NAME/src/main.rs
# precreate target directory for crt0.o file
mkdir $APP_NAME/target
# setup make file # setup make file
echo -e "CRT_FILE=$(echo $CRT_LOCAL) echo -e "CRT_FILE=$(echo $CRT_LOCAL)
CRT_OUTPUT=crt0.o CRT_OUTPUT=target/crt0.o
PROJECT_NAME=$(echo $APP_NAME) PROJECT_NAME=$(echo $APP_NAME)
TARGET=$(echo $TARGET) TARGET=$(echo $TARGET)
THUMB_TARGET=$(echo $TARGET).json THUMB_TARGET=$(echo $TARGET).json