diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-03-23 02:05:29 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-03-23 02:05:29 +0000 |
| commit | e108afe2bb9c855ad17700d9e177f6f59f68ee8b (patch) | |
| tree | 8a6e6a175e5f3a7bf451abf5d15c0107ba43378c /epan | |
| parent | 2218ce1220aba62c515952ac2d79844bccea1ba9 (diff) | |
The Win32 build builds wiretap as a DLL and requires WinPcap 2.1.
svn path=/trunk/; revision=3163
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/Makefile.nmake | 10 | ||||
| -rw-r--r-- | epan/dfilter/Makefile.nmake | 5 | ||||
| -rw-r--r-- | epan/ftypes/Makefile.nmake | 5 |
3 files changed, 13 insertions, 7 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 3ebd008538..fa12cf2f9d 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -2,11 +2,13 @@ include ..\config.nmake ############### no need to modify below this line ######### -CFLAGS=/MT /DHAVE_CONFIG_H /I. /I.. /I../wiretap \ +CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap \ /I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \ /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ /I$(PCAP_DIR)\include $(LOCAL_CFLAGS) +CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL + # For use when making ethereal.dll libethereal_LIBS = \ wsock32.lib user32.lib \ @@ -14,9 +16,10 @@ libethereal_LIBS = \ $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib {$S}.c{$O}.obj:: - $(CC) $(CFLAGS) -Fd$O\ -c $< + $(CC) $(CVARSDLL) $(CFLAGS) -Fd$O\ -c $< -OBJECTS=bitswap.obj \ +OBJECTS=atalk-utils.obj \ + bitswap.obj \ conversation.obj \ epan.obj \ except.obj \ @@ -29,6 +32,7 @@ OBJECTS=bitswap.obj \ plugins.obj \ proto.obj \ resolv.obj \ + sna-utils.obj \ strutil.obj \ tvbuff.obj \ diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake index cb4f7586b8..99f069e4df 100644 --- a/epan/dfilter/Makefile.nmake +++ b/epan/dfilter/Makefile.nmake @@ -4,14 +4,15 @@ include ..\..\config.nmake LEMON=..\..\tools\lemon -CFLAGS=/MT /DHAVE_CONFIG_H /I. /I.. /I..\.. /I$(LEMON) \ +CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I..\.. /I$(LEMON) \ /I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)\gmodule \ /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ /I$(PCAP_DIR)\include $(LOCAL_CFLAGS) +CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL {$S}.c{$O}.obj:: - $(CC) $(CFLAGS) -Fd$O\ -c $< + $(CC) $(CVARSDLL) $(CFLAGS) -Fd$O\ -c $< OBJECTS = \ diff --git a/epan/ftypes/Makefile.nmake b/epan/ftypes/Makefile.nmake index 0f24034546..37490b44c6 100644 --- a/epan/ftypes/Makefile.nmake +++ b/epan/ftypes/Makefile.nmake @@ -2,14 +2,15 @@ include ..\..\config.nmake ############### no need to modify below this line ######### -CFLAGS=/MT /DHAVE_CONFIG_H /I. /I.. /I../.. \ +CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../.. \ /I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \ /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ /I$(PCAP_DIR)\include $(LOCAL_CFLAGS) +CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL {$S}.c{$O}.obj:: - $(CC) $(CFLAGS) -Fd$O\ -c $< + $(CC) $(CVARSDLL) $(CFLAGS) -Fd$O\ -c $< OBJECTS = \ |