mirror of
https://github.com/italicsjenga/agb.git
synced 2024-12-23 16:21:33 +11:00
Merge pull request #3 from corwinkuiper/remove-xbuild
remove need for cargo-xbuild
This commit is contained in:
commit
6a3359c23b
6
.cargo/config.toml
Normal file
6
.cargo/config.toml
Normal file
|
@ -0,0 +1,6 @@
|
|||
[unstable]
|
||||
build-std = ["core", "compiler_builtins", "alloc"]
|
||||
build-std-features = ["compiler-builtins-mem"]
|
||||
|
||||
[build]
|
||||
target = "gba.json"
|
|
@ -1,4 +1,4 @@
|
|||
FROM devkitpro/devkitarm:20190212
|
||||
FROM docker.io/devkitpro/devkitarm:20190212
|
||||
|
||||
RUN apt-get update && \
|
||||
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 . "$HOME/.cargo/env" && \
|
||||
cargo install cargo-xbuild && \
|
||||
rustup component add rust-src
|
||||
|
||||
RUN echo 'export PATH=$PATH:$DEVKITARM/bin' >> $HOME/.bashrc
|
||||
|
|
8
Makefile
8
Makefile
|
@ -30,18 +30,18 @@ r-%: out/release/%.gba
|
|||
|
||||
cargo-release-%: $(RUSTFILES) out/crt0.o
|
||||
@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
|
||||
@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
|
||||
@mkdir -p $(dir $@)
|
||||
@$(CC) $(ARCH) -o out/crt0.o crt0.s
|
||||
|
||||
clippy:
|
||||
rustup run nightly cargo xclippy --target=gba.json
|
||||
rustup run nightly cargo clippy --target=gba.json
|
||||
|
||||
doc:
|
||||
rustup run nightly cargo xdoc --target=gba.json
|
||||
rustup run nightly cargo doc --target=gba.json
|
Loading…
Reference in a new issue