summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2016-02-03 22:16:49 (GMT)
committerNico Weber <nicolasweber@gmx.de>2016-02-03 22:16:49 (GMT)
commit8028e91a9dc90b51b4da7ded70cc38234ed62451 (patch)
treec0f5a6401646f5211a65b4c0ff0f585f548a4f03 /doc
parentca5fc795f38c77e42657e9d276f1dfc5127a8243 (diff)
parent17852dae5bd7f63fdaa091db5e3284e87c56ef99 (diff)
downloadNinja-8028e91a9dc90b51b4da7ded70cc38234ed62451.zip
Ninja-8028e91a9dc90b51b4da7ded70cc38234ed62451.tar.gz
Ninja-8028e91a9dc90b51b4da7ded70cc38234ed62451.tar.bz2
Merge pull request #1100 from nico/doc
Minor updates to the manual.
Diffstat (limited to 'doc')
-rw-r--r--doc/manual.asciidoc14
1 files changed, 5 insertions, 9 deletions
diff --git a/doc/manual.asciidoc b/doc/manual.asciidoc
index 4e73df3..0d842f9 100644
--- a/doc/manual.asciidoc
+++ b/doc/manual.asciidoc
@@ -158,17 +158,13 @@ http://code.google.com/p/gyp/[gyp]:: The meta-build system used to
generate build files for Google Chrome and related projects (v8,
node.js). gyp can generate Ninja files for all platforms supported by
Chrome. See the
-http://code.google.com/p/chromium/wiki/NinjaBuild[Chromium Ninja
-documentation for more details].
+https://chromium.googlesource.com/chromium/src/+/master/docs/ninja_build.md[Chromium Ninja documentation for more details].
-http://www.cmake.org/[CMake]:: A widely used meta-build system that
-can generate Ninja files on Linux as of CMake version 2.8.8. (There
-is some Mac and Windows support -- http://www.reactos.org[ReactOS]
-uses Ninja on Windows for their buildbots, but those platforms are not
-yet officially supported by CMake as the full test suite doesn't
-pass.)
+https://cmake.org/[CMake]:: A widely used meta-build system that
+can generate Ninja files on Linux as of CMake version 2.8.8. Newer versions
+of CMake support generating Ninja files on Windows and Mac OS X too.
-others:: Ninja ought to fit perfectly into other meta-build software
+https://github.com/ninja-build/ninja/wiki/List-of-generators-producing-ninja-build-files[others]:: Ninja ought to fit perfectly into other meta-build software
like http://industriousone.com/premake[premake]. If you do this work,
please let us know!