diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-05-09 10:03:41 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-05-09 10:03:41 +0000 |
| commit | 15af0f656fcd75bfcacb975476aab614e7ed8dd3 (patch) | |
| tree | 96fab6287a112ff9379ebf012a7a939884b62ec1 /gtk | |
| parent | b964421aec471b54755db1ab9ebc768467b6fdd5 (diff) | |
From Lars Roland: add support for building a libethereal.dll with MSVC:
add a config.nmake option to control whether to build
libethereal.dll or not;
remove "./wiretap" from PATH to prevent problems due to
wrongly-loaded files;
build dissector.lib with MSVC;
move "print.c" and "ps.c" to the dissector helpers, as "print.c"
imports variables from packet-frame.c and packet-data.c, which
are in libethereal;
move "g711.c" out of the dissector helpers, as they're used only
by Ethereal in a tap, not in Tethereal or in any dissector;
add a .def file for libethereal;
arrange to declare global variables exported from libethereal
with "__declspec(dllimport)" when building programs that import
those variables;
update the NSIS installer.
Make the "configure" script define ETH_VAR_IMPORT as "extern".
svn path=/trunk/; revision=10834
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/Makefile.nmake | 4 | ||||
| -rw-r--r-- | gtk/follow_dlg.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake index 74467c65e3..84c8c49086 100644 --- a/gtk/Makefile.nmake +++ b/gtk/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.72 2004/01/22 18:08:58 ulfl Exp $ +# $Id: Makefile.nmake,v 1.73 2004/05/09 10:03:40 guy Exp $ include ..\config.nmake @@ -11,7 +11,7 @@ CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap $(GTK_CFLAGS) \ /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \ /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \ /I$(PCAP_DIR)\include /I$(NET_SNMP_DIR)\include \ - /I$(NET_SNMP_DIR)\win32 /Zm800 -D_U_="" $(LOCAL_CFLAGS) + /I$(NET_SNMP_DIR)\win32 /Zm800 -D_U_="" -D_NEED_VAR_IMPORT_ $(LOCAL_CFLAGS) CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c index ebee4044f4..33fd895bd4 100644 --- a/gtk/follow_dlg.c +++ b/gtk/follow_dlg.c @@ -1,6 +1,6 @@ /* follow_dlg.c * - * $Id: follow_dlg.c,v 1.57 2004/04/21 00:48:22 obiot Exp $ + * $Id: follow_dlg.c,v 1.58 2004/05/09 10:03:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -107,8 +107,8 @@ static void follow_stream_om_client(GtkWidget * w, gpointer data); static void follow_stream_om_server(GtkWidget * w, gpointer data); -extern FILE *data_out_file; - +/* With MSVC and a libethereal.dll, we need a special declaration. */ +ETH_VAR_IMPORT FILE *data_out_file; #define E_FOLLOW_INFO_KEY "follow_info_key" |