From 3dacd1ad863373d4d80adac2e042c8946998ee80 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 14 Apr 2010 13:29:34 +0000 Subject: [PATCH] 2010-04-14 15:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL * Updated MSVS 2010 examples. --- harbour/ChangeLog | 4 ++++ harbour/INSTALL | 36 ++++++++---------------------------- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4549f3a91a..3ba5ebd227 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,10 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-04-14 15:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + * Updated MSVS 2010 examples. + 2010-04-14 13:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) - tests/testcgi.prg - Deleted. diff --git a/harbour/INSTALL b/harbour/INSTALL index 7814b76b2e..ecff31cc29 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -737,13 +737,13 @@ HARBOUR - To redirect all output to a log file, append this after the make command: '> log.txt 2>&1' (without quotes) - --- Windows SDK 7.1 - call "%ProgramFiles%\Microsoft Visual Studio 10.0\VC\bin\vcvars32.bat" + --- MSVC 2010 and Windows SDK 7.1 + call "%ProgramFiles%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" win-make --- - --- Windows SDK 7.1 for Windows x86-64 (requires preceding build for native target) - call "%ProgramFiles%\Microsoft Visual Studio 10.0\VC\bin\vcvarsx86_amd64.bat" + --- MSVC 2010 (Professional or above) and Windows SDK 7.1 for Windows x86-64 (requires preceding build for native target) + call "%ProgramFiles%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86_amd64 win-make --- @@ -757,11 +757,6 @@ HARBOUR win-make --- - --- MSVC 2010 - call "%ProgramFiles%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" - win-make - --- - --- MSVC 2008 + SDK set WindowsSDKDir=%ProgramFiles%\Microsoft SDKs\Windows\v6.0A\ call "%ProgramFiles%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" @@ -773,11 +768,6 @@ HARBOUR win-make --- - --- MSVC 2010 (Professional or above) for Windows x86-64 (requires preceding build for native target) - call "%ProgramFiles%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86_amd64 - win-make - --- - --- MSVC 2008 (Standard or above) for Windows x86-64 (requires preceding build for native target) call "%ProgramFiles%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86_amd64 win-make @@ -941,13 +931,13 @@ HARBOUR both x86 and x64 without building a native target first, and potential differences in compilers to use native binaries if they are available. - --- Windows SDK 7.1 for Windows x86 - call "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\bin\vcvars32.bat" + --- MSVC 2010 and Windows SDK 7.1 for Windows x86 + call "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" win-make --- - --- Windows SDK 7.1 for Windows x86-64 - call "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\bin\vcvars64.bat" + --- MSVC 2010 (Professional or above) and Windows SDK 7.1 for Windows x86-64 + call "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64 win-make --- @@ -961,21 +951,11 @@ HARBOUR win-make --- - --- MSVC 2010 for Windows x86 - call "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" - win-make - --- - --- MSVC 2008 for Windows x86 call "%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" win-make --- - --- MSVC 2010 (Professional or above) for Windows x86-64 - call "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64 - win-make - --- - --- MSVC 2008 (Standard or above) for Windows x86-64 call "%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" amd64 win-make