diff options
| author | Geoff Voelker <voelker@cs.washington.edu> | 1998-11-04 01:27:10 +0000 |
|---|---|---|
| committer | Geoff Voelker <voelker@cs.washington.edu> | 1998-11-04 01:27:10 +0000 |
| commit | ec465548a9c155d5e9a3feabe9f03f257eaecc8c (patch) | |
| tree | 3ede34be3d60b385dae691a173dc8f4ec8d75ea5 /nt | |
| parent | f2b56a5d967cffb36c26f00e83568c8e6207bbb2 (diff) | |
| download | emacs-ec465548a9c155d5e9a3feabe9f03f257eaecc8c.tar.gz | |
(SYS_LDFLAGS): Use swapfile when running from cd or net.
(DEL_TREE): Use rd instead of rmdir.
(ARCH_CFLAGS): Optimize for P6. Align structures on 8-byte boundaries.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/makefile.def | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/nt/makefile.def b/nt/makefile.def index fdfa6029653..e9926c540a2 100644 --- a/nt/makefile.def +++ b/nt/makefile.def @@ -42,6 +42,16 @@ MSVCNT11 = 0 # END CONFIGURATION # +# +# Allow detection of builds with MSVC 5 or later +# +_NMAKE_VER_5=162 +_NMAKE_VER_4=0 + +!IFNDEF _NMAKE_VER +_NMAKE_VER=$(_NMAKE_VER_4) +!ENDIF + # Check that the INCLUDE and LIB environment variables are set. # !ifndef INCLUDE @@ -131,6 +141,9 @@ SYS_LDFLAGS = SYS_LDFLAGS = -release -incremental:no -version:3.10 !endif +# Tag the executables to run out of the swapfile when execute off CD or network shares +SYS_LDFLAGS = $(SYS_LDFLAGS) -swaprun:cd -swaprun:net + INC = -I. !if "$(BUILD_TYPE)" == "spd" CFLAGS_COMMON = -nologo $(INC) $(ARCH_CFLAGS) $(LOCAL_FLAGS) -DWIN32_LEAN_AND_MEAN -D$(ARCH) -Fd$(BLD)\vc.pdb @@ -161,8 +174,8 @@ DEL = deltree /y DEL_TREE = deltree /y !else DEL = del -# This is completely braindamaged, but it's the only routine known to be there -DEL_TREE = echo y | rmdir /s +# NT better way of killing a deltree +DEL_TREE = rd /s/q !endif # The location of the icon file @@ -173,7 +186,7 @@ ADDPM = ..\nt\$(BLD)\addpm.exe !if "$(ARCH)" == "i386" !if "$(BUILD_TYPE)" == "spd" -ARCH_CFLAGS = -nologo -D_X86_=1 -c -Zel -W2 -H63 -Oxsb2 -G5dF -Zi +ARCH_CFLAGS = -nologo -D_X86_=1 -c -Zel -W2 -H63 -Oxsb2 -G6dF -Zi -Zp8 !else ARCH_CFLAGS = -nologo -D_X86_=1 -c -Zel -W2 -H63 -G3d -Zi -Od !endif |