diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-04-03 05:26:27 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-04-03 05:26:27 +0000 |
| commit | a817e9701520b38846b55b4c6d00981ad52f0ced (patch) | |
| tree | 9f1663af21fb1628cf87f316dd3f5f91b8a7ddc1 /Makefile.nmake | |
| parent | e453b3e5de37e423aa9086c5a1c2014573d64d75 (diff) | |
| download | wireshark-a817e9701520b38846b55b4c6d00981ad52f0ced.tar.gz wireshark-a817e9701520b38846b55b4c6d00981ad52f0ced.tar.bz2 wireshark-a817e9701520b38846b55b4c6d00981ad52f0ced.zip | |
Now that WinPcap is a DLL, I can load it at run-time rather than load-time.
That means that I no longer need to distribute capture and non-capture
versions of Ethereal for Win32; one version (compiled with WinPcap headers)
can run on systems with or without WinPcap.
For systems that don't have WinPcap, instead of disabling the Capture
menu, Capture|Start brings up a dialogue informing the user that wpcap.dll
was not loadable, and gives a URL to the WinPcap home page.
svn path=/trunk/; revision=3249
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 6f6f9ec221..50a7dea581 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.91 2001/03/31 10:13:10 guy Exp $ +# $Id: Makefile.nmake,v 1.92 2001/04/03 05:26:25 gram Exp $ include config.nmake include <win32.mak> @@ -196,6 +196,7 @@ DISSECTOR_OBJECTS = $(DISSECTOR_SOURCES:.c=.obj) ETHEREAL_COMMON_OBJECTS = \ asn1.obj \ + capture-wpcap.obj \ column.obj \ follow.obj \ getopt.obj \ @@ -212,11 +213,11 @@ ETHEREAL_COMMON_OBJECTS = \ ethereal_OBJECTS = \ $(DISSECTOR_OBJECTS) \ $(ETHEREAL_COMMON_OBJECTS) \ - capture.obj \ - file.obj \ - filters.obj \ + capture.obj \ + file.obj \ + filters.obj \ proto_hier_stats.obj \ - summary.obj \ + summary.obj tethereal_OBJECTS = \ $(DISSECTOR_OBJECTS) \ @@ -240,16 +241,15 @@ ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ $(GTK_DIR)\gtk\gtk-$(GTK_VERSION).lib \ $(GTK_DIR)\gdk\gdk-$(GTK_VERSION).lib \ $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ - $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \ - $(PCAP_DIR)\lib\wpcap.lib + $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib +# $(PCAP_DIR)\lib\wpcap.lib tethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ epan\ethereal.lib \ epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \ wsock32.lib user32.lib \ $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ - $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \ - $(PCAP_DIR)\lib\wpcap.lib + $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib editcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ @@ -260,8 +260,7 @@ dftest_LIBS= epan\ethereal.lib \ epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \ wsock32.lib user32.lib \ $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ - $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \ - $(PCAP_DIR)\lib\wpcap.lib + $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib EXECUTABLES=ethereal.exe tethereal.exe editcap.exe |