Merge branch 'main' of https://gitea.elijah.run/pop/martian-chess into selection-refactor

.cargo/config.toml

@@ -1,32 +1,13 @@
-# Add the contents of this file to `config.toml` to enable "fast build" configuration. Please read the notes below.
-
-# NOTE: For maximum performance, build using a nightly compiler
-# If you are using rust stable, remove the "-Zshare-generics=y" below.
-
 [target.x86_64-unknown-linux-gnu]
-linker = "clang"
-rustflags = [
-  "-Zshare-generics=y",      # (Nightly) Make the current crate share its generic instantiations
-  "-Zthreads=0",             # (Nightly) Use improved multithreading with the recommended amount of threads.
-]
-
-# NOTE: you must install [Mach-O LLD Port](https://lld.llvm.org/MachO/index.html) on mac. you can easily do this by installing llvm which includes lld with the "brew" package manager:
-# `brew install llvm`
-[target.x86_64-apple-darwin]
-rustflags = [
-  "-Zshare-generics=y",                                   # (Nightly) Make the current crate share its generic instantiations
-  "-Zthreads=0",                                          # (Nightly) Use improved multithreading with the recommended amount of threads.
-]
-
-[target.aarch64-apple-darwin]
-rustflags = [
-  "-Zshare-generics=y",                                      # (Nightly) Make the current crate share its generic instantiations
-  "-Zthreads=0",                                             # (Nightly) Use improved multithreading with the recommended amount of threads.
-]
-
-[target.x86_64-pc-windows-msvc]
-linker = "rust-lld.exe" # Use LLD Linker
-rustflags = [
-  "-Zshare-generics=n",
-  "-Zthreads=0",        # (Nightly) Use improved multithreading with the recommended amount of threads.
-]
+rustflags = ["-Zshare-generics=y"]
+
+# [target.x86_64-apple-darwin]
+# rustflags = [
+#   "-C",
+#   "link-arg=-fuse-ld=/usr/local/bin/zld",
+#   "-Zshare-generics=y",
+#   "-Zrun-dsymutil=no",
+# ]
+
+[target.x86_64-pc-windows-gnu]
+rustflags = ["-Zshare-generics=y"]

.gitattributes

@@ -1,3 +1,5 @@
+fmodstudio/linux filter=lfs diff=lfs merge=lfs -text
+fmodstudio/windows filter=lfs diff=lfs merge=lfs -text
 assets/ filter=lfs diff=lfs merge=lfs -text
 *.so filter=lfs diff=lfs merge=lfs -text
 *.so.* filter=lfs diff=lfs merge=lfs -text
@@ -15,6 +17,3 @@ assets/ filter=lfs diff=lfs merge=lfs -text
 *.dll filter=lfs diff=lfs merge=lfs -text
 *.lib filter=lfs diff=lfs merge=lfs -text
 *.gltf filter=lfs diff=lfs merge=lfs -text
-*.mp4 filter=lfs diff=lfs merge=lfs -text
-*.dylib filter=lfs diff=lfs merge=lfs -text
-*.dylib filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -10,40 +10,8 @@
 **/.user/
 **/.unsaved/
 **/*.fspackage
+**/Build/
 !*.bank
 
 # Windows files
 **/*.ini
-
-trace-*.json
-
-*.blend
-*.blend1
-
-# Don't need this
-.vscode/
-
-*.tracy
-
-temp/
-
-# MacOS .package/.dmg related files
-.DS_Store
-*.dmg
-!platforms/macos/Martian\ Chess.app/Contents/Info.plist
-platforms/macos
-icon_*.png
-*.iconset
-*.icns
-
-# Linux AppImage related build files
-platforms/linux
-AppRun
-*.AppImage
-*.zip
-*.tar.gz
-.DirIcon
-
-# Windows build files
-platforms/windows
-*.exe

Cargo.toml

@@ -1,34 +1,9 @@
 [package]
 name = "martian-chess"
-description = "Martian Chess videogame"
 version = "0.1.0"
 edition = "2021"
 build = "build.rs"
 
 [dependencies]
-bevy_fmod = { git = "https://github.com/Salzian/bevy_fmod.git", branch = "main" }
-bevy = { version = "0.13", features = ["jpeg", "hdr", "serialize"] }
-serde = "1"
-toml = { version = "0.8", features = ["parse"] }
-anyhow = "*"
-thiserror = "*"
-winit = "*"
-image = "*"
-gltf = "*"
-
-[features]
-trace = ["bevy/trace_tracy", "bevy/trace_tracy_memory"]
-debug = ["bevy/dynamic_linking", "bevy/file_watcher", "bevy_fmod/live-update"]
-
-[profile.dev]
-debug = 1
-
-[profile.dev.package."*"]
-opt-level = 3
-
-[profile.release]
-opt-level = "z"
-strip = true
-panic = "abort"
-lto = true
-codegen-units = 1
+bevy_fmod = { version = "0.3", features = ["live-update"] }
+bevy = { version = "0.11", features = ["jpeg", "hdr"] }

Cross.toml

@@ -0,0 +1,2 @@
+[target.x86_64-unknown-linux-gnu]
+dockerfile = "target/x86_64-unknown-linux-gnu/Dockerfile"