From 687fe39b6805e287676276e22c6af228c66374a6 Mon Sep 17 00:00:00 2001 From: Elijah Voigt Date: Wed, 22 May 2024 22:23:13 -0700 Subject: [PATCH 1/2] Fixup libs and linux build.sh --- .cargo/config.toml | 3 +-- build.sh | 5 +++++ lib/linux/libfmod.so.13 | 4 +--- lib/linux/libfmod.so.13.17 | 4 +--- lib/linux/libfmodstudio.so.13 | 4 +--- lib/linux/libfmodstudio.so.13.17 | 4 +--- lib/windows/fmod.dll | 3 --- lib/windows/fmod.lib | 3 --- lib/windows/fmodstudio.dll | 3 --- lib/windows/fmodstudio.lib | 3 --- 10 files changed, 10 insertions(+), 26 deletions(-) create mode 100755 build.sh mode change 100755 => 120000 lib/linux/libfmod.so.13 mode change 100755 => 120000 lib/linux/libfmod.so.13.17 mode change 100755 => 120000 lib/linux/libfmodstudio.so.13 mode change 100755 => 120000 lib/linux/libfmodstudio.so.13.17 delete mode 100644 lib/windows/fmod.dll delete mode 100644 lib/windows/fmod.lib delete mode 100644 lib/windows/fmodstudio.dll delete mode 100644 lib/windows/fmodstudio.lib diff --git a/.cargo/config.toml b/.cargo/config.toml index 9cfcbf3..387a86b 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -6,7 +6,6 @@ [target.x86_64-unknown-linux-gnu] linker = "clang" rustflags = [ - "-Clink-arg=-fuse-ld=lld", # Use LLD Linker "-Zshare-generics=y", # (Nightly) Make the current crate share its generic instantiations "-Zthreads=0", # (Nightly) Use improved multithreading with the recommended amount of threads. ] @@ -32,4 +31,4 @@ linker = "rust-lld.exe" # Use LLD Linker rustflags = [ "-Zshare-generics=n", "-Zthreads=0", # (Nightly) Use improved multithreading with the recommended amount of threads. -] \ No newline at end of file +] diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..18ff594 --- /dev/null +++ b/build.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +# cargo build --release + +tar -czvf martian-chess-linux-beta.tar.gz ./target/release/martian-chess ./lib ./assets diff --git a/lib/linux/libfmod.so.13 b/lib/linux/libfmod.so.13 deleted file mode 100755 index 99525a2..0000000 --- a/lib/linux/libfmod.so.13 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:907ea6c0ddfaace3724c799a485ebf48fba2acc8bf4fc1900beea52287aefba4 -size 1669144 diff --git a/lib/linux/libfmod.so.13 b/lib/linux/libfmod.so.13 new file mode 120000 index 0000000..3c20aed --- /dev/null +++ b/lib/linux/libfmod.so.13 @@ -0,0 +1 @@ +libfmod.so \ No newline at end of file diff --git a/lib/linux/libfmod.so.13.17 b/lib/linux/libfmod.so.13.17 deleted file mode 100755 index 99525a2..0000000 --- a/lib/linux/libfmod.so.13.17 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:907ea6c0ddfaace3724c799a485ebf48fba2acc8bf4fc1900beea52287aefba4 -size 1669144 diff --git a/lib/linux/libfmod.so.13.17 b/lib/linux/libfmod.so.13.17 new file mode 120000 index 0000000..3c20aed --- /dev/null +++ b/lib/linux/libfmod.so.13.17 @@ -0,0 +1 @@ +libfmod.so \ No newline at end of file diff --git a/lib/linux/libfmodstudio.so.13 b/lib/linux/libfmodstudio.so.13 deleted file mode 100755 index 3bf68b0..0000000 --- a/lib/linux/libfmodstudio.so.13 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fefec011e8ac6f62585758d44014349347f350fe60ddb3e3163e3e50ccecd6b6 -size 1545744 diff --git a/lib/linux/libfmodstudio.so.13 b/lib/linux/libfmodstudio.so.13 new file mode 120000 index 0000000..5b06996 --- /dev/null +++ b/lib/linux/libfmodstudio.so.13 @@ -0,0 +1 @@ +libfmodstudio.so \ No newline at end of file diff --git a/lib/linux/libfmodstudio.so.13.17 b/lib/linux/libfmodstudio.so.13.17 deleted file mode 100755 index 3bf68b0..0000000 --- a/lib/linux/libfmodstudio.so.13.17 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fefec011e8ac6f62585758d44014349347f350fe60ddb3e3163e3e50ccecd6b6 -size 1545744 diff --git a/lib/linux/libfmodstudio.so.13.17 b/lib/linux/libfmodstudio.so.13.17 new file mode 120000 index 0000000..5b06996 --- /dev/null +++ b/lib/linux/libfmodstudio.so.13.17 @@ -0,0 +1 @@ +libfmodstudio.so \ No newline at end of file diff --git a/lib/windows/fmod.dll b/lib/windows/fmod.dll deleted file mode 100644 index d6785b5..0000000 --- a/lib/windows/fmod.dll +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9df1a08b32e3d5caf3f081dee01d495694001d6fe51a4413a5d804c9e71ebb4 -size 1853440 diff --git a/lib/windows/fmod.lib b/lib/windows/fmod.lib deleted file mode 100644 index 7c4eb2a..0000000 --- a/lib/windows/fmod.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5abe3f87a8da0cbecccd072e5d451b91abbc45660f63cc3b1bfb1717901dc992 -size 348358 diff --git a/lib/windows/fmodstudio.dll b/lib/windows/fmodstudio.dll deleted file mode 100644 index 866a62e..0000000 --- a/lib/windows/fmodstudio.dll +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db4fc9c6bcc3ad9ccd39508ec82172315fb2fb725eebf5cabb3bfc6093193740 -size 1518080 diff --git a/lib/windows/fmodstudio.lib b/lib/windows/fmodstudio.lib deleted file mode 100644 index aa6c2d5..0000000 --- a/lib/windows/fmodstudio.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71cb4e2a2fca2725807a86a4c4f4b1660c1535c586ecdcd759f016732df75aff -size 161662 From 2c1cee0c9a08859fbbedc80ac85695f067046bfa Mon Sep 17 00:00:00 2001 From: Elijah Voigt Date: Wed, 22 May 2024 22:32:23 -0700 Subject: [PATCH 2/2] fixup more build related stuff! --- .gitignore | 1 + build.sh | 2 +- lib/windows/fmod.dll | 3 +++ lib/windows/fmod.lib | 3 +++ lib/windows/fmodstudio.dll | 3 +++ lib/windows/fmodstudio.lib | 3 +++ 6 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 lib/windows/fmod.dll create mode 100644 lib/windows/fmod.lib create mode 100644 lib/windows/fmodstudio.dll create mode 100644 lib/windows/fmodstudio.lib diff --git a/.gitignore b/.gitignore index e821648..25da8e0 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ trace-*.json temp/ *.zip +*.tar.gz diff --git a/build.sh b/build.sh index 18ff594..3a77c77 100755 --- a/build.sh +++ b/build.sh @@ -2,4 +2,4 @@ # cargo build --release -tar -czvf martian-chess-linux-beta.tar.gz ./target/release/martian-chess ./lib ./assets +tar -czvf martian-chess-linux-beta.tar.gz --exclude windows ./lib ./assets -C ./target/release martian-chess diff --git a/lib/windows/fmod.dll b/lib/windows/fmod.dll new file mode 100644 index 0000000..d6785b5 --- /dev/null +++ b/lib/windows/fmod.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9df1a08b32e3d5caf3f081dee01d495694001d6fe51a4413a5d804c9e71ebb4 +size 1853440 diff --git a/lib/windows/fmod.lib b/lib/windows/fmod.lib new file mode 100644 index 0000000..7c4eb2a --- /dev/null +++ b/lib/windows/fmod.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5abe3f87a8da0cbecccd072e5d451b91abbc45660f63cc3b1bfb1717901dc992 +size 348358 diff --git a/lib/windows/fmodstudio.dll b/lib/windows/fmodstudio.dll new file mode 100644 index 0000000..866a62e --- /dev/null +++ b/lib/windows/fmodstudio.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db4fc9c6bcc3ad9ccd39508ec82172315fb2fb725eebf5cabb3bfc6093193740 +size 1518080 diff --git a/lib/windows/fmodstudio.lib b/lib/windows/fmodstudio.lib new file mode 100644 index 0000000..aa6c2d5 --- /dev/null +++ b/lib/windows/fmodstudio.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71cb4e2a2fca2725807a86a4c4f4b1660c1535c586ecdcd759f016732df75aff +size 161662