From 8bfa9de5d6c6211a636b0ecc8f86c4a79dccca49 Mon Sep 17 00:00:00 2001 From: ulfl Date: Mon, 2 Feb 2009 23:09:36 +0000 Subject: [PATCH] add missing mt.exe calls, to include manifest files into exe / dll files git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27357 f5534014-38df-0310-8fa8-9805f1628bb7 --- packaging/u3/tools/makefile.nmake | 3 +++ packaging/u3/win32/makefile.nmake | 3 +++ plugins/agentx/Makefile.nmake | 3 +++ plugins/artnet/Makefile.nmake | 3 +++ plugins/asn1/Makefile.nmake | 3 +++ plugins/ciscosm/Makefile.nmake | 3 +++ plugins/docsis/Makefile.nmake | 3 +++ plugins/easy_codec/Makefile.nmake | 3 +++ plugins/enttec/Makefile.nmake | 3 +++ plugins/ethercat/Makefile.nmake | 3 +++ plugins/giop/Makefile.nmake | 12 ++++++++++++ plugins/gryphon/Makefile.nmake | 3 +++ plugins/infiniband/Makefile.nmake | 3 +++ plugins/irda/Makefile.nmake | 3 +++ plugins/lwres/Makefile.nmake | 3 +++ plugins/m2m/Makefile.nmake | 3 +++ plugins/mate/Makefile.nmake | 3 +++ plugins/opcua/Makefile.nmake | 3 +++ plugins/opsi/Makefile.nmake | 3 +++ plugins/pcli/Makefile.nmake | 3 +++ plugins/profinet/Makefile.nmake | 3 +++ plugins/rlm/Makefile.nmake | 3 +++ plugins/rtnet/Makefile.nmake | 3 +++ plugins/rudp/Makefile.nmake | 3 +++ plugins/sbus/Makefile.nmake | 3 +++ plugins/sercosiii/Makefile.nmake | 3 +++ plugins/stats_tree/Makefile.nmake | 3 +++ plugins/tpg/Makefile.nmake | 3 +++ plugins/unistim/Makefile.nmake | 3 +++ plugins/v5ua/Makefile.nmake | 3 +++ plugins/wimax/Makefile.nmake | 3 +++ plugins/wimaxasncp/Makefile.nmake | 3 +++ 32 files changed, 105 insertions(+) diff --git a/packaging/u3/tools/makefile.nmake b/packaging/u3/tools/makefile.nmake index babf72bee0..8acdab6a87 100644 --- a/packaging/u3/tools/makefile.nmake +++ b/packaging/u3/tools/makefile.nmake @@ -24,6 +24,9 @@ all: utest.exe libgcrypt-11.dll libgpg-error-0.dll utest.exe: uuid.obj sysdep.obj utest.obj @echo Linking $@ $(LINK) /OUT:utest.exe $(guiflags) $(LDFLAGS) utest.obj uuid.obj sysdep.obj $(GNUTLS_LIBS) $(guilibsdll) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "utest.exe.manifest" -outputresource:utest.exe;1 +!ENDIF libgcrypt-11.dll libgpg-error-0.dll: $(GNUTLS_DIR)\bin\$@ $(COPY) $(GNUTLS_DIR)\bin\$@ $@ diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake index 4c30453366..8e0e2e31ea 100644 --- a/packaging/u3/win32/makefile.nmake +++ b/packaging/u3/win32/makefile.nmake @@ -105,6 +105,9 @@ u3util_LIBS= user32.lib shell32.lib u3util.exe: u3util.obj @echo Linking $@ $(LINK) /OUT:u3util.exe $(guiflags) $(LDFLAGS) u3util.obj $(u3util_LIBS) $(guilibsdll) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "u3util.exe.manifest" -outputresource:u3util.exe;1 +!ENDIF clean: cd ../tools diff --git a/plugins/agentx/Makefile.nmake b/plugins/agentx/Makefile.nmake index 3cf4dc5b3e..acc863edc3 100644 --- a/plugins/agentx/Makefile.nmake +++ b/plugins/agentx/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/artnet/Makefile.nmake b/plugins/artnet/Makefile.nmake index 3cf4dc5b3e..acc863edc3 100644 --- a/plugins/artnet/Makefile.nmake +++ b/plugins/artnet/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake index 6bdc36773d..cc7beb49e4 100644 --- a/plugins/asn1/Makefile.nmake +++ b/plugins/asn1/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/ciscosm/Makefile.nmake b/plugins/ciscosm/Makefile.nmake index 3cf4dc5b3e..acc863edc3 100644 --- a/plugins/ciscosm/Makefile.nmake +++ b/plugins/ciscosm/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake index 3cf4dc5b3e..acc863edc3 100644 --- a/plugins/docsis/Makefile.nmake +++ b/plugins/docsis/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/easy_codec/Makefile.nmake b/plugins/easy_codec/Makefile.nmake index 3d04e32b34..56c0c86515 100644 --- a/plugins/easy_codec/Makefile.nmake +++ b/plugins/easy_codec/Makefile.nmake @@ -49,6 +49,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(CODEC_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF easy_codec_plugin.obj : easy_codec_plugin.c $(CC) $(CFLAGS) -Fd$(PLUGIN_NAME).pdb -c easy_codec_plugin.c diff --git a/plugins/enttec/Makefile.nmake b/plugins/enttec/Makefile.nmake index 3cf4dc5b3e..acc863edc3 100644 --- a/plugins/enttec/Makefile.nmake +++ b/plugins/enttec/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/ethercat/Makefile.nmake b/plugins/ethercat/Makefile.nmake index 810e87397e..fb5ff41150 100644 --- a/plugins/ethercat/Makefile.nmake +++ b/plugins/ethercat/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) $(DISSECTOR_INCLUDES) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake index ee8bdf777c..f4f6e30ebf 100644 --- a/plugins/giop/Makefile.nmake +++ b/plugins/giop/Makefile.nmake @@ -22,18 +22,30 @@ 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 diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake index 3cf4dc5b3e..acc863edc3 100644 --- a/plugins/gryphon/Makefile.nmake +++ b/plugins/gryphon/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/infiniband/Makefile.nmake b/plugins/infiniband/Makefile.nmake index 40f8f82f7f..f83e2b6d7f 100644 --- a/plugins/infiniband/Makefile.nmake +++ b/plugins/infiniband/Makefile.nmake @@ -41,6 +41,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake index 3cf4dc5b3e..acc863edc3 100644 --- a/plugins/irda/Makefile.nmake +++ b/plugins/irda/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/lwres/Makefile.nmake b/plugins/lwres/Makefile.nmake index 3cf4dc5b3e..acc863edc3 100644 --- a/plugins/lwres/Makefile.nmake +++ b/plugins/lwres/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/m2m/Makefile.nmake b/plugins/m2m/Makefile.nmake index ee662b26ab..6801cf07ea 100644 --- a/plugins/m2m/Makefile.nmake +++ b/plugins/m2m/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake index fdce120155..9e0e98e1fa 100644 --- a/plugins/mate/Makefile.nmake +++ b/plugins/mate/Makefile.nmake @@ -48,6 +48,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/opcua/Makefile.nmake b/plugins/opcua/Makefile.nmake index 3cf4dc5b3e..acc863edc3 100644 --- a/plugins/opcua/Makefile.nmake +++ b/plugins/opcua/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/opsi/Makefile.nmake b/plugins/opsi/Makefile.nmake index 3cf4dc5b3e..acc863edc3 100644 --- a/plugins/opsi/Makefile.nmake +++ b/plugins/opsi/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/pcli/Makefile.nmake b/plugins/pcli/Makefile.nmake index 3cf4dc5b3e..acc863edc3 100644 --- a/plugins/pcli/Makefile.nmake +++ b/plugins/pcli/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/profinet/Makefile.nmake b/plugins/profinet/Makefile.nmake index 3cf4dc5b3e..acc863edc3 100644 --- a/plugins/profinet/Makefile.nmake +++ b/plugins/profinet/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/rlm/Makefile.nmake b/plugins/rlm/Makefile.nmake index 3cf4dc5b3e..acc863edc3 100644 --- a/plugins/rlm/Makefile.nmake +++ b/plugins/rlm/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/rtnet/Makefile.nmake b/plugins/rtnet/Makefile.nmake index 3cf4dc5b3e..acc863edc3 100644 --- a/plugins/rtnet/Makefile.nmake +++ b/plugins/rtnet/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/rudp/Makefile.nmake b/plugins/rudp/Makefile.nmake index 3cf4dc5b3e..acc863edc3 100644 --- a/plugins/rudp/Makefile.nmake +++ b/plugins/rudp/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/sbus/Makefile.nmake b/plugins/sbus/Makefile.nmake index 3cf4dc5b3e..acc863edc3 100644 --- a/plugins/sbus/Makefile.nmake +++ b/plugins/sbus/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/sercosiii/Makefile.nmake b/plugins/sercosiii/Makefile.nmake index 3cf4dc5b3e..acc863edc3 100644 --- a/plugins/sercosiii/Makefile.nmake +++ b/plugins/sercosiii/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/stats_tree/Makefile.nmake b/plugins/stats_tree/Makefile.nmake index 89fc5c9376..4d4e0ce711 100644 --- a/plugins/stats_tree/Makefile.nmake +++ b/plugins/stats_tree/Makefile.nmake @@ -42,6 +42,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF !ENDIF diff --git a/plugins/tpg/Makefile.nmake b/plugins/tpg/Makefile.nmake index d9112f14e3..45ceeb0017 100644 --- a/plugins/tpg/Makefile.nmake +++ b/plugins/tpg/Makefile.nmake @@ -32,6 +32,9 @@ OBJECTS=packet-mate.obj\ mate.dll mate.exp mate.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) link -dll /out:mate.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "mate.dll.manifest" -outputresource:mate.dll;2 +!ENDIF !ENDIF diff --git a/plugins/unistim/Makefile.nmake b/plugins/unistim/Makefile.nmake index 3cf4dc5b3e..acc863edc3 100644 --- a/plugins/unistim/Makefile.nmake +++ b/plugins/unistim/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/v5ua/Makefile.nmake b/plugins/v5ua/Makefile.nmake index 3cf4dc5b3e..acc863edc3 100644 --- a/plugins/v5ua/Makefile.nmake +++ b/plugins/v5ua/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/wimax/Makefile.nmake b/plugins/wimax/Makefile.nmake index 37220cbb5c..1e81fc2474 100644 --- a/plugins/wimax/Makefile.nmake +++ b/plugins/wimax/Makefile.nmake @@ -44,6 +44,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a diff --git a/plugins/wimaxasncp/Makefile.nmake b/plugins/wimaxasncp/Makefile.nmake index dc3f07e5f6..2398309a6f 100644 --- a/plugins/wimaxasncp/Makefile.nmake +++ b/plugins/wimaxasncp/Makefile.nmake @@ -45,6 +45,9 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) $(RESOURCE) +!IF $(MSC_VER_REQUIRED) >= 1400 + mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2 +!ENDIF # # Build plugin.c, which contains the plugin version[] string, a -- 2.34.1