missing commit

[wxWidgets.git] / src / msw / version.rc

diff --git a/src/msw/version.rc b/src/msw/version.rc
index 23c4a3b22c35351e5220738fe17237da4b06656c..e7258b25201b6b9e6e1cbcbc0991f961aa495783 100644 (file)
--- 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
 // Created:     09.07.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin

-// Licence:     wxWidgets license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/version.h"
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/version.h"


@@ -25,18 +25,59 @@
     #define DLL_FLAGS 0x0L
 #endif
 
     #define DLL_FLAGS 0x0L
 #endif
 

+// 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 0x0409

 #ifdef _UNICODE
 #ifdef _UNICODE

-    #define LANG "04090000"
+    #define CHARSET 0x4b0
+    #define LANG_WITH_CHARSET "040904b0"

 #else
 #else

-    #define LANG "040904b0"
+    #define CHARSET 0
+    #define LANG_WITH_CHARSET "04090000"

 #endif
 
 #endif
 

-#define STRINGIZE0(x) #x
-#define STRINGIZE(x)  STRINGIZE0(x)
+#ifdef WXMAKINGDLL_BASE
+    #define WXLIBDESC "base"
+#elif defined WXMAKINGDLL_NET
+    #define WXLIBDESC "network"
+#elif defined WXMAKINGDLL_CORE
+    #define WXLIBDESC "core"
+#elif defined WXMAKINGDLL_ADV
+    #define WXLIBDESC "advanced"
+#elif defined WXMAKINGDLL_QA
+    #define WXLIBDESC "qa"
+#elif defined WXMAKINGDLL_HTML
+    #define WXLIBDESC "html"
+#elif defined WXMAKINGDLL_GL
+    #define WXLIBDESC "OpenGL"
+#elif defined WXMAKINGDLL_XML
+    #define WXLIBDESC "XML"
+#elif defined WXMAKINGDLL_XRC
+    #define WXLIBDESC "XRC"
+#elif defined WXMAKINGDLL_AUI
+    #define WXLIBDESC "AUI"
+#elif defined WXMAKINGDLL_RIBBON
+    #define WXLIBDESC "ribbon"
+#elif defined WXMAKINGDLL_PROPGRID
+    #define WXLIBDESC "property grid"
+#elif defined WXMAKINGDLL_RICHTEXT
+    #define WXLIBDESC "rich text"
+#elif defined WXMAKINGDLL_MEDIA
+    #define WXLIBDESC "multimedia"
+#elif defined WXMAKINGDLL_STC
+    #define WXLIBDESC "styled text"
+#elif defined WXMAKINGDLL_WEBVIEW
+    #define WXLIBDESC "webview"
+#elif defined WXMAKINGDLL
+    #define WXLIBDESC "monolithic"
+#else
+    #error "What are we building?"
+#endif

 
 1 VERSIONINFO
 
 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
  FILEFLAGSMASK 0x3fL
  FILEFLAGS DLL_FLAGS
  FILEOS 0x40004L // VOS_NT_WINDOWS32


@@ -45,21 +86,21 @@
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN

-        // US English Ascii; see http://msdn.microsoft.com/library/psdk/winui/rc_3rxn.htm for codes
-        BLOCK LANG
+        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"

-            VALUE "FileDescription", "wxWidgets for MSW\0"
-            VALUE "FileVersion", "wxWidgets Library " wxVERSION_NUM_DOT_STRING "\0"
-            VALUE "InternalName", "wxMSW\0"
-            VALUE "LegalCopyright", "Copyright © 1993-2005 wxWidgets development team\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", STRINGIZE(WXDLLNAME) ".dll\0"
-            VALUE "PrivateBuild", "\0"
+            VALUE "FileDescription", "wxWidgets " WXLIBDESC " library\0"
+            VALUE "FileVersion", wxVERSION_NUM_DOT_STRING "\0"
+            VALUE "InternalName", wxSTRINGIZE(WXDLLNAME) "\0"
+            VALUE "LegalCopyright", "Copyright © 1993-2013 wxWidgets development team\0"
+            VALUE "OriginalFilename", wxSTRINGIZE(WXDLLNAME) ".dll\0"

             VALUE "ProductName", "wxWidgets\0"
             VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0"
             VALUE "ProductName", "wxWidgets\0"
             VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0"

-            VALUE "SpecialBuild", "\0"

         END
     END
         END
     END

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

 END
 END