Changeset: f13869de8f95 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f13869de8f95 Modified Files: NT/monetdb_config.h.in Branch: default Log Message:
Merged from Mar2011 diffs (58 lines): diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in --- a/NT/monetdb_config.h.in +++ b/NT/monetdb_config.h.in @@ -6,6 +6,7 @@ * _MSC_VER = 1310: Visual Studio .NET 2003 (a.k.a. Visual Studio 7) * _MSC_VER = 1400: Visual Studio 8 * _MSC_VER = 1500: Visual Studio 9.0 + * _MSC_VER = 1600: Visual Studio 10.0 */ /* Prevent pollution through excessive inclusion of include files by diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst --- a/buildtools/doc/windowsbuild.rst +++ b/buildtools/doc/windowsbuild.rst @@ -297,6 +297,19 @@ ``INSTALL.W32`` or ``INSTALL.W64``. We used the option ``enable-static-engine`` as described in the instructions. +.. The actual commands used were:: + perl Configure VC-WIN32 no-asm --prefix=C:\Libraries\openssl-1.0.0a.win32 + ms\do_ms.bat + nmake /f ms\ntdll.mak + nmake /f ms\ntdll.mak install + and:: + perl Configure VC-WIN64 --prefix=C:\Libraries\openssl-1.0.0a.win64 + ms\do_win64a + nmake /f ms\ntdll.mak + nmake /f ms\ntdll.mak install + For the debug versions, use debug-VC-WIN32 and VC-WIN64A and edit + the file ``ms/ntdll.mak`` before building. + Fix the ``OPENSSL`` definitions in ``buildtools\conf\winrules.msc`` so that they refer to the location where you installed the library and call ``nmake`` with the extra parameter ``HAVE_OPENSSL=1``. @@ -354,6 +367,14 @@ before starting the build so that it gets created from the correct (Windows) source. +.. The actual commands were:: + autogen.bat + nmake /f makefile.vc MSCV_VER=1600 + The logic having to do with finding out which compiler is being + used in ``nmake.opt`` uses an older version number for ``nmake`` + for Visual Studio 10. I fixed the last conditional checking + ``_NMAKE_VER`` to also include ``|| "$(_NMAKE_VER)" == "10.00.30319.01"``. + After this, install the library somewhere, e.g. in ``C:\geos-3.2.2.win32``:: @@ -429,7 +450,7 @@ :: call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\amd64\vcvarsamd64.bat" - nmake /f win32\Makefile.msc + nmake /f win32\Makefile.msc OBJA=inffast.obj Create the folder where you want to install the binaries, e.g. ``C:\zlib-1.2.5.win64``, and the subfolders ``bin``, ``include``, _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
