diff --git a/.gitignore b/.gitignore index 62c662d..46bf68e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ target Cargo.lock -.DS_Store diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4697a97..0000000 --- a/.travis.yml +++ /dev/null @@ -1,29 +0,0 @@ -language: rust - -rust: - - nightly-2018-08-18 - -install: - - set -eo pipefail - - pushd /tmp - - # Install DevkitARM - - export DEVKITPRO="/opt/devkitpro" - - export DEVKITARM="$DEVKITPRO/devkitARM" - - export PATH="$PATH:$DEVKITARM/bin" - - wget https://github.com/devkitPro/pacman/releases/download/v1.0.0/devkitpro-pacman.deb - - sudo dpkg -i devkitpro-pacman.deb - - sudo dkp-pacman -S --noconfirm devkitARM libctru - - # Install Xargo - - cargo install xargo - - # Install Rust source - - rustup component add rust-src - - popd - -script: - - cd examples - - export CC_3ds="arm-none-eabi-gcc" - - export TARGET_CFLAGS="-mfloat-abi=hard -march=armv6k" - - RUST_TARGET_PATH=$(pwd) xargo build --release diff --git a/README.md b/README.md index 18a7aeb..96ceecb 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,11 @@ A Rust wrapper library for smealum's [ctrulib](https://github.com/smealum/ctrulib). -See the [3DS project template](https://github.com/rust3ds/rust3ds-template) for instructions on how to use this library. - ## Structure This repository is organized as follows: * `ctru-rs`: Safe, idiomatic wrapper around `ctru-sys`. * `ctru-sys`: Low-level, unsafe bindings to ctrulib -* `ctr-std`: A partial implementation of the Rust standard library for the 3DS. ## License diff --git a/ctru-rs/Cargo.toml b/ctru-rs/Cargo.toml index 4d395a1..341a059 100644 --- a/ctru-rs/Cargo.toml +++ b/ctru-rs/Cargo.toml @@ -11,8 +11,8 @@ name = "ctru" [dependencies] ctru-sys = { path = "../ctru-sys", version = "0.4" } -linker-fix-3ds = { git = "https://github.com/AzureMarker/rust-linker-fix-3ds.git" } -pthread-3ds = { git = "https://github.com/AzureMarker/pthread-3ds.git" } -libc = "0.2" +linker-fix-3ds = { git = "https://github.com/Meziu/rust-linker-fix-3ds.git" } +pthread-3ds = { git = "https://github.com/Meziu/pthread-3ds.git" } +libc = { git = "https://github.com/Meziu/libc.git" } bitflags = "1.0.0" widestring = "0.2.2" diff --git a/ctru-rs/README.md b/ctru-rs/README.md deleted file mode 100644 index 215b574..0000000 --- a/ctru-rs/README.md +++ /dev/null @@ -1,44 +0,0 @@ -# ctru-rs - -A Rust wrapper library for smealum's -[ctrulib](https://github.com/smealum/ctrulib). - -See the [3DS project template](https://github.com/rust3ds/rust3ds-template) for instructions on how to use this library. - -## Structure - -This library is meant to expose 3DS-specific functionality. Common functionality is implemented in `ctr-std` when possible. - -## Contributing - -PR's are welcome. Organization of rust specific features and wrapper functionality are still being decided on. - -## License - -Copyright (C) Rust 3DS Project authors, 2015-2016 - -See AUTHORS.md. - -As with the original ctrulib, this library is licensed under zlib. This -applies to every file in the tree, unless otherwise noted. - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any - damages arising from the use of this software. - - Permission is granted to anyone to use this software for any - purpose, including commercial applications, and to alter it and - redistribute it freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you - must not claim that you wrote the original software. If you use - this software in a product, an acknowledgment in the product - documentation would be appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and - must not be misrepresented as being the original software. - 3. This notice may not be removed or altered from any source - distribution. - -Rust is primarily distributed under the terms of both the MIT license and the Apache License (Version 2.0), with portions covered by various BSD-like licenses. - -See [LICENSE-APACHE](https://github.com/rust-lang/rust/blob/master/LICENSE-APACHE), [LICENSE-MIT](https://github.com/rust-lang/rust/blob/master/LICENSE-MIT), and [COPYRIGHT](https://github.com/rust-lang/rust/blob/master/COPYRIGHT) for details.