Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-04-29 09:57:07 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-04-29 09:57:07 (GMT) |
| commit | 6af098245b58d484d9c86c1f832588455410750b (patch) | |
| tree | d134fdf0a0fb7115347b94f32f28acacfa31a443 | |
| parent | 195300fc8b42f5c54eee2359f497b9dc28c6d27d (diff) | |
| download | swift-6af098245b58d484d9c86c1f832588455410750b.zip swift-6af098245b58d484d9c86c1f832588455410750b.tar.bz2 | |
Improve README.md quick start section and parallel build text
Test-Information:
None.
Change-Id: I7725ec51a943fe298d25d0498e08f448f8b490fb
| -rw-r--r-- | README.md | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,6 +1,6 @@ # Swift - An elegant, secure, adaptable and intuitive XMPP Client ## Quick Start -Simply run `./scons Swift` on Linux/Mac or `scons.bat Swift` on Windows to build Swift. +Simply run `./scons Swift` on Linux, or `./scons Swift qt=/Users/username/Qt_installation_path/Qt/5.4.2/5.4/clang_64` on Mac OS X or `scons.bat Swift qt=C:\path\to\qt` on Windows to build Swift. This document only covers the general structure, project dependencies and building the Swift GUI application. More detailed information on building components, development, testing and packaging can be found in DEVELOPMENT.md. @@ -29,6 +29,7 @@ to easy development. Third party dependencies not included are listed below: * OpenSSL is required when building Swiften on Linux or Android * Qt 5 is required by Swift; **Qt up to version Qt 5.5 is supported** +* Python (2.5 <= version < 3) ## General Build Instructions The Swift projects use the SCons build system for build configuration and Build @@ -36,7 +37,7 @@ execution. SCons is one of the included third party dependencies. To build all Swift components simply run SCons. On Mac OS X and Linux you run the `./scons` command. On Windows you run the `scons.bat` command in a Visual Studio developer shell. -On multi-processor systems, i.e. most desktop and server machines, you can use the `-j NUMBER_OF_PARALLEL_TASKS` flag to speed up build time. +On multi-processor systems, i.e. most desktop and server machines, you can use the `-j NUMBER_OF_PARALLEL_TASKS` flag, or pass the `max_jobs=1` to the `scons` command to speed up build time. The `max_jobs=1` argument will set the number of parallel tasks to the number of CPU cores available. Note that each parallel task increases the memory requirements for the overall build process. ## Platform Specific Instructions ### Mac OS X |