aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/rtnet/Makefile.nmake
diff options
context:
space:
mode:
authorLars Roland <Lars.Roland@gmx.net>2005-03-05 06:28:10 +0000
committerLars Roland <Lars.Roland@gmx.net>2005-03-05 06:28:10 +0000
commit00273300e721999ac67a4ce66dab80fed6a1314f (patch)
treeac2c8b87fdd4dc989c3ef1d3b646f7700ba7626c /plugins/rtnet/Makefile.nmake
parent1a7b3ec1439203e3bea3381dfb31b4357758b4c3 (diff)
Preparations for dropping the old plugin api.
Introduce a new init routine for plugins, which does not take the plugin api table as an argument and allows etheral to distinguish between plugins using the old and the new api. Update README.plugins accordingly Change all g_warnings() in epan/plugins.c to report_failue(). On windows we do not have a log console open while loading the plugins, because a log console cannot be opened before the prefs have been read. Thus g_warnings() does not work for reporting problems with plugins. svn path=/trunk/; revision=13596
Diffstat (limited to 'plugins/rtnet/Makefile.nmake')
-rw-r--r--plugins/rtnet/Makefile.nmake7
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/rtnet/Makefile.nmake b/plugins/rtnet/Makefile.nmake
index c91e3a98a1..ca1ff06ee8 100644
--- a/plugins/rtnet/Makefile.nmake
+++ b/plugins/rtnet/Makefile.nmake
@@ -11,12 +11,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=packet-rtnet.obj
@@ -24,6 +21,8 @@ rtnet.dll rtnet.exp rtnet.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
link -dll /out:rtnet.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS)
+!ENDIF
+
clean:
rm -f $(OBJECTS) rtnet.dll rtnet.exp rtnet.lib *.pdb