aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2003-08-07 00:41:28 +0000
committerGuy Harris <guy@alum.mit.edu>2003-08-07 00:41:28 +0000
commitddf6a8acf2bb398d8aa4072700c4bf915d498d73 (patch)
treeaf3fe6d50e1e3030d89ab2ba704cf98922ef0bd7 /Makefile.nmake
parentb6aa3275fd6fe34ef34e13b74e644519ce6e9893 (diff)
From Michael Lum: add the ability to have a preferences file containing
a list of disabled protocols, and to save that list from the Edit > Protocols dialog box. Add checks for read errors in "read_prefs()". Clean up white space. svn path=/trunk/; revision=8144
Diffstat (limited to 'Makefile.nmake')
-rw-r--r--Makefile.nmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index 858694eb7e..5fd45dbde4 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1,7 +1,7 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id: Makefile.nmake,v 1.321 2003/08/01 09:16:47 sahlberg Exp $
+# $Id: Makefile.nmake,v 1.322 2003/08/07 00:41:26 guy Exp $
include config.nmake
include <win32.mak>
@@ -403,6 +403,7 @@ ETHEREAL_COMMON_OBJECTS = \
crypt-md4.obj \
crypt-md5.obj \
crypt-rc4.obj \
+ disabled_protos.obj \
follow.obj \
g711.obj \
getopt.obj \