X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d8910e457977b02d430ad582fcf4679146118876..7f3450784cc9c696f269ff1bfde3623c180d4b58:/src/msw/version.rc

diff --git a/src/msw/version.rc b/src/msw/version.rc
index 0a8d7284cc..6a294e5dab 100644
--- a/src/msw/version.rc
+++ b/src/msw/version.rc
@@ -6,7 +6,7 @@
 // Created:     09.07.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin
-// Licence:     wxWindows license
+// Licence:     wxWidgets license
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/version.h"
@@ -21,15 +21,22 @@
 
 #ifdef _DEBUG
     #define DLL_FLAGS 0x1L
-    #define DLL_SUFFIX "d"
 #else
     #define DLL_FLAGS 0x0L
-    #define DLL_SUFFIX ""
 #endif
 
+#ifdef _UNICODE
+    #define LANG "04090000"
+#else
+    #define LANG "040904b0"
+#endif
+
+#define STRINGIZE0(x) #x
+#define STRINGIZE(x)  STRINGIZE0(x)
+
 1 VERSIONINFO
- FILEVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxBETA_NUMBER
- PRODUCTVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxBETA_NUMBER
+ FILEVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxSUBRELEASE_NUMBER
+ PRODUCTVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxSUBRELEASE_NUMBER
  FILEFLAGSMASK 0x3fL
  FILEFLAGS DLL_FLAGS
  FILEOS 0x40004L // VOS_NT_WINDOWS32
@@ -39,34 +46,18 @@ BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         // US English Ascii; see http://msdn.microsoft.com/library/psdk/winui/rc_3rxn.htm for codes
-        BLOCK "04090000" 
-        BEGIN
-            VALUE "Comments", "wxWindows cross-platform GUI framework\0"
-            VALUE "CompanyName", "wxWindows development team\0"
-            VALUE "FileDescription", "wxWindows for MSW\0"
-            VALUE "FileVersion", "wxWindows Library " wxVERSION_NUM_DOT_STRING "\0"
-            VALUE "InternalName", "wxMSW\0"
-            VALUE "LegalCopyright", "Copyright © 1993-2004 wxWindows development team\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "wxmsw" wxVERSION_NUM_STRING DLL_SUFFIX ".dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "wxWindows\0"
-            VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0"
-            VALUE "SpecialBuild", "\0"
-        END
-        //US English Unicode; see http://msdn.microsoft.com/library/psdk/winui/rc_3rxn.htm for codes
-        BLOCK "040904b0"
+        BLOCK LANG
         BEGIN
-            VALUE "Comments", "wxWindows cross-platform GUI framework\0"
-            VALUE "CompanyName", "wxWindows development team\0"
-            VALUE "FileDescription", "wxWindows for MSW\0"
-            VALUE "FileVersion", "wxWindows Library " wxVERSION_NUM_DOT_STRING "\0"
+            VALUE "Comments", "wxWidgets cross-platform GUI framework\0"
+            VALUE "CompanyName", "wxWidgets development team\0"
+            VALUE "FileDescription", "wxWidgets for MSW\0"
+            VALUE "FileVersion", "wxWidgets Library " wxVERSION_NUM_DOT_STRING "\0"
             VALUE "InternalName", "wxMSW\0"
-            VALUE "LegalCopyright", "Copyright © 1993-2004 wxWindows development team\0"
+            VALUE "LegalCopyright", "Copyright © 1993-2006 wxWidgets development team\0"
             VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "wxmsw" wxVERSION_NUM_STRING DLL_SUFFIX ".dll\0"
+            VALUE "OriginalFilename", STRINGIZE(WXDLLNAME) ".dll\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "wxWindows\0"
+            VALUE "ProductName", "wxWidgets\0"
             VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0"
             VALUE "SpecialBuild", "\0"
         END