rename example and readme titles (#781)

This commit is contained in:
Carter Anderson 2020-11-03 12:00:47 -08:00 committed by GitHub
parent e21705bec6
commit 8d2d2426fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions

View file

@ -94,7 +94,7 @@ jobs:
- name: Install Cargo APK - name: Install Cargo APK
run: cargo install cargo-apk run: cargo install cargo-apk
- name: Build APK - name: Build APK
run: cargo apk build --example bevy_android run: cargo apk build --example android
clean: clean:
runs-on: ubuntu-latest runs-on: ubuntu-latest

View file

@ -321,8 +321,8 @@ path = "examples/wasm/assets_wasm.rs"
required-features = ["bevy_winit"] required-features = ["bevy_winit"]
[[example]] [[example]]
name = "bevy_android" name = "android"
path = "examples/android/bevy_android.rs" path = "examples/android/android.rs"
crate-type = ["cdylib"] crate-type = ["cdylib"]
[package.metadata.android] [package.metadata.android]

View file

@ -120,14 +120,14 @@ Example | File | Description
## WASM ## WASM
#### Pre-requirements #### Setup
```sh ```sh
rustup target add wasm32-unknown-unknown rustup target add wasm32-unknown-unknown
cargo install wasm-bindgen-cli cargo install wasm-bindgen-cli
``` ```
#### Build & run #### Build & Run
Following is an example for `headless_wasm`. For other examples in wasm/ directory, Following is an example for `headless_wasm`. For other examples in wasm/ directory,
change the `headless_wasm` in the following commands **and edit** `examples/wasm/index.html` change the `headless_wasm` in the following commands **and edit** `examples/wasm/index.html`
@ -146,14 +146,14 @@ basic-http-server examples/wasm
## iOS ## iOS
#### Pre-requirements #### Setup
```sh ```sh
rustup target add aarch64-apple-ios x86_64-apple-ios rustup target add aarch64-apple-ios x86_64-apple-ios
cargo install cargo-lipo cargo install cargo-lipo
``` ```
#### Build & run #### Build & Run
Using bash: Using bash:
@ -190,7 +190,7 @@ used for the `Makefile`.
## Android ## Android
#### Pre-requirements #### Setup
```sh ```sh
rustup target add aarch64-linux-android armv7-linux-androideabi rustup target add aarch64-linux-android armv7-linux-androideabi
@ -201,12 +201,12 @@ The Android SDK must be installed, and the environment variable `ANDROID_SDK_ROO
When using `NDK (Side by side)`, the environment variable `ANDROID_NDK_ROOT` must also be set to one of the NDKs in `sdk\ndk\[NDK number]`. When using `NDK (Side by side)`, the environment variable `ANDROID_NDK_ROOT` must also be set to one of the NDKs in `sdk\ndk\[NDK number]`.
#### Build & run #### Build & Run
To run on a device setup for Android development, run: To run on a device setup for Android development, run:
```sh ```sh
cargo apk run --example bevy_android cargo apk run --example android
``` ```
:warning: At this time Bevy does not work in Android Emulator. :warning: At this time Bevy does not work in Android Emulator.

View file

@ -3,7 +3,7 @@ include!("../3d/3d_scene.rs");
#[cfg_attr( #[cfg_attr(
target_os = "android", target_os = "android",
ndk_glue::main(logger(level = "trace", tag = "bevy_android"), backtrace = "full") ndk_glue::main(logger(level = "trace", tag = "android"), backtrace = "full")
)] )]
pub fn android_main() { pub fn android_main() {
main(); main();