release-1370-20040810

[openafs.git] / src / ntbuild.bat

diff --git a/src/ntbuild.bat b/src/ntbuild.bat
index 14ef314..2941835 100755 (executable)
--- a/src/ntbuild.bat
+++ b/src/ntbuild.bat
@@ -11,11 +11,6 @@ REM Modify for local configuration; common defaults shown.
 REM ########################################################################
 
 REM ########################################################################
-REM
-REM NOTE: You should run NTLANG.REG before attempting to build localized
-REM language files! Failure to do so will cause the resource compiler
-REM and message-catalog compiler to choke when they hit unknown code pages.
-REM
 REM NOTE: You will need to copy the NLS files into your windows\system32 
 REM directory prior to building non-english files.
 REM
@@ -35,7 +30,7 @@ SET _WIN32_IE=0x400
 REM ########################################################################
 REM Location of base folder where source lies, build directory
 REM e.g. AFSROOT\SRC is source directory of the build tree (8.3 short name)
-set AFSROOT=D:\Dev\AfsSorce\OpenAF~2.2
+set AFSROOT=C:\SRC\OpenAFS
 
 REM ########################################################################
 REM NTMakefile required definitions:
@@ -43,7 +38,8 @@ REM     AFSVER_CL  = version of the Microsoft compiler:
 REM                  "1200" for VC6
 REM                  "1300" for VC7 (.NET)
 REM                  "1310" for .NET 2003
-set AFSVER_CL=1200
+REM                  "1400" for VC8
+set AFSVER_CL=1310
 
 REM Location of Microsoft Visual C++ development folder (8.3 short name)
 set MSVCDIR=c:\progra~1\micros~2\vc98
@@ -82,30 +78,18 @@ if "%1"=="CHECKED" goto checked
 if "%1"=="free" goto free
 if "%1"=="FREE" goto free
 
-if "%1"=="wspp" goto wspp
-if "%1"=="WSPP" goto wspp
-
 goto usage
 
 :checked
 set AFSBLD_TYPE=CHECKED
-set AFSBLD_IS_WSPP=
 set AFSDEV_CRTDEBUG=1
 goto args_done
 
 :free
 set AFSBLD_TYPE=FREE
-set AFSBLD_IS_WSPP=
-set AFSDEV_CRTDEBUG=0
-goto args_done
-
-:wspp
-set AFSBLD_TYPE=FREE
-set AFSBLD_IS_WSPP=1
 set AFSDEV_CRTDEBUG=0
 goto args_done
 
-
 :args_done
 
 REM #######################################################################
@@ -118,12 +102,14 @@ REM     AFSDEV_BIN = default build binary directories
 set AFSDEV_BUILDTYPE=%AFSBLD_TYPE%
 
 set AFSDEV_INCLUDE=%MSSDKDIR%\include;%MSVCDIR%\include
+IF "%AFSVER_CL%" == "1400" set AFSDEV_INCLUDE=%AFSDEV_INCLUDE%;%MSVCDIR%\atlmfc\include
 IF "%AFSVER_CL%" == "1310" set AFSDEV_INCLUDE=%AFSDEV_INCLUDE%;%MSVCDIR%\atlmfc\include
 IF "%AFSVER_CL%" == "1300" set AFSDEV_INCLUDE=%AFSDEV_INCLUDE%;%MSVCDIR%\atlmfc\include
 IF "%AFSVER_CL%" == "1200" set AFSDEV_INCLUDE=%AFSDEV_INCLUDE%;%MSVCDIR%\atl\include;%MSVCDIR%\mfc\include
 set AFSDEV_INCLUDE=%AFSDEV_INCLUDE%;%NTDDKDIR%\include;%W9XDDKDIR%\include
 
 set AFSDEV_LIB=%MSSDKDIR%\lib;%MSVCDIR%\lib
+IF "%AFSVER_CL%" == "1400" set AFSDEV_LIB=%AFSDEV_LIB%;%MSVCDIR%\atlmfc\lib
 IF "%AFSVER_CL%" == "1310" set AFSDEV_LIB=%AFSDEV_LIB%;%MSVCDIR%\atlmfc\lib
 IF "%AFSVER_CL%" == "1300" set AFSDEV_LIB=%AFSDEV_LIB%;%MSVCDIR%\atlmfc\lib
 IF "%AFSVER_CL%" == "1200" set AFSDEV_LIB=%AFSDEV_LIB%;%MSVCDIR%\mfc\lib