The Win32 port of libpcap requires that programs with which it's built
be built as multi-threaded programs; add "/MT" to the list of compiler flags. Add "clean" rules in subdirectories, and run subdirectory "nmake -f Makefile.nmake clean" when "nmake -f Makefile.nmake clean" is done in the top-level directory, so that "nmake -f Makefile.nmake clean" cleans everything up. svn path=/trunk/; revision=1791
This commit is contained in:
parent
c2b1feea05
commit
e59a0d5260
|
@ -11,7 +11,7 @@ LINK= link
|
|||
LDFLAGS = /NOLOGO /SUBSYSTEM:console /INCREMENTAL:no /MACHINE:I386 \
|
||||
$(LOCAL_LDFLAGS) /OUT:ethereal.exe
|
||||
|
||||
CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) /I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule \
|
||||
CFLAGS=/MT -DHAVE_CONFIG_H $(LOCAL_CFLAGS) /I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule \
|
||||
/I$(GTK_DIR) /Iwiretap /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
|
||||
/I$(PCAP_DIR)/include
|
||||
|
||||
|
@ -197,6 +197,13 @@ dfilter-grammar.c dfilter-grammer.h : dfilter-grammar.y
|
|||
|
||||
clean:
|
||||
rm -f $(ethereal_OBJECTS) $(EXTRA_ethereal_OBJECTS) ethereal.exe
|
||||
cd wiretap
|
||||
nmake -f Makefile.nmake clean
|
||||
cd ../gtk
|
||||
nmake -f Makefile.nmake clean
|
||||
cd ../plugins
|
||||
nmake -f Makefile.nmake clean
|
||||
cd ..
|
||||
|
||||
wiretap::
|
||||
cd wiretap
|
||||
|
|
|
@ -2,7 +2,7 @@ include ..\config.nmake
|
|||
|
||||
############### no need to modify below this line #########
|
||||
|
||||
CFLAGS=/DHAVE_CONFIG_H /I.. /I../wiretap \
|
||||
CFLAGS=/MT /DHAVE_CONFIG_H /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)
|
||||
|
@ -41,3 +41,6 @@ libui.lib : ..\config.h $(OBJECTS)
|
|||
|
||||
..\config.h : ..\config.h.win32
|
||||
copy ..\config.h.win32 ..\config.h
|
||||
|
||||
clean:
|
||||
rm -f $(OBJECTS) libui.lib
|
||||
|
|
|
@ -3,7 +3,7 @@ include ..\config.nmake
|
|||
|
||||
############### no need to modify below this line #########
|
||||
|
||||
CFLAGS=/DHAVE_CONFIG_H /I$(GLIB_DIR) $(LOCAL_CFLAGS)
|
||||
CFLAGS=/MT /DHAVE_CONFIG_H /I$(GLIB_DIR) $(LOCAL_CFLAGS)
|
||||
|
||||
OBJECTS=ascend-grammar.obj \
|
||||
ascend-scanner.obj \
|
||||
|
@ -39,3 +39,5 @@ ascend-scanner.c : ascend-scanner.l
|
|||
config.h : config.h.win32
|
||||
copy config.h.win32 $@
|
||||
|
||||
clean :
|
||||
rm -f $(OBJECTS) libwtap.lib
|
||||
|
|
Loading…
Reference in New Issue