vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update orbital, add games

Browse source
This commit is contained in:
Jeremy Soller 2016-12-27 20:23:05 -07:00
parent e6a3856a05
commit 073af0f01d
4 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -55,3 +55,6 @@
[submodule "libc-artifacts"] [submodule "libc-artifacts"]
path = libc-artifacts path = libc-artifacts
url = https://github.com/redox-os/libc-artifacts.git url = https://github.com/redox-os/libc-artifacts.git
[submodule "programs/games"]
path = programs/games
url = https://github.com/redox-os/games.git

16
Makefile
View file

@ -48,6 +48,7 @@ clean:
cargo clean --manifest-path programs/binutils/Cargo.toml cargo clean --manifest-path programs/binutils/Cargo.toml
cargo clean --manifest-path programs/coreutils/Cargo.toml cargo clean --manifest-path programs/coreutils/Cargo.toml
cargo clean --manifest-path programs/extrautils/Cargo.toml cargo clean --manifest-path programs/extrautils/Cargo.toml
cargo clean --manifest-path programs/games/Cargo.toml
cargo clean --manifest-path programs/netutils/Cargo.toml cargo clean --manifest-path programs/netutils/Cargo.toml
cargo clean --manifest-path programs/orbutils/Cargo.toml cargo clean --manifest-path programs/orbutils/Cargo.toml
cargo clean --manifest-path programs/pkgutils/Cargo.toml cargo clean --manifest-path programs/pkgutils/Cargo.toml
@ -103,6 +104,7 @@ test:
cargo test --manifest-path programs/binutils/Cargo.toml cargo test --manifest-path programs/binutils/Cargo.toml
cargo test --manifest-path programs/coreutils/Cargo.toml cargo test --manifest-path programs/coreutils/Cargo.toml
cargo test --manifest-path programs/extrautils/Cargo.toml cargo test --manifest-path programs/extrautils/Cargo.toml
cargo test --manifest-path programs/games/Cargo.toml
cargo test --manifest-path programs/netutils/Cargo.toml cargo test --manifest-path programs/netutils/Cargo.toml
cargo test --manifest-path programs/orbutils/Cargo.toml cargo test --manifest-path programs/orbutils/Cargo.toml
cargo test --manifest-path programs/pkgutils/Cargo.toml cargo test --manifest-path programs/pkgutils/Cargo.toml
@ -135,6 +137,7 @@ update:
cargo update --manifest-path programs/binutils/Cargo.toml cargo update --manifest-path programs/binutils/Cargo.toml
cargo update --manifest-path programs/coreutils/Cargo.toml cargo update --manifest-path programs/coreutils/Cargo.toml
cargo update --manifest-path programs/extrautils/Cargo.toml cargo update --manifest-path programs/extrautils/Cargo.toml
cargo update --manifest-path programs/games/Cargo.toml
cargo update --manifest-path programs/netutils/Cargo.toml cargo update --manifest-path programs/netutils/Cargo.toml
cargo update --manifest-path programs/orbutils/Cargo.toml cargo update --manifest-path programs/orbutils/Cargo.toml
cargo update --manifest-path programs/pkgutils/Cargo.toml cargo update --manifest-path programs/pkgutils/Cargo.toml
@ -424,6 +427,11 @@ filesystem/bin/%: programs/extrautils/Cargo.toml programs/extrautils/src/bin/%.r
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
strip $@ strip $@
filesystem/bin/%: programs/games/Cargo.toml programs/games/src/%/**.rs $(BUILD)/libstd.rlib
mkdir -p filesystem/bin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
strip $@
filesystem/bin/%: programs/netutils/Cargo.toml programs/netutils/src/%/**.rs $(BUILD)/libstd.rlib filesystem/bin/%: programs/netutils/Cargo.toml programs/netutils/src/%/**.rs $(BUILD)/libstd.rlib
mkdir -p filesystem/bin mkdir -p filesystem/bin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
@ -515,6 +523,13 @@ extrautils: \
filesystem/bin/rem \ filesystem/bin/rem \
#filesystem/bin/dmesg filesystem/bin/info filesystem/bin/watch #filesystem/bin/dmesg filesystem/bin/info filesystem/bin/watch
games: \
filesystem/bin/ice \
filesystem/bin/minesweeper \
filesystem/bin/reblox \
filesystem/bin/rusthello \
filesystem/bin/snake
netutils: \ netutils: \
filesystem/bin/dhcpd \ filesystem/bin/dhcpd \
filesystem/bin/dns \ filesystem/bin/dns \
@ -561,6 +576,7 @@ build/filesystem.bin: \
drivers \ drivers \
coreutils \ coreutils \
extrautils \ extrautils \
games \
netutils \ netutils \
orbutils \ orbutils \
pkgutils \ pkgutils \

1
programs/games Submodule

@ -0,0 +1 @@
Subproject commit 15374e8a8ae5db6982e7d265ad088f790e38a3b8

2
schemes/orbital

@ -1 +1 @@
Subproject commit 0aa152f8cb863efd3d38c0d638a51cb871dcf568 Subproject commit c72f176b325ec164316a97d81bca525a2eb33cda