Merge pull request #565 from G10h4ck/master

Add some documentation for QML app and link android readme in main README
This commit is contained in:
Cyril Soler 2016-11-14 09:56:05 +01:00 committed by GitHub
commit 5fd11eb2a8
2 changed files with 9 additions and 0 deletions

View File

@ -18,6 +18,10 @@ Compilation on MacOSX
----------------------------
Follow this file : [MacOS_X_InstallGuide](https://github.com/RetroShare/RetroShare/blob/master/MacOS_X_InstallGuide.md)
Compilation for Android
---------------------------
Follow this file : [README-Android](https://github.com/RetroShare/RetroShare/blob/master/README-Android.asciidoc)
Compilation on Linux
----------------------------

View File

@ -18,6 +18,11 @@ no_retroshare_plugins:CONFIG -= retroshare_plugins
CONFIG *= no_retroshare_android_service
retroshare_android_service:CONFIG -= no_retroshare_android_service
# To enable RetroShare-QML-app append the following assignation to
# qmake command line "CONFIG+=retroshare_qml_app"
CONFIG *= no_retroshare_qml_app
retroshare_qml_app:CONFIG -= no_retroshare_qml_app
# To enable libresapi via local socket (unix domain socket or windows named
# pipes) append the following assignation to qmake command line
#"CONFIG+=libresapilocalserver"