Mercurial > hg > orthanc
changeset 11:09f1eceaccec
merge
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 20 Jul 2012 11:46:52 +0200 |
parents | e67a4e1996c1 (diff) 27e2bbc11200 (current diff) |
children | c38716a8a146 |
files | |
diffstat | 3 files changed, 52 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/INSTALL Fri Jul 20 11:45:05 2012 +0200 +++ b/INSTALL Fri Jul 20 11:46:52 2012 +0200 @@ -5,11 +5,21 @@ Dependencies ------------ -Palantir uses CMake (http://www.cmake.org/) to automate its building -process. You thus have to download and install CMake first. +1) CMake: Palantir uses CMake (http://www.cmake.org/) to automate its + building process. + +2) Python: Some code is autogenerated through Python + (http://www.python.org/). -For the native build under Windows, you will also need to download and -install 7-Zip (http://www.7-zip.org/). +3) Mercurial: To use the cutting edge code, a Mercurial client must be + installed (http://mercurial.selenic.com/). We recommand TortoiseHg. + +W) 7-Zip: For the native build under Windows, the 7-Zip tool is used + to uncompress the third-party packages (http://www.7-zip.org/). + +You thus have to download and install CMake, Python, Mercurial and +possibly 7-Zip first. The path to their executable must be in the +"PATH" environment variable. The other third party dependencies are automatically downloaded by the CMake scripts. The downloaded packages are stored in the @@ -71,9 +81,25 @@ -Native Windows build with MinGW +Native Windows build with MinGW (VERY SLOW) ------------------------------- -# cd [...]/PalantirBuild -# cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=DEBUG [...]/Palantir +# cd [...]\PalantirBuild +# cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=DEBUG [...]\Palantir # mingw32-make + + + +Native Windows build with Microsoft Visual Studio 2005 +------------------------------------------------------ + +# cd [...]\PalantirBuild +# cmake -G "Visual Studio 8 2005" [...]\Palantir + +Then open the "[...]/PalantirBuild/Palantir.sln" with Visual Studio. + +NOTES: +* More recent versions of Visual Studio should also work. +* You will have to install the Platform SDK (version 6 or above): + http://en.wikipedia.org/wiki/Microsoft_Windows_SDK. + Read the CMake FAQ about MSVC 2005: http://goo.gl/By90B
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/NEWS Fri Jul 20 11:46:52 2012 +0200 @@ -0,0 +1,12 @@ + +Version 0.1.1 (2012/07/20) +========================== + +* Fix Windows version +* Native Windows build with Microsoft Visual Studio 2005 + + +Version 0.1.0 (2012/07/19) +========================== + +* Initial release
--- a/README Fri Jul 20 11:45:05 2012 +0200 +++ b/README Fri Jul 20 11:46:52 2012 +0200 @@ -37,7 +37,7 @@ * Linux 32bit. * Linux 64bit. -* Windows 32bit (through MinGW). +* Windows 32bit. @@ -48,9 +48,8 @@ toolchains: * Native Linux compilation, with gcc. -* Cross-compilation for Windows under Linux through MinGW. - -More toolchains will be supported in the future. +* Native Windows compilation, with Microsoft Visual Studio. +* Cross-compilation for Windows under Linux, with MinGW. @@ -74,8 +73,8 @@ * INSTALL - How to build Palantir * README - This file * THANKS - The list of the contributors +* NEWS - The history of main changes between versions -We have decided not to maintain separate "NEWS" and "ChangeLog" -files. The major features of each version of Palantir ("NEWS") can be -found on our Web site. Each commit to the official Palantir Mercurial -repository should be associated with a description of the changes. +We have decided not to maintain a separate "ChangeLog" file. Each +commit to the official Palantir Mercurial repository should be +associated with a description of the changes.