Done.

Niels Nes wrote:

On Fri, Feb 08, 2008 at 10:12:44AM +0000, Sjoerd Mullender wrote:

...

Update of /cvsroot/monetdb/buildtools/doc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11533

Modified Files: Tag: MonetDB_1-22 windowsbuild.rst Log Message: Updated for ICC 1.10. Added CC and CXX variables for ICC.

Small request. Could the line cscript configure.js compiler=msvc prefix=C:\libxml2-2.6.30.win64 include=C:\iconv-1.11.win64\include;C:\zlib-1.2.3.win64\include lib=C:\iconv-1.11.win64\lib;C:\zlib-1.2.3.win64\lib iconv=yes zlib=yes somehow be split correctly (ie for windows and rst correct that is) over say 3 lines?

Niels

...

Index: windowsbuild.rst

RCS file: /cvsroot/monetdb/buildtools/doc/windowsbuild.rst,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -d -r1.10 -r1.10.2.1 --- windowsbuild.rst 15 Jan 2008 15:29:27 -0000 1.10 +++ windowsbuild.rst 8 Feb 2008 10:12:42 -0000 1.10.2.1 @@ -114,7 +114,8 @@

• Microsoft Visual Studio .NET 2003 (also known as Microsoft Visual Studio 7);
• Microsoft Visual Studio 2005 (also known as Microsoft Visual Studio 8);

-- Intel(R) C++ Compiler 9.1 (which actually needs one of the above). +- Intel(R) C++ Compiler 9.1 (which actually needs one of the above); +- Intel(R) C++ Compiler 10.1 (which also needs one of the Microsoft compilers).

Note that the pathfinder component can currently not be compiled with any of the Microsoft compilers. It can be compiled with the Intel @@ -124,7 +125,7 @@ Compiler gcc under Cygwin__. Using that it (probably still) is possible to build a version that runs using the Cygwin DLLs, but also a version that uses the MinGW__ (Minimalist GNU for Windows) package. This is -not further described here. +not supported and not further described here.

__ http://www.cygwin.com/ __ http://www.mingw.org/ @@ -534,9 +535,18 @@

call "%ProgramFiles%\Microsoft Visual Studio 8\Common7\Tools\vsvars32.bat"

-- Intel(R) C++ Compiler 9.1:: +- Intel(R) C++ Compiler 10.1.013::

• call "%ProgramFiles%\Intel\Compiler\C++\9.1\IA32\Bin\iclvars.bat"

• call "C:%ProgramFiles%\Intel\Compiler\C++\10.1.013\IA32\Bin\iclvars.bat"

+When using the Intel compiler, you also need to set the ``CC`` and +``CXX`` variables::

• set CC=icl -Qstd=c99 -GR- -Qsafeseh-
• set CXX=icl -Qstd=c99 -GR- -Qsafeseh-

+(These are the values for the 10.1 version, for 9.1 replace +``-Qstd=c99`` with ``-Qc99``.)

Internal Variables

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
Monetdb-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins