diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2007-02-26 20:39:38 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2007-02-26 20:39:38 +0000 |
| commit | cf13f56dc8a74bd47e60f3ff37664c8321db715c (patch) | |
| tree | 2214c5d0d85f5ee75c0551edcf0182db2baf6ad4 /plugins | |
| parent | c7fd37e49c0d684b57e739b1c90f67c7978e30b6 (diff) | |
| download | wireshark-cf13f56dc8a74bd47e60f3ff37664c8321db715c.tar.gz | |
-Add the compiler version to the plugin resource
-Remove the SPECIAL_BUILD tag
-Set to OS type to NT_WINDOWS32
svn path=/trunk/; revision=20934
Diffstat (limited to 'plugins')
42 files changed, 108 insertions, 64 deletions
diff --git a/plugins/agentx/Makefile.nmake b/plugins/agentx/Makefile.nmake index e6efe80b88..c280a82517 100644 --- a/plugins/agentx/Makefile.nmake +++ b/plugins/agentx/Makefile.nmake @@ -35,6 +35,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/agentx/plugin.rc.in b/plugins/agentx/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/agentx/plugin.rc.in +++ b/plugins/agentx/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/artnet/Makefile.nmake b/plugins/artnet/Makefile.nmake index e6efe80b88..c280a82517 100644 --- a/plugins/artnet/Makefile.nmake +++ b/plugins/artnet/Makefile.nmake @@ -35,6 +35,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/artnet/plugin.rc.in b/plugins/artnet/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/artnet/plugin.rc.in +++ b/plugins/artnet/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake index 5ca3f9578f..a14b3f25a6 100644 --- a/plugins/asn1/Makefile.nmake +++ b/plugins/asn1/Makefile.nmake @@ -35,6 +35,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/asn1/plugin.rc.in b/plugins/asn1/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/asn1/plugin.rc.in +++ b/plugins/asn1/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/ciscosm/Makefile.nmake b/plugins/ciscosm/Makefile.nmake index e6efe80b88..c280a82517 100644 --- a/plugins/ciscosm/Makefile.nmake +++ b/plugins/ciscosm/Makefile.nmake @@ -35,6 +35,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/ciscosm/plugin.rc.in b/plugins/ciscosm/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/ciscosm/plugin.rc.in +++ b/plugins/ciscosm/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake index e6efe80b88..c280a82517 100644 --- a/plugins/docsis/Makefile.nmake +++ b/plugins/docsis/Makefile.nmake @@ -35,6 +35,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/docsis/plugin.rc.in b/plugins/docsis/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/docsis/plugin.rc.in +++ b/plugins/docsis/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/enttec/Makefile.nmake b/plugins/enttec/Makefile.nmake index e6efe80b88..c280a82517 100644 --- a/plugins/enttec/Makefile.nmake +++ b/plugins/enttec/Makefile.nmake @@ -35,6 +35,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/enttec/plugin.rc.in b/plugins/enttec/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/enttec/plugin.rc.in +++ b/plugins/enttec/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake index e6efe80b88..c280a82517 100644 --- a/plugins/gryphon/Makefile.nmake +++ b/plugins/gryphon/Makefile.nmake @@ -35,6 +35,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/gryphon/plugin.rc.in b/plugins/gryphon/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/gryphon/plugin.rc.in +++ b/plugins/gryphon/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake index e6efe80b88..c280a82517 100644 --- a/plugins/irda/Makefile.nmake +++ b/plugins/irda/Makefile.nmake @@ -35,6 +35,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/irda/plugin.rc.in b/plugins/irda/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/irda/plugin.rc.in +++ b/plugins/irda/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/lwres/Makefile.nmake b/plugins/lwres/Makefile.nmake index e6efe80b88..c280a82517 100644 --- a/plugins/lwres/Makefile.nmake +++ b/plugins/lwres/Makefile.nmake @@ -35,6 +35,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/lwres/plugin.rc.in b/plugins/lwres/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/lwres/plugin.rc.in +++ b/plugins/lwres/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake index 382876700a..ba8d6e5562 100644 --- a/plugins/mate/Makefile.nmake +++ b/plugins/mate/Makefile.nmake @@ -40,6 +40,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/mate/plugin.rc.in b/plugins/mate/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/mate/plugin.rc.in +++ b/plugins/mate/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/megaco/Makefile.nmake b/plugins/megaco/Makefile.nmake index a7aaa73d07..892f830c02 100644 --- a/plugins/megaco/Makefile.nmake +++ b/plugins/megaco/Makefile.nmake @@ -35,6 +35,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/megaco/plugin.rc.in b/plugins/megaco/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/megaco/plugin.rc.in +++ b/plugins/megaco/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/mgcp/Makefile.nmake b/plugins/mgcp/Makefile.nmake index a7aaa73d07..892f830c02 100644 --- a/plugins/mgcp/Makefile.nmake +++ b/plugins/mgcp/Makefile.nmake @@ -35,6 +35,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/mgcp/plugin.rc.in b/plugins/mgcp/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/mgcp/plugin.rc.in +++ b/plugins/mgcp/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/opsi/Makefile.nmake b/plugins/opsi/Makefile.nmake index e6efe80b88..c280a82517 100644 --- a/plugins/opsi/Makefile.nmake +++ b/plugins/opsi/Makefile.nmake @@ -35,6 +35,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/opsi/plugin.rc.in b/plugins/opsi/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/opsi/plugin.rc.in +++ b/plugins/opsi/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/pcli/Makefile.nmake b/plugins/pcli/Makefile.nmake index e6efe80b88..c280a82517 100644 --- a/plugins/pcli/Makefile.nmake +++ b/plugins/pcli/Makefile.nmake @@ -35,6 +35,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/pcli/plugin.rc.in b/plugins/pcli/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/pcli/plugin.rc.in +++ b/plugins/pcli/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/profinet/Makefile.nmake b/plugins/profinet/Makefile.nmake index e6efe80b88..c280a82517 100644 --- a/plugins/profinet/Makefile.nmake +++ b/plugins/profinet/Makefile.nmake @@ -35,6 +35,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/profinet/plugin.rc.in b/plugins/profinet/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/profinet/plugin.rc.in +++ b/plugins/profinet/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/rlm/Makefile.nmake b/plugins/rlm/Makefile.nmake index e6efe80b88..c280a82517 100644 --- a/plugins/rlm/Makefile.nmake +++ b/plugins/rlm/Makefile.nmake @@ -35,6 +35,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/rlm/plugin.rc.in b/plugins/rlm/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/rlm/plugin.rc.in +++ b/plugins/rlm/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/rtnet/Makefile.nmake b/plugins/rtnet/Makefile.nmake index e6efe80b88..c280a82517 100644 --- a/plugins/rtnet/Makefile.nmake +++ b/plugins/rtnet/Makefile.nmake @@ -35,6 +35,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/rtnet/plugin.rc.in b/plugins/rtnet/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/rtnet/plugin.rc.in +++ b/plugins/rtnet/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/rudp/Makefile.nmake b/plugins/rudp/Makefile.nmake index e6efe80b88..c280a82517 100644 --- a/plugins/rudp/Makefile.nmake +++ b/plugins/rudp/Makefile.nmake @@ -35,6 +35,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/rudp/plugin.rc.in b/plugins/rudp/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/rudp/plugin.rc.in +++ b/plugins/rudp/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/sbus/Makefile.nmake b/plugins/sbus/Makefile.nmake index e6efe80b88..c280a82517 100644 --- a/plugins/sbus/Makefile.nmake +++ b/plugins/sbus/Makefile.nmake @@ -35,6 +35,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/sbus/plugin.rc.in b/plugins/sbus/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/sbus/plugin.rc.in +++ b/plugins/sbus/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/stats_tree/Makefile.nmake b/plugins/stats_tree/Makefile.nmake index 4f5a06ffc5..c8eae71bb6 100644 --- a/plugins/stats_tree/Makefile.nmake +++ b/plugins/stats_tree/Makefile.nmake @@ -1,3 +1,5 @@ +# Makefile.nmake +# nmake file for stats_tree plugin # # $Id$ # @@ -9,7 +11,7 @@ include Makefile.common CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) - + .c.obj:: $(CC) $(CFLAGS) -Fdstats_tree.pdb -c $< @@ -34,6 +36,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/stats_tree/plugin.rc.in b/plugins/stats_tree/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/stats_tree/plugin.rc.in +++ b/plugins/stats_tree/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" diff --git a/plugins/v5ua/Makefile.nmake b/plugins/v5ua/Makefile.nmake index e6efe80b88..c280a82517 100644 --- a/plugins/v5ua/Makefile.nmake +++ b/plugins/v5ua/Makefile.nmake @@ -35,6 +35,7 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ -e s/@PACKAGE@/$(PACKAGE)/ \ -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ < plugin.rc.in > $@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) diff --git a/plugins/v5ua/plugin.rc.in b/plugins/v5ua/plugin.rc.in index e394a4fd40..72b4de0775 100644 --- a/plugins/v5ua/plugin.rc.in +++ b/plugins/v5ua/plugin.rc.in @@ -5,11 +5,11 @@ VS_VERSION_INFO VERSIONINFO PRODUCTVERSION @RC_VERSION@,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD+VS_FF_DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG #else - FILEFLAGS VS_FF_PRERELEASE+VS_FF_SPECIALBUILD + FILEFLAGS VS_FF_PRERELEASE #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN BLOCK "StringFileInfo" @@ -24,6 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" |