From 862de42e604f987e2866cead3f32ab6db38e8d66 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sat, 3 Jul 2021 03:15:55 -0700 Subject: [PATCH] tweaks to auxmos compile on linux --- dependencies.sh | 2 +- tools/build/build.sh | 2 +- tools/tgs4_scripts/PreCompile.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.sh b/dependencies.sh index bc7c499540..a86c58a5a2 100644 --- a/dependencies.sh +++ b/dependencies.sh @@ -11,7 +11,7 @@ export BYOND_MINOR=1536 export RUST_G_VERSION=0.4.8 #auxmos git tag -export AUXMOS_VERSION=0.2.0 +export AUXMOS_VERSION=v0.2.0 #node version export NODE_VERSION=12 diff --git a/tools/build/build.sh b/tools/build/build.sh index 9690ff068b..5d050764d1 100755 --- a/tools/build/build.sh +++ b/tools/build/build.sh @@ -58,7 +58,7 @@ fi #Compile and move auxmos binary to repo root echo "Deploying auxmos..." git checkout "$AUXMOS_VERSION" -env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo build --release --target=i686-unknown-linux-gnu +env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo rustc --release --target=i686-unknown-linux-gnu --features "all_reaction_hooks" -- -C target-cpu=native mv target/i686-unknown-linux-gnu/release/libauxmos.so ../../../../libauxmos.so cd ../.. diff --git a/tools/tgs4_scripts/PreCompile.sh b/tools/tgs4_scripts/PreCompile.sh index 0056042c87..7018b8f2e9 100755 --- a/tools/tgs4_scripts/PreCompile.sh +++ b/tools/tgs4_scripts/PreCompile.sh @@ -83,8 +83,8 @@ else fi echo "Deploying auxmos..." -git pull origin master -env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo build --release --target=i686-unknown-linux-gnu +git checkout "$AUXMOS_VERSION" +env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo rustc --release --target=i686-unknown-linux-gnu --features "all_reaction_hooks" -- -C target-cpu=native mv -f target/i686-unknown-linux-gnu/release/libauxmos.so "$1/libauxmos.so" cd ..