diff --git a/.gitmodules b/.gitmodules index ab31772..7c83399 100644 --- a/.gitmodules +++ b/.gitmodules @@ -55,3 +55,6 @@ [submodule "libc-artifacts"] path = libc-artifacts url = https://github.com/redox-os/libc-artifacts.git +[submodule "programs/games"] + path = programs/games + url = https://github.com/redox-os/games.git diff --git a/Makefile b/Makefile index df0162a..f2a91ea 100644 --- a/Makefile +++ b/Makefile @@ -48,6 +48,7 @@ clean: cargo clean --manifest-path programs/binutils/Cargo.toml cargo clean --manifest-path programs/coreutils/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/orbutils/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/coreutils/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/orbutils/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/coreutils/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/orbutils/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 $@ 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 mkdir -p filesystem/bin $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ @@ -515,6 +523,13 @@ extrautils: \ filesystem/bin/rem \ #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: \ filesystem/bin/dhcpd \ filesystem/bin/dns \ @@ -561,6 +576,7 @@ build/filesystem.bin: \ drivers \ coreutils \ extrautils \ + games \ netutils \ orbutils \ pkgutils \ diff --git a/programs/games b/programs/games new file mode 160000 index 0000000..15374e8 --- /dev/null +++ b/programs/games @@ -0,0 +1 @@ +Subproject commit 15374e8a8ae5db6982e7d265ad088f790e38a3b8 diff --git a/schemes/orbital b/schemes/orbital index 0aa152f..c72f176 160000 --- a/schemes/orbital +++ b/schemes/orbital @@ -1 +1 @@ -Subproject commit 0aa152f8cb863efd3d38c0d638a51cb871dcf568 +Subproject commit c72f176b325ec164316a97d81bca525a2eb33cda