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 /config.h.win32 | |
| parent | b964421aec471b54755db1ab9ebc768467b6fdd5 (diff) | |
| download | wireshark-15af0f656fcd75bfcacb975476aab614e7ed8dd3.tar.gz wireshark-15af0f656fcd75bfcacb975476aab614e7ed8dd3.tar.bz2 wireshark-15af0f656fcd75bfcacb975476aab614e7ed8dd3.zip | |
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 'config.h.win32')
| -rw-r--r-- | config.h.win32 | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/config.h.win32 b/config.h.win32 index eefdb9863e..d84d9ccc31 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -1,4 +1,4 @@ -/* $Id: config.h.win32,v 1.44 2004/05/06 20:48:35 obiot Exp $ */ +/* $Id: config.h.win32,v 1.45 2004/05/09 10:03:36 guy Exp $ */ /* config.h.win32 Generated manually. :-) */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -44,6 +44,16 @@ @HAVE_LIBPCAP@ @HAVE_PCAP_FINDALLDEVS@ @WPCAP_CONSTIFIED@ +@HAVE_LIBETHEREALDLL@ + +/* define macro for importing variables from an dll + * it depends on HAVE_LIBETHEREAL and _NEED_VAR_IMPORT_ + */ +#if defined (_NEED_VAR_IMPORT_) && defined (HAVE_LIBETHEREALDLL) +# define ETH_VAR_IMPORT __declspec(dllimport) extern +#else +# define ETH_VAR_IMPORT extern +#endif #define HAVE_NET_SNMP 1 #define HAVE_SOME_SNMP 1 @@ -118,6 +128,17 @@ /* Define to use the PCRE library */ @HAVE_PCRE@ +@HAVE_LIBETHEREALDLL@ + +/* define macro for importing variables from an dll + * it depends on HAVE_LIBETHEREAL and _NEED_VAR_IMPORT_ + */ +#if defined (_NEED_VAR_IMPORT_) && defined (HAVE_LIBETHEREALDLL) +# define ETH_VAR_IMPORT __declspec(dllimport) extern +#else +# define ETH_VAR_IMPORT extern +#endif + #ifndef WIN32 #define WIN32 1 #endif |