mirror of
https://github.com/clangen/musikcube.git
synced 2024-10-01 20:42:13 +00:00
Minor bug fixes to library staging.
This commit is contained in:
parent
5e7eda4fda
commit
6e3fe7fbc8
@ -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})
|
||||
|
@ -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"
|
||||
|
@ -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..."
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user