diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-09-29 19:30:10 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-09-29 19:30:10 +0000 |
| commit | 444119dbcb8228e5a47b6e00f7932aa04759b13d (patch) | |
| tree | 6503a9fd9f6fe04381549206152314fc9dd5454b /plugins/giop | |
| parent | 28a6169ff7a93618819a83dd03695b8f8d41f8a8 (diff) | |
From Lars Roland: add an option to link plugins with libethereal rather
than using the plugin address table.
svn path=/trunk/; revision=12139
Diffstat (limited to 'plugins/giop')
| -rw-r--r-- | plugins/giop/Makefile.nmake | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake index eb65154b45..35be3bffa5 100644 --- a/plugins/giop/Makefile.nmake +++ b/plugins/giop/Makefile.nmake @@ -9,16 +9,25 @@ include ..\..\config.nmake 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) + +!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL +LINK_PLUGIN_WITH=..\..\epan\libethereal.lib +CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS) +!ELSE +LINK_PLUGIN_WITH=..\plugin_api.obj +!ENDIF + OBJECTS=packet-cosnaming.obj packet-coseventcomm.obj all : cosnaming.dll coseventcomm.dll -cosnaming.dll cosnaming.exp cosnaming.lib : packet-cosnaming.obj ..\plugin_api.obj - link -dll /out:cosnaming.dll packet-cosnaming.obj ..\plugin_api.obj \ +cosnaming.dll cosnaming.exp cosnaming.lib : packet-cosnaming.obj $(LINK_PLUGIN_WITH) + link -dll /out:cosnaming.dll $(LDFLAGS) packet-cosnaming.obj $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) -coseventcomm.dll coseventcomm.exp coseventcomm.lib : packet-coseventcomm.obj ..\plugin_api.obj - link -dll /out:coseventcomm.dll packet-coseventcomm.obj ..\plugin_api.obj \ +coseventcomm.dll coseventcomm.exp coseventcomm.lib : packet-coseventcomm.obj $(LINK_PLUGIN_WITH) + link -dll /out:coseventcomm.dll $(LDFLAGS) packet-coseventcomm.obj $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) clean: |