aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>2000-05-10 15:32:09 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>2000-05-10 15:32:09 +0000
commitc71e3de675116548b7bc5d945f79315257e0e76f (patch)
tree61d06d116d973224cef44934d643927eac59e523
parentb5f25bc16d38542d25f308d4880e432f208e2ff4 (diff)
Fixes for building 0.8.8.
svn path=/trunk/; revision=1933
-rw-r--r--Makefile.nmake10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index 4227e250f6..c02f02b2c2 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1,7 +1,7 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: nmake -f makefile.nmake
#
-# $Id: Makefile.nmake,v 1.33 2000/04/29 07:34:35 guy Exp $
+# $Id: Makefile.nmake,v 1.34 2000/05/10 15:32:09 gram Exp $
include config.nmake
@@ -58,10 +58,10 @@ DISSECTOR_SOURCES = \
packet-fddi.h \
packet-ftp.c \
packet-giop.c \
- packet-giop.h \
+## packet-giop.h \
packet-gre.c \
packet-h1.c \
- packet-h1.h \
+## packet-h1.h \
packet-hsrp.c \
packet-http.c \
packet-http.h \
@@ -407,12 +407,12 @@ all: $(EXECUTABLES) $(RESOURCES)
ethereal.exe : config.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res wiretap gtk plugins
$(LINK) @<<
- /OUT:ethereal.exe $(LDFLAGS) /SUBSYSTEM:windows $(ethereal_LIBS) $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res
+ /OUT:ethereal.exe $(LDFLAGS) /SUBSYSTEM:windows $(ethereal_LIBS) $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res /NODEFAULTLIB:libcmt
<<
tethereal.exe : config.h $(tethereal_OBJECTS) $(EXTRA_OBJECTS) image\tethereal.res wiretap plugins
$(LINK) @<<
- /OUT:tethereal.exe $(LDFLAGS) /SUBSYSTEM:console $(tethereal_LIBS) $(tethereal_OBJECTS) $(EXTRA_OBJECTS) image\tethereal.res
+ /OUT:tethereal.exe $(LDFLAGS) /SUBSYSTEM:console $(tethereal_LIBS) $(tethereal_OBJECTS) $(EXTRA_OBJECTS) image\tethereal.res /NODEFAULTLIB:libcmt
<<
editcap.exe : config.h editcap.obj getopt.obj wiretap image\editcap.res