From Lars Roland: don't link with GTK+, as it's not necessary to do so,
and as plugin dissectors shouldn't be linked with GTK+ (so that they don't depend on Ethereal being built with a particular version of GTK+ - Ethereal is packaged for Windows in both GTK+ 1.3[.x] and 2.x versions - and so that they can work with Tethereal, which doesn't use GTK+). svn path=/trunk/; revision=11840
This commit is contained in:
parent
463ea07dde
commit
e6bc3872b0
|
@ -6,24 +6,14 @@ include ..\..\config.nmake
|
||||||
|
|
||||||
############### no need to modify below this line #########
|
############### no need to modify below this line #########
|
||||||
|
|
||||||
# XXX: that's odd here, no GTK stuff should be in the plugins dir,
|
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
|
||||||
# so move all GTK specific stuff into gtk dir.
|
|
||||||
# As GTK1_CFLAGS isn't correct here, we don't have GTK_CFLAGS
|
|
||||||
# any longer, so no better choice here. If the move of GTK code
|
|
||||||
# finished, replace this with GLIB_CFLAGS.
|
|
||||||
# The same applies to GTK1_LIBS -> GLIB_LIBS.
|
|
||||||
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GTK1_CFLAGS) \
|
|
||||||
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
|
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
|
||||||
|
|
||||||
OBJECTS=packet-asn1.obj
|
OBJECTS=packet-asn1.obj
|
||||||
|
|
||||||
asn1.dll asn1.exp asn1.lib : $(OBJECTS) ..\plugin_api.obj
|
asn1.dll asn1.exp asn1.lib : $(OBJECTS) ..\plugin_api.obj
|
||||||
link -dll /out:asn1.dll $(OBJECTS) ..\plugin_api.obj \
|
link -dll /out:asn1.dll $(OBJECTS) ..\plugin_api.obj \
|
||||||
!IFDEF GTK1_DIR
|
$(GLIB_LIBS)
|
||||||
$(GTK1_LIBS)
|
|
||||||
!ELSE
|
|
||||||
$(GTK2_LIBS)
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(OBJECTS) asn1.dll asn1.exp asn1.lib $(PDB_FILE)
|
rm -f $(OBJECTS) asn1.dll asn1.exp asn1.lib $(PDB_FILE)
|
||||||
|
|
Loading…
Reference in New Issue