diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md index 8ab94b605..05b09f89d 100644 --- a/build_scripts/OSX/MacOS_X_InstallGuide.md +++ b/build_scripts/OSX/MacOS_X_InstallGuide.md @@ -8,7 +8,7 @@ Use default options. And add Qt Script support. Add to the PATH environment variable by editing your *~/.profile* file. - export PATH="/users/$USER/Qt/5.5/clang_64/bin:$PATH" + export PATH="/users/$USER/Qt/5.14.1/clang_64/bin:$PATH." Depends on which version of Qt you use. @@ -22,15 +22,15 @@ Start XCode to get it updated and to able C compiler to create executables. #### Install libraries - $sudo port -v selfupdate - $sudo port install openssl - $sudo port install miniupnpc - $sudo port install libmicrohttpd + $ sudo port -v selfupdate + $ sudo port install openssl + $ sudo port install miniupnpc + $ sudo port install libmicrohttpd For VOIP Plugin: - $sudo port install speex-devel - $sudo port install opencv + $ sudo port install speex-devel + $ sudo port install opencv Get Your OSX SDK if missing: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs) @@ -46,9 +46,11 @@ Start XCode to get it updated and to able C compiler to create executables. #### Install libraries - $brew install openssl - $brew install miniupnpc - $brew install libmicrohttpd + $ brew install openssl + $ brew install miniupnpc + $ brew install libmicrohttpd + $ brew install rapidjson + $ brew install sqlcipher If you have error in linking, run this: @@ -56,29 +58,52 @@ If you have error in linking, run this: For VOIP Plugin: - $brew install speex - $brew install speexdsp - $brew install homebrew/science/opencv - $brew install ffmpeg + $ brew install speex + $ brew install speexdsp + $ brew install homebrew/science/opencv + $ brew install ffmpeg Get Your OSX SDK if missing: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs) ## Last Settings -In QtCreator Option Git select "Pull" with "Rebase" +In QtCreator Option Git add this path: -## Compil missing libraries -### SQLCipher - - cd - git clone https://github.com/sqlcipher/sqlcipher.git - cd sqlcipher - ./configure --disable-shared --disable-tcl --enable-static --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC -I/opt/local/include" LDFLAGS="-lcrypto" - make - sudo make install + /usr/local/bin + +select "Pull" with "Rebase" + +## Set your Mac OS SDK version + +Edit RetroShare.pro + + CONFIG += c++14 rs_macos11.1 + +and then retroshare.pri + + macx:CONFIG *= rs_macos11.1 + rs_macos10.8:CONFIG -= rs_macos11.1 + rs_macos10.9:CONFIG -= rs_macos11.1 + rs_macos10.10:CONFIG -= rs_macos11.1 + rs_macos10.12:CONFIG -= rs_macos11.1 + rs_macos10.13:CONFIG -= rs_macos11.1 + rs_macos10.14:CONFIG -= rs_macos11.1 + rs_macos10.15:CONFIG -= rs_macos11.1 + + +## Link Include & Libraries + +Edit your retroshare.pri and add to macx-* section + + INCLUDEPATH += "/usr/local/opt/openssl/include" + QMAKE_LIBDIR += "/usr/local/opt/openssl/lib" + QMAKE_LIBDIR += "/usr/local/opt/sqlcipher/lib" + QMAKE_LIBDIR += "/usr/local/opt/miniupnpc/lib" + +alternative via Terminal + +$ qmake INCLUDEPATH+="/usr/local/opt/openssl/include" QMAKE_LIBDIR+="/usr/local/opt/openssl/lib" QMAKE_LIBDIR+="/usr/local/opt/sqlcipher/lib" QMAKE_LIBDIR+="/usr/local/opt/miniupnpc/lib" -NOTE, might be necessary to *chmod 000 /usr/local/ssl* temporarily during *./configure* if -homebrew uses newer, non-stock ssl dependencies found there. Configure might get confused. You can now compile RS into Qt Creator or with terminal @@ -89,4 +114,4 @@ You can now compile RS into Qt Creator or with terminal You can change Target and SDK in *./retroshare.pri:82* changing value of QMAKE_MACOSX_DEPLOYMENT_TARGET and QMAKE_MAC_SDK -You can find compiled application on *./retroshare/retroshare-gui/src/retroshare.app* +You can find the compiled application at *./retroshare/retroshare-gui/src/retroshare.app*