Use numeric values in VarFileInfo block.

This allows windres to compile it successfully and is probably the right thing to do for the SDK resource compiler as well (see #11055).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/version.rc b/src/msw/version.rc
index c3f51db8f59db2a02b4c515bd80745d05f475bf1..dc7fbe8c52f5acc25b604b89402bdb7f426f7b05 100644 (file)
--- a/src/msw/version.rc
+++ b/src/msw/version.rc
@@ -28,11 +28,13 @@
 // 0x0409 is US English, 0x04b0 is Unicode and 0x0000 is 7 bit ASCII. see
 // http://msdn.microsoft.com/en-us/library/aa381049(VS.85).aspx for the full
 // list of languages and charsets
 // 0x0409 is US English, 0x04b0 is Unicode and 0x0000 is 7 bit ASCII. see
 // http://msdn.microsoft.com/en-us/library/aa381049(VS.85).aspx for the full
 // list of languages and charsets

-#define LANG "0409"
+#define LANG 0x0409

 #ifdef _UNICODE
 #ifdef _UNICODE

-    #define CHARSET "04b0"
+    #define CHARSET 0x4b0
+    #define LANG_WITH_CHARSET "040904b0"

 #else
 #else

-    #define CHARSET "0000"
+    #define CHARSET 0
+    #define LANG_WITH_CHARSET "04090000"

 #endif
 
 1 VERSIONINFO
 #endif
 
 1 VERSIONINFO


@@ -46,7 +48,7 @@
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN

-        BLOCK LANG CHARSET
+        BLOCK LANG_WITH_CHARSET

         BEGIN
             VALUE "Comments", "wxWidgets cross-platform GUI framework\0"
             VALUE "CompanyName", "wxWidgets development team\0"
         BEGIN
             VALUE "Comments", "wxWidgets cross-platform GUI framework\0"
             VALUE "CompanyName", "wxWidgets development team\0"


@@ -62,11 +64,8 @@ BEGIN
             VALUE "SpecialBuild", "\0"
         END
     END
             VALUE "SpecialBuild", "\0"
         END
     END

-    // windres can't handle the syntax below for some reason (see #11055)
-#ifndef __GNUC__

     BLOCK "VarFileInfo"
     BEGIN
             VALUE "Translation", LANG, CHARSET
     END
     BLOCK "VarFileInfo"
     BEGIN
             VALUE "Translation", LANG, CHARSET
     END

-#endif // !__GNUC__

 END
 END