From cc164653a08105fcf43dd339885806826474800d Mon Sep 17 00:00:00 2001 From: Ulf Lamping Date: Sat, 6 Jan 2007 01:05:59 +0000 Subject: add experimental support for some more of the MSVC_VARIANTs: - Microsoft .Net Framework SDK Version 1.1 - Microsoft .Net Framework 2.0 SDK ... which seems to work fine now (except for the open problems like zlib) :-) Some of the plugins need different linker flags depending on the MSVC. I've set a "define" in config.nmake (PLUGIN_LDFLAGS) and used it in the affected plugins/.../Makefile.nmake. Maybe we should generally change the plugins that way. btw: The "Microsoft Visual C++ Toolkit 2003" (mentioned some time ago on the list) doesn't work as some important files are missing - and we have much easier alternatives now :-) svn path=/trunk/; revision=20332 --- plugins/asn1/Makefile.nmake | 2 +- plugins/mate/Makefile.nmake | 2 +- plugins/megaco/Makefile.nmake | 2 +- plugins/mgcp/Makefile.nmake | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins') diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake index e6efe80b88..a7aaa73d07 100644 --- a/plugins/asn1/Makefile.nmake +++ b/plugins/asn1/Makefile.nmake @@ -12,7 +12,7 @@ include Makefile.common CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) -LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) +LDFLAGS = $(PLUGIN_LDFLAGS) !IFDEF ENABLE_LIBWIRESHARK LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake index da1a418569..d2b9333dba 100644 --- a/plugins/mate/Makefile.nmake +++ b/plugins/mate/Makefile.nmake @@ -17,7 +17,7 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) /I$(LEMON)\ .c.obj:: $(CC) $(CFLAGS) -Fdmate.pdb -c $< -LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) +LDFLAGS = $(PLUGIN_LDFLAGS) !IFDEF ENABLE_LIBWIRESHARK LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib diff --git a/plugins/megaco/Makefile.nmake b/plugins/megaco/Makefile.nmake index e6efe80b88..a7aaa73d07 100644 --- a/plugins/megaco/Makefile.nmake +++ b/plugins/megaco/Makefile.nmake @@ -12,7 +12,7 @@ include Makefile.common CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) -LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) +LDFLAGS = $(PLUGIN_LDFLAGS) !IFDEF ENABLE_LIBWIRESHARK LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib diff --git a/plugins/mgcp/Makefile.nmake b/plugins/mgcp/Makefile.nmake index e6efe80b88..a7aaa73d07 100644 --- a/plugins/mgcp/Makefile.nmake +++ b/plugins/mgcp/Makefile.nmake @@ -12,7 +12,7 @@ include Makefile.common CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) -LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) +LDFLAGS = $(PLUGIN_LDFLAGS) !IFDEF ENABLE_LIBWIRESHARK LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib -- cgit v1.2.3