diff --git a/.cargo/config.toml b/.cargo/config.toml index e1a9801..6417e48 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,13 +1,5 @@ [target.x86_64-unknown-linux-gnu] rustflags = ["-Zshare-generics=y", "-Z", "threads=8"] -# [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"] +rustflags = ["-Zshare-generics=y", "-Z", "threads=8"] diff --git a/Cross.toml b/Cross.toml deleted file mode 100644 index 2079433..0000000 --- a/Cross.toml +++ /dev/null @@ -1,2 +0,0 @@ -[target.x86_64-unknown-linux-gnu] -dockerfile = "target/x86_64-unknown-linux-gnu/Dockerfile" diff --git a/assets/Ryfjallet_cubemap.png b/assets/Ryfjallet_cubemap.png deleted file mode 100644 index 9f1ae59..0000000 --- a/assets/Ryfjallet_cubemap.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4600bb26a92b642d227e0462fd45aa1cce1149190200d2e026b2fac6e83d585f -size 669336 diff --git a/shell.nix b/shell.nix index a6fc4c6..7d9e16f 100644 --- a/shell.nix +++ b/shell.nix @@ -7,7 +7,15 @@ mkShell rec { pkg-config ]; buildInputs = [ - rustup git-lfs clang udev alsa-lib vulkan-loader fmodex gcc gcc-unwrapped fmodex + alsa-lib # Audio + blender # Modeling + clang # C/C++ Compiler + gcc # Another C/C++ Compiler + gcc-unwrapped # GCC Libs + git-lfs # Git LFS + rustup # Rust + udev # Audio? + vulkan-loader # Rendering xorg.libXcursor xorg.libXi xorg.libXrandr # To use the x11 feature libxkbcommon wayland # To use the wayland feature ]; diff --git a/src/display3d.rs b/src/display3d.rs index b70c0c3..f1f060c 100644 --- a/src/display3d.rs +++ b/src/display3d.rs @@ -120,20 +120,6 @@ fn initialize(mut commands: Commands, board: Res, assets: Res