Compare commits

...

3 commits

Author SHA1 Message Date
griffi-gh e243d1a179 add notice about cargo-apk to readme 2023-07-11 16:07:34 +02:00
griffi-gh 5a99d08f8e make some required changes 2023-07-11 15:49:45 +02:00
griffi-gh d00d7fad91 replace glium/glutin 2023-07-11 15:31:52 +02:00
4 changed files with 580 additions and 441 deletions

1002
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -70,6 +70,11 @@ cargo install cargo-apk
cargo target add aarch64-linux-android cargo target add aarch64-linux-android
``` ```
***wgpu branch**: latest git version of cargo-apk may be required!*
```bash
cargo install --git https://github.com/rust-mobile/cargo-apk cargo-apk
```
**Build:** **Build:**
`--no-default-features` is required for keyboard input!\ `--no-default-features` is required for keyboard input!\

View file

@ -5,13 +5,15 @@ edition = "2021"
publish = false publish = false
[lib] [lib]
name = "kubimain"
crate-type = ["lib", "cdylib"] crate-type = ["lib", "cdylib"]
[dependencies] [dependencies]
kubi-shared = { path = "../kubi-shared" } kubi-shared = { path = "../kubi-shared" }
kubi-logging = { path = "../kubi-logging" } kubi-logging = { path = "../kubi-logging" }
log = "0.4" log = "0.4"
glium = { git = "https://github.com/glium/glium", rev = "5d50e7" } wgpu = "0.16"
winit = { version = "0.28", features = ["android-native-activity"] }
glam = { version = "0.24", features = ["debug-glam-assert", "fast-math"] } glam = { version = "0.24", features = ["debug-glam-assert", "fast-math"] }
image = { version = "0.24", default_features = false, features = ["png"] } image = { version = "0.24", default_features = false, features = ["png"] }
strum = { version = "0.25", features = ["derive"] } strum = { version = "0.25", features = ["derive"] }
@ -25,13 +27,11 @@ gilrs = { version = "0.10", default_features = false, features = ["xinput"] }
uflow = "0.7" uflow = "0.7"
postcard = { version = "1.0", features = ["alloc"] } postcard = { version = "1.0", features = ["alloc"] }
lz4_flex = { version = "0.11", default-features = false, features = ["std"] } lz4_flex = { version = "0.11", default-features = false, features = ["std"] }
static_assertions = "1.1"
tinyset = "0.4" tinyset = "0.4"
serde_json = { version = "1.0", optional = true } #only used for `generate_visualizer_data` serde_json = { version = "1.0", optional = true } #only used for `generate_visualizer_data`
[target.'cfg(target_os = "android")'.dependencies] [target.'cfg(target_os = "android")'.dependencies]
ndk = "0.7" android-activity = { version = "0.4", features = ["native-activity"] }
ndk-glue = "0.7"
[target.'cfg(target_os = "windows")'.dependencies] [target.'cfg(target_os = "windows")'.dependencies]
winapi = "0.3" winapi = "0.3"
@ -42,7 +42,7 @@ raw-evt = [] #required for mouse input, but breaks keyboard on android
generate_visualizer_data = ["dep:serde_json", "shipyard/serde1"] generate_visualizer_data = ["dep:serde_json", "shipyard/serde1"]
safe_lz4 = ["lz4_flex/safe-encode", "lz4_flex/safe-decode"] safe_lz4 = ["lz4_flex/safe-encode", "lz4_flex/safe-decode"]
parallel = ["shipyard/parallel"] # causes some serious issues! parallel = ["shipyard/parallel"] # causes some serious issues!
nightly = ["hashbrown/nightly", "glam/core-simd", "static_assertions/nightly", "lz4_flex/nightly", "kubi-shared/nightly"] nightly = ["hashbrown/nightly", "glam/core-simd", "lz4_flex/nightly", "kubi-shared/nightly"]
#part of wip android support #part of wip android support
[package.metadata.android] [package.metadata.android]

View file

@ -1,8 +1,8 @@
#![cfg_attr( #![cfg_attr(
all(windows, not(debug_assertions)), all(windows, not(debug_assertions)),
windows_subsystem = "windows" windows_subsystem = "windows"
)] )]
fn main() { fn main() {
kubi::kubi_main(); kubimain::kubi_main()
} }