diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-03-02 18:57:35 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-03-02 18:57:35 +0000 |
| commit | 07e5df616e4ad5d5f464e2be167947c08197af14 (patch) | |
| tree | df069aabd4186cdc53e23776144940b676982bad /plugins/giop | |
| parent | e18f0f79dab3956b53ad19b3fa59f1afc7dc66b1 (diff) | |
Disable manifest building for our DLLs. This attempts to fix bug 3272.
svn path=/trunk/; revision=27579
Diffstat (limited to 'plugins/giop')
| -rw-r--r-- | plugins/giop/Makefile.nmake | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake index f4f6e30ebf..13eaf65a6a 100644 --- a/plugins/giop/Makefile.nmake +++ b/plugins/giop/Makefile.nmake @@ -9,7 +9,7 @@ include ..\..\config.nmake CFLAGS=/DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) -LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) +LDFLAGS = $(PLUGIN_LDFLAGS) !IFDEF ENABLE_LIBWIRESHARK LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib @@ -22,30 +22,18 @@ all : cosnaming.dll coseventcomm.dll tango.dll parlay.dll 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) -!IF $(MSC_VER_REQUIRED) >= 1400 - mt.exe -nologo -manifest "cosnaming.dll.manifest" -outputresource:cosnaming.dll;2 -!ENDIF 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) -!IF $(MSC_VER_REQUIRED) >= 1400 - mt.exe -nologo -manifest "coseventcomm.dll.manifest" -outputresource:coseventcomm.dll;2 -!ENDIF tango.dll tango.exp tango.lib : packet-tango.obj $(LINK_PLUGIN_WITH) link -dll /out:tango.dll $(LDFLAGS) packet-tango.obj $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) -!IF $(MSC_VER_REQUIRED) >= 1400 - mt.exe -nologo -manifest "tango.dll.manifest" -outputresource:tango.dll;2 -!ENDIF parlay.dll parlay.exp parlay.lib : packet-parlay.obj $(LINK_PLUGIN_WITH) link -dll /out:parlay.dll $(LDFLAGS) packet-parlay.obj $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) -!IF $(MSC_VER_REQUIRED) >= 1400 - mt.exe -nologo -manifest "parlay.dll.manifest" -outputresource:parlay.dll;2 -!ENDIF !ENDIF |