diff --git a/Makefile b/Makefile index 9bbf467e23606033c085d1e105dfe3ba8a21908d..2aec754e6f8f0af6065df417112d48dbc0a75aa3 100644 --- a/Makefile +++ b/Makefile @@ -360,7 +360,6 @@ CACERTS_FILE.desc = Location of certificates file 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 @@ VARIABLE_CHECKFIL_LIST += \ ifeq ($(PLATFORM), windows) VARIABLE_PRINTVAL_LIST += \ - DXSDK_PATH \ - MSVCRT_DLL_PATH + DXSDK_PATH VARIABLE_CHECKDIR_LIST += \ - DXSDK_PATH \ - MSVCRT_DLL_PATH + DXSDK_PATH endif diff --git a/README-builds.html b/README-builds.html index e48aaff3612f317e95f66a1f75002450d6b50ff4..f98260ceca4b7f784906e1a7c747a4a4b91ba350 100644 --- a/README-builds.html +++ b/README-builds.html @@ -1414,14 +1414,14 @@ but it's normally found via the DirectX environment variable DXSDK_DIR. - MSVCR100.DLL + MSVCR100.DLL
The OpenJDK build requires access to a redistributable MSVCR100.DLL. This is usually picked up automatically from the redist directories of Visual Studio 2010. If this cannot be found set the - ALT_MSVCRT_DLL_PATH + ALT_MSVCRNN_DLL_PATH variable to the location of this file.

@@ -1671,15 +1671,10 @@ variable DXSDK_DIR, failing that, look in C:/DXSDK. -
ALT_MSVCRT_DLL_PATH
-
- The location of the - MSVCRT.DLL. -
ALT_MSVCRNN_DLL_PATH
The location of the - MSVCR100.DLL. + MSVCR100.DLL.