alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-24 00:31:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from corwinkuiper/remove-xbuild

Browse source 
remove need for cargo-xbuild
This commit is contained in:
Corwin 2021-04-03 18:29:21 +01:00 committed by GitHub
parent 2c5f706d20 8ba1c9448e
commit 6a3359c23b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.cargo/config.toml Normal file
View file

@ -0,0 +1,6 @@
[unstable]
build-std = ["core", "compiler_builtins", "alloc"]
build-std-features = ["compiler-builtins-mem"]
[build]
target = "gba.json"

3
Dockerfile
View file

@ -1,4 +1,4 @@
FROM devkitpro/devkitarm:20190212 FROM docker.io/devkitpro/devkitarm:20190212
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y build-essential && \ apt-get install -y build-essential && \
@ -6,7 +6,6 @@ RUN apt-get update && \
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly
RUN . "$HOME/.cargo/env" && \ RUN . "$HOME/.cargo/env" && \
cargo install cargo-xbuild && \
rustup component add rust-src rustup component add rust-src
RUN echo 'export PATH=$PATH:$DEVKITARM/bin' >> $HOME/.bashrc RUN echo 'export PATH=$PATH:$DEVKITARM/bin' >> $HOME/.bashrc

8
Makefile
View file

@ -30,18 +30,18 @@ r-%: out/release/%.gba
cargo-release-%: $(RUSTFILES) out/crt0.o cargo-release-%: $(RUSTFILES) out/crt0.o
@OUTNAME=$(patsubst cargo-release-%,%, $@) @OUTNAME=$(patsubst cargo-release-%,%, $@)
@rustup run nightly cargo xbuild --release --target=gba.json --example=$${OUTNAME} @rustup run nightly cargo build --release --target=gba.json --example=$${OUTNAME}
cargo-debug-%: $(RUSTFILES) out/crt0.o cargo-debug-%: $(RUSTFILES) out/crt0.o
@OUTNAME=$(patsubst cargo-debug-%,%, $@) @OUTNAME=$(patsubst cargo-debug-%,%, $@)
@rustup run nightly cargo xbuild --target=gba.json --example=$${OUTNAME} @rustup run nightly cargo build --target=gba.json --example=$${OUTNAME}
out/crt0.o: crt0.s interrupt_simple.s out/crt0.o: crt0.s interrupt_simple.s
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@$(CC) $(ARCH) -o out/crt0.o crt0.s @$(CC) $(ARCH) -o out/crt0.o crt0.s
clippy: clippy:
rustup run nightly cargo xclippy --target=gba.json rustup run nightly cargo clippy --target=gba.json
doc: doc:
rustup run nightly cargo xdoc --target=gba.json rustup run nightly cargo doc --target=gba.json

1
README.md
View file

@ -12,7 +12,6 @@ examples as documentation.
* Nightly rust, probably quite a recent version. * Nightly rust, probably quite a recent version.
* Devkitarm. * Devkitarm.
* Cargo-xbuild is used too.
This is probably easiest to do in a container, the `start-dev.sh` script creates This is probably easiest to do in a container, the `start-dev.sh` script creates
and runs a development environment in a docker container. and runs a development environment in a docker container.