summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2012-03-28 05:48:40 -0500
committerMarius Storm-Olsen <marius.storm-olsen@nokia.com>2012-03-28 05:48:40 -0500
commitc5e269cc9f3611dc59d793ea0dfd8dd2d1255abe (patch)
tree5a59b1a6b195bff4bf5948600c5d32e21e76372e
parente0128ca3763cd3743c39a36b7029065f56e393fc (diff)
Fix readme to instruct building with the build script instead
Also, on Windows the build script adds the gnuwin32\bin directory, so we don't need that part in the readme Change-Id: I36ac9ebef9ce8b74fa75f63be7243bb334512a32
-rw-r--r--README11
1 files changed, 8 insertions, 3 deletions
diff --git a/README b/README
index 9cac8bd3..5ad781ee 100644
--- a/README
+++ b/README
@@ -31,7 +31,7 @@ HOW TO BUILD QT5
cd <path>/qt-everywhere-opensource-src-<version>
export PATH=$PATH:$PWD/qtbase/bin
./configure -prefix $PWD/qtbase -opensource -nomake tests
- make -j4
+ ./build -j4
Windows:
--------
@@ -41,13 +41,18 @@ HOW TO BUILD QT5
path.
cd <path>\qt-everywhere-opensource-src-<version>
- set PATH=%PATH%;%CD%\qtbase\bin;%CD%\gnuwin32\bin
+ set PATH=%PATH%;%CD%\qtbase\bin;
configure -prefix %CD%\qtbase -opensource -nomake tests
- nmake
+ perl build
For MinGW (gcc version 4.6 or later), ensure that the compiler can
be found in the path.
+ The build script will use jom if it's found in the path, which means you can
+ use -j <n> options on Windows as well. If not, the /MP option is added to the
+ compile options of the Microsoft Visual Studio compiler, to use all available
+ cores for batch building.
+
More details follow.
Building QtWebKit