disable-optimizations-20031209

[openafs.git] / src / config / NTMakefile.i386_nt40

diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index fd84339..ce9e91b 100644 (file)
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -77,8 +77,12 @@ INCLUDE = $(AFSDEV_INCLUDE)
 LIB = $(AFSDEV_LIB)
 
 #define used in WinNT/2000 installation and program version display
-AFSPRODUCT_VERSION=1.2.11
-AFSPRODUCT_FILE_VERSION=1,2,1100,0
+AFSPRODUCT_VER_MAJOR=1
+AFSPRODUCT_VER_MINOR=3
+AFSPRODUCT_VER_PATCH=5100
+AFSPRODUCT_VER_BUILD=0
+AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH)
+AFSPRODUCT_FILE_VERSION=$(AFSPRODUCT_VER_MAJOR),$(AFSPRODUCT_VER_MINOR),$(AFSPRODUCT_VER_PATCH),$(AFSPRODUCT_VER_BUILD)
 CELLNAME_DEFAULT=Your Cell Name
 CELLSERVDB_INSTALL=CellServDB.GrandCentral
 CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB
@@ -157,9 +161,9 @@ OUT=$(OJT)\$(RELDIR)
 # WIN32.MAK, and this nmake file, are targeted to the MSVC compiler;
 # port this nmake file if additional compiler support is required.
 
-!IF ("$(AFSVER_CL)"=="1300")
-afslflags = $(afslflags) /DEBUG
-!ENDIF
+# !IF ("$(AFSVER_CL)"=="1300")
+# afslflags = $(afslflags) /DEBUG
+# !ENDIF
 
 !IF ("$(APPVER)" == "")
 APPVER=4.0
@@ -205,9 +209,10 @@ afscdefs =\
        -DSTRICT \
        -D_WIN32_IE=0x0400 \
        -D_WIN32_WINNT=0x0400 \
-     -DAFS_AFSDB_ENV \
-     -DAFS_FREELANCE_CLIENT \
-     -DAFS_64BIT_ENV \
+       -DAFS_AFSDB_ENV \
+       -DAFS_FREELANCE_CLIENT \
+       -DAFS_64BIT_ENV \
+       -DAFS_64BIT_CLIENT \
         $(AFSDEV_AUXCDEFINES)
 
 
@@ -230,19 +235,15 @@ afscflags =\
        /GX \
        /Os
 
-cdebug = $(cdebug:-Z7=-Zi)  # avoid annoying override warning (D4025)
-!IF ("APPSVER"=="1300")
-cdebug = $(cdebug) -Zi
-!ENDIF
-
 !IF ("$(AFSDEV_BUILDTYPE)" == "FREE")
 
-afscflags = $(afscflags) /Ox
+#afscflags = $(afscflags) /Ox
 cdebug = $(cdebug:-Od=) # avoid annoying override warning (D4025)
 cvarsdll = $(cvarsdll:-MDd=-MD)
 NODEBUG=1
 
 !ELSE          # CHECKED BUILD
+cdebug = $(cdebug:-Z7=-Zi)  # avoid annoying override warning (D4025)
 
 !IF ("$(AFSVER_CL)"=="1200")
 afscdefs = $(afscdefs) -DDEBUG
@@ -348,7 +349,8 @@ DLLPREP = rebase -i $(DESTDIR)\NTDllmap.txt -x $(@D) -q $@
 
 !ELSE  #CHECKED BUILD
 
-ldebug = /NODEFAULTLIB:LIBC 
+# Generate debug information and pdb files 
+ldebug = /DEBUG /PDB:$*.pdb /NODEFAULTLIB:LIBC 
 
 #!IF ("AFSVER_CL"=="1200")
 #ldebug = $(ldebug) -debugtype:cv 
@@ -361,8 +363,8 @@ afscflags = $(afscflags) /Od /Zi
 !IF ("AFSVER_CL"=="1200")
 ldebug = $(ldebug) -debugtype:both
 ldebug = $(ldebug:-debugtype:cv=)
-!ENDIF
-!ENDIF
+!ENDIF #AFSVER_CL == 1200
+!ENDIF #VADUMPT
 
 !IFNDEF _CRTDBG_MAP_ALLOC
 mfclflags = $(mfclflags) /NODEFAULTLIB:msvcrtd.lib
@@ -372,38 +374,37 @@ mfcdlllflags = $(mfcdlllflags) /NODEFAULTLIB:msvcrtd.lib
 !IF ("$(AFSVER_CL)"=="1200")
 EXEMFCLINK=$(EXEMFCLINK:/NODEFAULTLIB:msvcrtd.lib=)
 DLLMFCLINK=$(DLLMFCLINK:/NODEFAULTLIB:msvcrtd.lib=)
-!ENDIF
+!ENDIF #AFSVER_CL == 1200
 
-!ELSE
-mfclflags = $(mfclflags) /NODEFAULTLIB:msvcrt.lib
-mfcdlllflags = $(mfcdlllflags) /NODEFAULTLIB:msvcrt.lib
+!ELSE #_CRTDBG_MAP_ALLOC
+mfclflags = $(mfclflags) /NODEFAULTLIB:msvcrtd.lib
+mfcdlllflags = $(mfcdlllflags) /NODEFAULTLIB:msvcrtd.lib
 conlibsdll = $(conlibsdll:msvcrt.lib=msvcrtd.lib)
 guilibsdll = $(guilibsdll:msvcrt.lib=msvcrtd.lib)
-!ENDIF
+!ENDIF #_CRTDBG_MAP_ALLOC
 
 EXEPREP = rebase -b 0x00400000 -q $@
 DLLPREP = rebase -i $(DESTDIR)\NTDllmap.txt -q $@
 
-!ENDIF
+!ENDIF #CHECKED BUILD
 
 
 # EXE link macro for console applications
-EXECONLINK = $(link) /OUT:$@ /PDB:$*.pdb $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) Advapi32.lib user32.lib  version.lib $**
+EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) Advapi32.lib user32.lib  version.lib $**
 
 # EXE link macro for GUI applications
-EXEGUILINK = $(link) /OUT:$@ /PDB:$*.pdb $(ldebug) $(guilflags) $(afslflags) $(guilibsdll) $**
+EXEGUILINK = $(link) /OUT:$@ $(ldebug) $(guilflags) $(afslflags) $(guilibsdll) $**
 
 # EXE link macro for MFC applications
-EXEMFCLINK = $(link) /OUT:$@ /PDB:$*.pdb $(ldebug) $(mfclflags) $(afslflags) $(mfclibsdll) $**
+EXEMFCLINK = $(link) /OUT:$@ $(ldebug) $(mfclflags) $(afslflags) $(mfclibsdll) $**
 
 # DLL link macro for console applications
-DLLCONLINK = $(link) /OUT:$@ /PDB:$*.pdb $(ldebug) $(dlllflags) $(afslflags) $(conlibsdll) $**
+DLLCONLINK = $(link) /OUT:$@ $(ldebug) $(dlllflags) $(afslflags) $(conlibsdll) $**
 
 # DLL link macro for GUI applications
-DLLGUILINK = $(link) /OUT:$@ /PDB:$*.pdb $(ldebug) $(dlllflags) $(afslflags) $(guilibsdll)  $**
-EXECONLINK = $(link) /OUT:$@ /PDB:$*.pdb $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) Advapi32.lib user32.lib version.lib $**
-DLLMFCLINK = $(link) /OUT:$@ /PDB:$*.pdb $(ldebug) $(mfcdlllflags) $(afslflags) $(mfclibsdll) $**
-
+DLLGUILINK = $(link) /OUT:$@ $(ldebug) $(dlllflags) $(afslflags) $(guilibsdll)  $**
+EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) Advapi32.lib user32.lib version.lib $**
+DLLMFCLINK = $(link) /OUT:$@ $(ldebug) $(mfcdlllflags) $(afslflags) $(mfclibsdll) $**
 
 # DLL link macro for resource-only DLLs
 DLLRESLINK = $(link) /OUT:$@ $(dlllflags:-entry:_DllMainCRTStartup@12=-noentry) $(afslflags) $**
@@ -421,6 +422,6 @@ AFSDEV_AUXMIDLFLAGS=/Oi
 !ENDIF
 
 # Lex/Yacc macros
-LEX =1.2.2 a
+LEX = flex -l
 YACC = bison