Mercurial > hg > openjdk > jdk7u
changeset 275:4d044e6e1080
Merge
author | ohair |
---|---|
date | Wed, 22 Dec 2010 12:27:14 -0800 |
parents | dc9eb519c6ed (current diff) 4346ba98938b (diff) |
children | c1af03f88627 |
files | README-builds.html |
diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Wed Dec 22 12:25:52 2010 -0800 +++ b/Makefile Wed Dec 22 12:27:14 2010 -0800 @@ -456,7 +456,6 @@ DEVTOOLS_PATH.desc = Directory containing zip and gnumake CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files DXSDK_PATH.desc = Root directory of DirectX SDK -MSDEVTOOLS_PATH.desc = Root directory of VC++ tools (e.g. rc.exe) MSVCRT_DLL_PATH.desc = Directory containing mscvrt.dll # Make variables to print out (description and value) @@ -487,12 +486,10 @@ VARIABLE_PRINTVAL_LIST += \ DXSDK_PATH \ - MSDEVTOOLS_PATH \ MSVCRT_DLL_PATH VARIABLE_CHECKDIR_LIST += \ DXSDK_PATH \ - MSDEVTOOLS_PATH \ MSVCRT_DLL_PATH endif
--- a/README-builds.html Wed Dec 22 12:25:52 2010 -0800 +++ b/README-builds.html Wed Dec 22 12:27:14 2010 -0800 @@ -1728,13 +1728,16 @@ <dt><strong>Windows specific:</strong></dt> <dd> <dl> - <dt><a name="ALT_MSDEVTOOLS_PATH"><tt>ALT_MSDEVTOOLS_PATH</tt></a> </dt> + <dt><a name="ALT_WINDOWSSDKDIR"><tt>ALT_WINDOWSSDKDIR</tt></a> </dt> <dd> The location of the - Microsoft Visual Studio - tools 'bin' directory. - The default is usually derived from - <a href="#ALT_COMPILER_PATH"><tt>ALT_COMPILER_PATH</tt></a>. + Microsoft Windows SDK where some tools will be + located. + The default is whatever WINDOWSSDKDIR is set to + (or WindowsSdkDir) or the path + <pre> + c:\Program Files\Microsoft SDKs\Windows\v6.1a + </pre> </dd> <dt><tt><a name="ALT_DXSDK_PATH">ALT_DXSDK_PATH</a></tt> </dt> <dd>