Minor bug fixes to library staging.

This commit is contained in:
casey langen 2022-02-12 21:30:33 -08:00
parent 5e7eda4fda
commit 6e3fe7fbc8
3 changed files with 6 additions and 2 deletions

View File

@ -54,8 +54,6 @@ else()
find_library(LIBCRYPTO NAMES crypto)
endif()
find_library(LIBSSL NAMES ssl PATHS ${VENDOR_LINK_DIRECTORIES})
find_library(LIBCRYPTO NAMES crypto PATHS ${VENDOR_LINK_DIRECTORIES})
find_library(LIBZ NAMES z)
set(musikcube_LINK_LIBS ${DEFAULT_OS_SYSTEM_LIBS} ${Boost_LIBRARIES} ${LIBCURL} ${LIBSSL} ${LIBCRYPTO} ${LIBZ})

View File

@ -38,6 +38,7 @@ printf "\n"
read -p ' clean and rebuild [y]? ' CLEAN
if [[ $CLEAN == 'n' || $CLEAN == 'N' ]]; then
printf "\n\n\n ***** SKIPPING REBUILD *****\n\n\n"
./script/stage-vendor-libraries.sh || exit $?
sleep 3
else
printf "\n\n\n ***** REBUILDING NOW *****\n\n\n"

View File

@ -35,6 +35,11 @@ if [[ "$PLATFORM" == 'Darwin' ]]; then
cp vendor/libmicrohttpd-bin/lib/libmicrohttpd.dylib ./bin/lib
cd bin/lib/
ln -s libcrypto.dylib libcrypto.1.1.dylib
ln -s libssl.dylib libssl.1.1.dylib
cd ../../
elif [[ "$PLATFORM" == 'Linux' ]]; then
echo "[stage-static-vendor-libraries] staging Linux .so files..."