diff --git a/5.6.2/compile_mac.sh b/5.6.2/compile_mac.sh index 7a26cac..1b68688 100644 --- a/5.6.2/compile_mac.sh +++ b/5.6.2/compile_mac.sh @@ -3,7 +3,38 @@ export PATH=$PATH:/usr/local/Qt-5.6.2/bin cd qtbase -./configure -opensource -no-openssl -no-securetransport -nomake examples -nomake tests + +if [[ $1 == openssl ]]; then + + # download openssl + curl -O https://www.openssl.org/source/old/1.0.2/openssl-1.0.2l.tar.gz + tar -xvzf openssl-1.0.2l.tar.gz + + # compile openssl + cd openssl-1.0.2l + ./Configure darwin64-x86_64-cc --prefix=$PWD/dist + make + # print arch info (optional) + lipo -info libssl.a + lipo -info libcrypto.a + make install + cd .. + + # continue + + OPENSSL_LIBS='-L$PWD/openssl-1.0.2l/dist/lib -lssl -lcrypto' ./configure -opensource -confirm-license -no-securetransport -nomake examples -nomake tests -openssl-linked -I $PWD/openssl-1.0.2l/dist/include -L $PWD/openssl-1.0.2l/dist/lib + +elif [[ $1 == securetransport ]]; then + + ./configure -opensource -confirm-license -nomake examples -nomake tests -no-openssl -securetransport + +else + + echo "Error: please specify which SSL layer to use (openssl or securetransport)" + exit 1 + +fi + make echo 12345 | sudo -S sudo make install diff --git a/_compile_openssl/compile.txt b/_compile_openssl/compile.txt deleted file mode 100644 index b4d23ed..0000000 --- a/_compile_openssl/compile.txt +++ /dev/null @@ -1,29 +0,0 @@ -Debug: - -perl Configure debug-VC-WIN32 no-asm -ms\do_ms -nmake -f ms\nt.mak -nmake -f ms\nt.mak install - -Release: - -perl Configure VC-WIN32 no-asm -ms\do_ms -nmake -f ms\nt.mak -nmake -f ms\nt.mak install - -x64: - -Debug: - -perl Configure debug-VC-WIN64A -ms\do_win64a -nmake -f ms\nt.mak -nmake -f ms\nt.mak install - -Release: - -perl Configure VC-WIN64A -ms\do_win64a -nmake -f ms\nt.mak -nmake -f ms\nt.mak install \ No newline at end of file diff --git a/_compile_openssl/openssl-1.0.2l.tar.gz b/_compile_openssl/openssl-1.0.2l.tar.gz deleted file mode 100644 index 72be295..0000000 Binary files a/_compile_openssl/openssl-1.0.2l.tar.gz and /dev/null differ