diff --git a/Cargo.lock b/Cargo.lock index d985d35..449d4d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -58,9 +58,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" [[package]] name = "bytemuck" @@ -689,6 +689,7 @@ version = "0.2.0" name = "zemeroth" version = "0.7.0-snapshot" dependencies = [ + "bumpalo", "derive_more", "env_logger", "heck", diff --git a/Cargo.toml b/Cargo.toml index 06898e0..c121ba4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,22 +14,34 @@ members = ["zcomponents", "zgui", "zscene"] [package.metadata.android] assets = "assets/" +res = "android_res" +icon = "@mipmap/ic_launcher" +build_targets = [ "armv7-linux-androideabi", "aarch64-linux-android", "i686-linux-android", "x86_64-linux-android" ] +version_code = 6 + +# android_version = 33 +target_sdk_version = 33 + +[package.metadata.android.activity_attributes] +"android:exported" = "true" +"android:screenOrientation" = "userLandscape" [dependencies] -ron = "0.8" +ron = "0.8.1" log = "0.4" env_logger = "0.10" derive_more = { version = "0.99", features = ["from"] } # TODO: https://github.com/ozkriff/zemeroth/issues/251 -serde = { version = "1.0", features = ["derive"] } +serde = { version = "1.0.197", features = ["derive"] } num = { version = "0.4", default-features = false } ui = { path = "zgui", package = "zgui" } zscene = { path = "zscene" } zcomponents = { path = "zcomponents" } -rand = { version = "0.8", default-features = false, features = ["alloc"] } -quad-rand = { version = "0.2", features = ["rand"] } -mq = { package = "macroquad", version = "0.4.0" } +rand = { version = "0.8.3", default-features = false, features = ["alloc"] } +quad-rand = { version = "0.2.1", features = ["rand"] } +mq = { package = "macroquad", version = "0.4.2" } heck = "0.4.1" once_cell = "1.6" +bumpalo = "=3.4.0" [dev-dependencies] pretty_assertions = "1.3" diff --git a/android_res/mipmap-hdpi/ic_launcher.png b/android_res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..7fc597f Binary files /dev/null and b/android_res/mipmap-hdpi/ic_launcher.png differ diff --git a/android_res/mipmap-mdpi/ic_launcher.png b/android_res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..f415b1e Binary files /dev/null and b/android_res/mipmap-mdpi/ic_launcher.png differ diff --git a/android_res/mipmap-xhdpi/ic_launcher.png b/android_res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..23e4b88 Binary files /dev/null and b/android_res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android_res/mipmap-xxhdpi/ic_launcher.png b/android_res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..f4569eb Binary files /dev/null and b/android_res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android_res/mipmap-xxxhdpi/ic_launcher.png b/android_res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..3a938f2 Binary files /dev/null and b/android_res/mipmap-xxxhdpi/ic_launcher.png differ