diff options
| author | lroland <lroland@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-05-31 21:34:14 +0000 |
|---|---|---|
| committer | lroland <lroland@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-05-31 21:34:14 +0000 |
| commit | a061422d65b944d3bdfc8b6d51ac45d1b6fa4e88 (patch) | |
| tree | 0100a18376071a4360989ecd0854d806e8efc798 | |
| parent | a79bffa314bdb5114c28b0b161c3b21bd025d74f (diff) | |
Add a note to config.nmake that it is required to set ENABLE_LIBETHEREAL to get plugin support in Ethereal.
Change Makefile.nmake of the stats_tree plugin to the current scheme.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14512 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | config.nmake | 2 | ||||
| -rw-r--r-- | plugins/stats_tree/Makefile.nmake | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/config.nmake b/config.nmake index cac60c6f27..133bcc69b3 100644 --- a/config.nmake +++ b/config.nmake @@ -228,7 +228,7 @@ MAKENSIS_MODERN_UI=USE #HHC="C:/Program Files/HTML Help Workshop/hhc.exe" # If you don't want to build libethereal.dll, you should comment out the -# following line +# following line. (Note: for plugin support this option must stay activated) ENABLE_LIBETHEREAL=USE !IFDEF ENABLE_LIBETHEREAL diff --git a/plugins/stats_tree/Makefile.nmake b/plugins/stats_tree/Makefile.nmake index c56153697d..6d52522bab 100644 --- a/plugins/stats_tree/Makefile.nmake +++ b/plugins/stats_tree/Makefile.nmake @@ -15,12 +15,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) -!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL +!IFDEF ENABLE_LIBETHEREAL LINK_PLUGIN_WITH=..\..\epan\libethereal.lib CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS) -!ELSE -LINK_PLUGIN_WITH=..\plugin_api.obj -!ENDIF OBJECTS=http_stats_tree.obj stats_tree_plugin.obj @@ -28,6 +25,8 @@ stats_tree.dll stats_tree.exp stats_tree.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) link -dll /out:stats_tree.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) +!ENDIF + clean: rm -f $(OBJECTS) stats_tree.dll stats_tree.exp stats_tree.lib *.pdb |