-Add the compiler version to the plugin resource
authorjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 26 Feb 2007 20:39:38 +0000 (20:39 +0000)
committerjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 26 Feb 2007 20:39:38 +0000 (20:39 +0000)
-Remove the SPECIAL_BUILD tag
-Set to OS type to NT_WINDOWS32

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20934 f5534014-38df-0310-8fa8-9805f1628bb7

42 files changed:
plugins/agentx/Makefile.nmake
plugins/agentx/plugin.rc.in
plugins/artnet/Makefile.nmake
plugins/artnet/plugin.rc.in
plugins/asn1/Makefile.nmake
plugins/asn1/plugin.rc.in
plugins/ciscosm/Makefile.nmake
plugins/ciscosm/plugin.rc.in
plugins/docsis/Makefile.nmake
plugins/docsis/plugin.rc.in
plugins/enttec/Makefile.nmake
plugins/enttec/plugin.rc.in
plugins/gryphon/Makefile.nmake
plugins/gryphon/plugin.rc.in
plugins/irda/Makefile.nmake
plugins/irda/plugin.rc.in
plugins/lwres/Makefile.nmake
plugins/lwres/plugin.rc.in
plugins/mate/Makefile.nmake
plugins/mate/plugin.rc.in
plugins/megaco/Makefile.nmake
plugins/megaco/plugin.rc.in
plugins/mgcp/Makefile.nmake
plugins/mgcp/plugin.rc.in
plugins/opsi/Makefile.nmake
plugins/opsi/plugin.rc.in
plugins/pcli/Makefile.nmake
plugins/pcli/plugin.rc.in
plugins/profinet/Makefile.nmake
plugins/profinet/plugin.rc.in
plugins/rlm/Makefile.nmake
plugins/rlm/plugin.rc.in
plugins/rtnet/Makefile.nmake
plugins/rtnet/plugin.rc.in
plugins/rudp/Makefile.nmake
plugins/rudp/plugin.rc.in
plugins/sbus/Makefile.nmake
plugins/sbus/plugin.rc.in
plugins/stats_tree/Makefile.nmake
plugins/stats_tree/plugin.rc.in
plugins/v5ua/Makefile.nmake
plugins/v5ua/plugin.rc.in

index e6efe80b887142f194c0df8e8b7f38361e91c19b..c280a8251772ae2ff23b1c6ae463b5eeef051e47 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index e6efe80b887142f194c0df8e8b7f38361e91c19b..c280a8251772ae2ff23b1c6ae463b5eeef051e47 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index 5ca3f9578fea932c822a4e09223d39734ace7ec9..a14b3f25a6b2e9904026f3cb17e507db68ea3c96 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index e6efe80b887142f194c0df8e8b7f38361e91c19b..c280a8251772ae2ff23b1c6ae463b5eeef051e47 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index e6efe80b887142f194c0df8e8b7f38361e91c19b..c280a8251772ae2ff23b1c6ae463b5eeef051e47 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index e6efe80b887142f194c0df8e8b7f38361e91c19b..c280a8251772ae2ff23b1c6ae463b5eeef051e47 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index e6efe80b887142f194c0df8e8b7f38361e91c19b..c280a8251772ae2ff23b1c6ae463b5eeef051e47 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index e6efe80b887142f194c0df8e8b7f38361e91c19b..c280a8251772ae2ff23b1c6ae463b5eeef051e47 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index e6efe80b887142f194c0df8e8b7f38361e91c19b..c280a8251772ae2ff23b1c6ae463b5eeef051e47 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index 382876700acb23339bc459458039d865366b95dd..ba8d6e5562838dca1980c683ad83ee72ade0211b 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index a7aaa73d078849e0415fc83f0705f9a9d5be52f2..892f830c02f5a1d359a4fe6de3e26261af0f423a 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index a7aaa73d078849e0415fc83f0705f9a9d5be52f2..892f830c02f5a1d359a4fe6de3e26261af0f423a 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index e6efe80b887142f194c0df8e8b7f38361e91c19b..c280a8251772ae2ff23b1c6ae463b5eeef051e47 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index e6efe80b887142f194c0df8e8b7f38361e91c19b..c280a8251772ae2ff23b1c6ae463b5eeef051e47 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index e6efe80b887142f194c0df8e8b7f38361e91c19b..c280a8251772ae2ff23b1c6ae463b5eeef051e47 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index e6efe80b887142f194c0df8e8b7f38361e91c19b..c280a8251772ae2ff23b1c6ae463b5eeef051e47 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index e6efe80b887142f194c0df8e8b7f38361e91c19b..c280a8251772ae2ff23b1c6ae463b5eeef051e47 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index e6efe80b887142f194c0df8e8b7f38361e91c19b..c280a8251772ae2ff23b1c6ae463b5eeef051e47 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index e6efe80b887142f194c0df8e8b7f38361e91c19b..c280a8251772ae2ff23b1c6ae463b5eeef051e47 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index 4f5a06ffc5853c65bb5bc696d20ab0762a6250b1..c8eae71bb6f1f93d29d0d6f6a46d23b23a448665 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"
index e6efe80b887142f194c0df8e8b7f38361e91c19b..c280a8251772ae2ff23b1c6ae463b5eeef051e47 100644 (file)
@@ -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)
index e394a4fd401bd40aca426a52919f7fd22ec07900..72b4de07756ce09ff3a9550b2d4f8f7c588d4f1c 100644 (file)
@@ -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"