From 0cdc957a6b9a6bd7e2b13a4c574419a5e5567706 Mon Sep 17 00:00:00 2001 From: AzureMarker Date: Tue, 4 Jan 2022 21:36:07 -0800 Subject: [PATCH] Move examples to ctru-rs/examples and delete old Xargo related files --- .../src/bin => ctru-rs/examples}/buttons.rs | 0 .../examples}/hello-both-screens.rs | 0 .../bin => ctru-rs/examples}/hello-world.rs | 0 .../examples}/software-keyboard.rs | 0 examples/.cargo/config | 18 ------------------ examples/3ds.json | 19 ------------------- examples/Cargo.toml | 11 ----------- examples/Xargo.toml | 7 ------- 8 files changed, 55 deletions(-) rename {examples/src/bin => ctru-rs/examples}/buttons.rs (100%) rename {examples/src/bin => ctru-rs/examples}/hello-both-screens.rs (100%) rename {examples/src/bin => ctru-rs/examples}/hello-world.rs (100%) rename {examples/src/bin => ctru-rs/examples}/software-keyboard.rs (100%) delete mode 100644 examples/.cargo/config delete mode 100644 examples/3ds.json delete mode 100644 examples/Cargo.toml delete mode 100644 examples/Xargo.toml diff --git a/examples/src/bin/buttons.rs b/ctru-rs/examples/buttons.rs similarity index 100% rename from examples/src/bin/buttons.rs rename to ctru-rs/examples/buttons.rs diff --git a/examples/src/bin/hello-both-screens.rs b/ctru-rs/examples/hello-both-screens.rs similarity index 100% rename from examples/src/bin/hello-both-screens.rs rename to ctru-rs/examples/hello-both-screens.rs diff --git a/examples/src/bin/hello-world.rs b/ctru-rs/examples/hello-world.rs similarity index 100% rename from examples/src/bin/hello-world.rs rename to ctru-rs/examples/hello-world.rs diff --git a/examples/src/bin/software-keyboard.rs b/ctru-rs/examples/software-keyboard.rs similarity index 100% rename from examples/src/bin/software-keyboard.rs rename to ctru-rs/examples/software-keyboard.rs diff --git a/examples/.cargo/config b/examples/.cargo/config deleted file mode 100644 index a81612c..0000000 --- a/examples/.cargo/config +++ /dev/null @@ -1,18 +0,0 @@ -[build] -target = "3ds" - -[target.3ds] -linker = "arm-none-eabi-gcc" -rustflags = [ - "-Clink-arg=-specs=3dsx.specs", - "-Clink-arg=-mfloat-abi=hard", - "-Clink-arg=-march=armv6k", - "-Clink-arg=-mtune=mpcore", - "-Clink-arg=-mfpu=vfp", - "-Clink-arg=-mtp=soft", - "-Clink-arg=-z", - "-Clink-arg=muldefs", - "-Clink-arg=-lgcc", - "-Clink-arg=-lsysbase", - "-Clink-arg=-lc" -] diff --git a/examples/3ds.json b/examples/3ds.json deleted file mode 100644 index ae5309e..0000000 --- a/examples/3ds.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "data-layout": "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", - "llvm-target": "arm-none-eabihf", - "linker": "arm-none-eabi-gcc", - "ar": "arm-none-eabi-ar", - "target-endian": "little", - "target-pointer-width": "32", - "target-c-int-width": "32", - "target-family": "unix", - "arch": "arm", - "os": "horizon", - "env": "newlib", - "cpu": "mpcore", - "features": "+vfp2", - "relocation-model": "static", - "executables": true, - "exe-suffix": ".elf", - "linker-flavor": "gcc" -} diff --git a/examples/Cargo.toml b/examples/Cargo.toml deleted file mode 100644 index 4ced567..0000000 --- a/examples/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "examples" -version = "0.1.0" - -[dependencies] -ctru-rs = { path = "../ctru-rs" } - -[profile.dev] - -[profile.release] -lto = true diff --git a/examples/Xargo.toml b/examples/Xargo.toml deleted file mode 100644 index 5ef83cf..0000000 --- a/examples/Xargo.toml +++ /dev/null @@ -1,7 +0,0 @@ -[dependencies.alloc] -[dependencies.panic_abort] -[dependencies.panic_unwind] - -[dependencies.std] -path = "../ctr-std" -stage = 1