summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2015-07-22 14:02:56 -0400
committerBernard Normier <bernard@zeroc.com>2015-07-22 14:02:56 -0400
commite9a166932bbc521c608361dd7e78a955ea1f9c54 (patch)
treea146ddf706a905520e5102da0609c2cad3e83e72 /cpp
parentICE-6645 Fixed issue in Slice compilers with param/member names hiding type d... (diff)
downloadice-e9a166932bbc521c608361dd7e78a955ea1f9c54.tar.bz2
ice-e9a166932bbc521c608361dd7e78a955ea1f9c54.tar.xz
ice-e9a166932bbc521c608361dd7e78a955ea1f9c54.zip
Simplified text
Diffstat (limited to 'cpp')
-rw-r--r--cpp/BuildInstructionsWindows.md25
1 files changed, 15 insertions, 10 deletions
diff --git a/cpp/BuildInstructionsWindows.md b/cpp/BuildInstructionsWindows.md
index 5c0c0f5745b..be842e46fa7 100644
--- a/cpp/BuildInstructionsWindows.md
+++ b/cpp/BuildInstructionsWindows.md
@@ -1,10 +1,11 @@
-# Building Ice for C++ for Windows Applications
+# Building Ice for C++ on Windows
-This file describes the Ice source distribution, including information about
-compiler requirements, third-party dependencies, and instructions for building
-and testing the distribution. If you prefer, you can download a [Windows
-installer][1] that contains pre-compiled debug and release libraries,
-executables, and everything else necessary to build Ice applications on Windows.
+This file describes how to build Ice for C++ from sources on Windows, and how
+to test the resulting build.
+
+ZeroC provides [Ice binary distributions][1] for various platforms and compilers,
+including Windows and Visual Studio, so building Ice from sources is usually
+unnecessary.
## Build Requirements
@@ -22,9 +23,11 @@ Ice has dependencies on a number of third-party libraries:
- [Berkeley DB][5] 5.3
- [mcpp][6] 2.7.2 (with patches)
-You do not need to build these packages yourself, as ZeroC supplies a separate
-[Windows installer][7] that contains release and debug libraries for all of the
-third-party dependencies.
+You do not need to build these packages yourself, as ZeroC supplies an
+[Ice Third Party installer][7] with everything you need to build Ice from sources.
+
+If you wish to build these third-party packages from sources, please follow our
+[build instructions][8].
### Monotonic Clock
@@ -89,10 +92,12 @@ After a successful source build, you can run the tests as follows:
If everything worked out, you should see lots of `ok` messages. In case of a
failure, the tests abort with `failed`.
-[1]: https://doc.zeroc.com/display/Ice36/Using+the+Windows+Binary+Distribution
+[1]: https://zeroc.com/download.html
[2]: https://doc.zeroc.com/display/Ice36/Supported+Platforms+for+Ice+3.6.0
[3]: http://expat.sourceforge.net
[4]: http://bzip.org
[5]: http://www.oracle.com/us/products/database/berkeley-db/overview/index.htm
[6]: https://github.com/zeroc-ice/mcpp
[7]: https://zeroc.com/download/Ice/3.6/Ice-3.6.0-ThirdParty.msi
+[8]: https://doc.zeroc.com/display/Ice36/Building+Third+Party+Packages+from+Source
+