From 4fe3c955a36a5657cd5839e977a06d98d46a9d28 Mon Sep 17 00:00:00 2001 From: defnax Date: Fri, 2 Apr 2021 23:00:10 +0200 Subject: [PATCH 1/2] Update MacOS_X_InstallGuide.md --- build_scripts/OSX/MacOS_X_InstallGuide.md | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md index fca911faf..13f3e4d73 100644 --- a/build_scripts/OSX/MacOS_X_InstallGuide.md +++ b/build_scripts/OSX/MacOS_X_InstallGuide.md @@ -12,6 +12,24 @@ Add to the PATH environment variable by editing your *~/.profile* file. Depends on which version of Qt you use. +## Get RetroShare + +In Qt Creator Projects -> New -> Import Project -> Git Clone -> Choose +Add Repository and Continoue + + Repository: https://github.com/RetroShare/RetroShare.git + +via Terminal: + + cd + git clone https://github.com/RetroShare/RetroShare.git retroshare + +via GitHub Desktop: [GitHub Desktop Download](https://central.github.com/deployments/desktop/desktop/latest/darwin) + +In GitHub Desktop -> Clone Repository -> URL + + Add Repository URL: https://github.com/RetroShare/RetroShare.git and Clone + ## ***Choose if you use MacPort or HomeBrew*** ### MacPort Installation @@ -139,8 +157,6 @@ For building RetroShare with plugins: You can now compile RetroShare into Qt Creator or with Terminal - cd - git clone https://github.com/RetroShare/RetroShare.git retroshare cd retroshare qmake; make From 7702ad69f30ac00589067a92eb126d61c3cfc554 Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 3 Apr 2021 11:24:49 +0200 Subject: [PATCH 2/2] Update MacOS_X_InstallGuide.md --- build_scripts/OSX/MacOS_X_InstallGuide.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md index 13f3e4d73..6dafd63c0 100644 --- a/build_scripts/OSX/MacOS_X_InstallGuide.md +++ b/build_scripts/OSX/MacOS_X_InstallGuide.md @@ -90,13 +90,15 @@ Get Your OSX SDK if missing: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SD ## Last Settings -In QtCreator Option Git add this path: +In QtCreator Projects -> Manage Kits > Version Control > Git: + + select "Pull with rebase" + +In QtCreator Projects -> Build -> Build Settings -> Build Environment -> Add this path: /usr/local/bin -select "Pull" with "Rebase" - -In QtCreator Projects -> Build Settings -> Build Steps -> Add Additional arguments: +In QtCreator Projects -> Build -> Build Settings -> Build Steps -> Add Additional arguments: "CONFIG+=rs_autologin" "CONFIG+=rs_use_native_dialogs"