Mercurial > hg > openjdk > jdk7
changeset 289:24900a58ab9f
6950375: Remove msvcrt.dll from the Windows JRE bundles
Reviewed-by: prr
author | ohair |
---|---|
date | Fri, 14 Jan 2011 14:04:19 -0800 |
parents | 6d9bbcc0a8cb |
children | 3a9f19cbf7f1 |
files | Makefile README-builds.html |
diffstat | 2 files changed, 5 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Jan 13 17:55:10 2011 -0800 +++ b/Makefile Fri Jan 14 14:04:19 2011 -0800 @@ -360,7 +360,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 -MSVCRT_DLL_PATH.desc = Directory containing mscvrt.dll # Make variables to print out (description and value) VARIABLE_PRINTVAL_LIST += \ @@ -389,12 +388,10 @@ ifeq ($(PLATFORM), windows) VARIABLE_PRINTVAL_LIST += \ - DXSDK_PATH \ - MSVCRT_DLL_PATH + DXSDK_PATH VARIABLE_CHECKDIR_LIST += \ - DXSDK_PATH \ - MSVCRT_DLL_PATH + DXSDK_PATH endif
--- a/README-builds.html Thu Jan 13 17:55:10 2011 -0800 +++ b/README-builds.html Fri Jan 14 14:04:19 2011 -0800 @@ -1414,14 +1414,14 @@ but it's normally found via the DirectX environment variable <tt>DXSDK_DIR</tt>. </blockquote> - <strong><a name="msvcrt"><tt>MSVCR100.DLL</tt></a></strong> + <strong><a name="msvcrNN"><tt>MSVCR100.DLL</tt></a></strong> <blockquote> The OpenJDK build requires access to a redistributable <tt>MSVCR100.DLL</tt>. This is usually picked up automatically from the redist directories of Visual Studio 2010. If this cannot be found set the - <a href="#ALT_MSVCRT_DLL_PATH"><tt>ALT_MSVCRT_DLL_PATH</tt></a> + <a href="#ALT_MSVCRNN_DLL_PATH"><tt>ALT_MSVCRNN_DLL_PATH</tt></a> variable to the location of this file. <p> </blockquote> @@ -1671,15 +1671,10 @@ variable <tt>DXSDK_DIR</tt>, failing that, look in <tt>C:/DXSDK</tt>. </dd> - <dt><tt><a name="ALT_MSVCRT_DLL_PATH">ALT_MSVCRT_DLL_PATH</a></tt> </dt> - <dd> - The location of the - <a href="#msvcrt"><tt>MSVCRT.DLL</tt></a>. - </dd> <dt><tt><a name="ALT_MSVCRNN_DLL_PATH">ALT_MSVCRNN_DLL_PATH</a></tt> </dt> <dd> The location of the - <a href="#msvcrt"><tt>MSVCR100.DLL</tt></a>. + <a href="#msvcrNN"><tt>MSVCR100.DLL</tt></a>. </dd> </dl> </dd>