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

diff --git a/packaging/u3/tools/makefile.nmake b/packaging/u3/tools/makefile.nmake
index babf72bee0ef8b167fb20a76c370aad6afb8325c..8acdab6a87f8252f153ddd352c172729cebc1bf9 100644 (file)
--- 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 4c304533668e5938abb5e457f770da9372e43658..8e0e2e31ea6f6c3e9c5b47361b1263226b279888 100644 (file)
--- 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 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..acc863edc396d9f106148e7828cec49b34e17eea 100644 (file)
--- 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 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..acc863edc396d9f106148e7828cec49b34e17eea 100644 (file)
--- 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 6bdc36773d1afbaa7093ea8862e7378dfecd9e2e..cc7beb49e4c02e4a2028eac136e1906141625908 100644 (file)
--- 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 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..acc863edc396d9f106148e7828cec49b34e17eea 100644 (file)
--- 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 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..acc863edc396d9f106148e7828cec49b34e17eea 100644 (file)
--- 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 3d04e32b3433a487027b8388b395020de51da1cd..56c0c86515878623ca39e25fd6dc826e097a8a45 100644 (file)
--- 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 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..acc863edc396d9f106148e7828cec49b34e17eea 100644 (file)
--- 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 810e87397e9727c0cfcc542d024a3fb697ed8738..fb5ff41150693efecada64c27bc1cc984f74f464 100644 (file)
--- 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 ee8bdf777c6d39cee53cc0238b5c5265b7bf4cab..f4f6e30ebf006e515b384e6909716d026527090c 100644 (file)
--- 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 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..acc863edc396d9f106148e7828cec49b34e17eea 100644 (file)
--- 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 40f8f82f7fc1dd9c3b91310120a42926a46292b1..f83e2b6d7f7ff2ba89a0743b436638ab34993663 100644 (file)
--- 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 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..acc863edc396d9f106148e7828cec49b34e17eea 100644 (file)
--- 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 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..acc863edc396d9f106148e7828cec49b34e17eea 100644 (file)
--- 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 ee662b26ab406c58e8e79988295fb57661c56118..6801cf07ea15152d054fa6e5beeb121a3bfdc304 100644 (file)
--- 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 fdce120155b8c87cbaeb6a6db8de0ee5826e7847..9e0e98e1fafed8a84715da7973b93890399e942e 100644 (file)
--- 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 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..acc863edc396d9f106148e7828cec49b34e17eea 100644 (file)
--- 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 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..acc863edc396d9f106148e7828cec49b34e17eea 100644 (file)
--- 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 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..acc863edc396d9f106148e7828cec49b34e17eea 100644 (file)
--- 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 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..acc863edc396d9f106148e7828cec49b34e17eea 100644 (file)
--- 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 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..acc863edc396d9f106148e7828cec49b34e17eea 100644 (file)
--- 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 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..acc863edc396d9f106148e7828cec49b34e17eea 100644 (file)
--- 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 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..acc863edc396d9f106148e7828cec49b34e17eea 100644 (file)
--- 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 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..acc863edc396d9f106148e7828cec49b34e17eea 100644 (file)
--- 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 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..acc863edc396d9f106148e7828cec49b34e17eea 100644 (file)
--- 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 89fc5c9376e67622362de7a21158af5863ac653f..4d4e0ce71118eb7052d02de8cafb326b8a754273 100644 (file)
--- 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 d9112f14e3e51022998fe1ed73141d3cf61468ad..45ceeb001793006cb10f302801342fb23df043d8 100644 (file)
--- 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 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..acc863edc396d9f106148e7828cec49b34e17eea 100644 (file)
--- 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 3cf4dc5b3e26a4f8611a22136be14f951e9f9075..acc863edc396d9f106148e7828cec49b34e17eea 100644 (file)
--- 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 37220cbb5ca22f27dd9ca8427f9a5cbeb8d679b3..1e81fc24746579aa3f890106722c54947cfd4141 100644 (file)
--- 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 dc3f07e5f66fd12d263ecf918993cbebbc101a0f..2398309a6fdef1f0874f458f6750e4a2a5b3e221 100644 (file)
--- 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