From 362ec5f4f982e27eb148410e63194368f29a3c85 Mon Sep 17 00:00:00 2001 From: BodgeMaster <> Date: Fri, 15 Jul 2022 13:43:01 +0200 Subject: [PATCH] Build system: symlink dependency libs to bin/lib --- scripts/build.sh | 2 +- scripts/clean.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index b606780..93a9cb8 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -73,7 +73,7 @@ mkdir -pv bin/tools # add compile commands to this array COMPILE_COMMANDS=( "$CXX_WITH_FLAGS src/tools/dumpnbt.cpp -Lbin/lib -l:nbt.so -o bin/tools/dumpnbt" - "$CXX_WITH_FLAGS src/tools/hexnet.cpp -Ldependencies/sockpp-0.7.1/build -l:libsockpp.so -Idependencies/sockpp-0.7.1/include -o bin/tools/hexnet" + "$CXX_WITH_FLAGS src/tools/hexnet.cpp -Lbin/lib -l:cli.so -l:libsockpp.so -Idependencies/sockpp-0.7.1/include -o bin/tools/hexnet" ) for command in ${!COMPILE_COMMANDS[@]}; do echo "${COMPILE_COMMANDS[command]}" diff --git a/scripts/clean.sh b/scripts/clean.sh index 4aa184c..f8aa224 100755 --- a/scripts/clean.sh +++ b/scripts/clean.sh @@ -19,5 +19,11 @@ rm -rv ./bin rm -vf .endianness rm -vf resources/check_endianness mkdir -v ./bin +mkdir -v ./bin/lib + +ln -vs ../../dependencies/sockpp-0.7.1/build/libsockpp.so bin/lib/ +ln -vs ../../dependencies/sockpp-0.7.1/build/libsockpp.so.0 bin/lib/ +ln -vs ../../dependencies/sockpp-0.7.1/build/libsockpp.so.0.7.1 bin/lib/ + set -v echo -n "" > ./bin/.placeholder