Fix needlessly convoluted test in wxXmlResourceHandlerImpl::GetImageList().

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

diff --git a/src/msw/version.rc b/src/msw/version.rc
index 1e53b56e78b762a6d086bf0c8e987ecee7359e20..95d24dd58a4994a0e9aeeca1bcd9fd358dc4e16d 100644 (file)
--- a/src/msw/version.rc
+++ b/src/msw/version.rc
@@ -4,71 +4,102 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     09.07.00
-// RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/version.h"
 
+// see http://msdn.microsoft.com/library/psdk/winui/rc_7x2d.htm for values: we
+// don't use symbolic constants because older compilers might not have them
 #ifdef WXMAKINGDLL
-    #define wxVFT VFT_DLL
+    #define wxVFT 2 // VFT_DLL
 #else
-    #define wxVFT VFT_APP
+    #define wxVFT 1 // VFT_APP
 #endif
 
 #ifdef _DEBUG
     #define DLL_FLAGS 0x1L
-    #define DLL_SUFFIX "d"
 #else
     #define DLL_FLAGS 0x0L
-    #define DLL_SUFFIX ""
 #endif
 
-//see http://msdn.microsoft.com/library/psdk/winui/rc_7x2d.htm for values
+// 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
+    #define CHARSET 0x4b0
+    #define LANG_WITH_CHARSET "040904b0"
+#else
+    #define CHARSET 0
+    #define LANG_WITH_CHARSET "04090000"
+#endif
+
+#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
- 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
- // for NT/win2000 use VOS_NT next
- FILEOS VOS__WINDOWS32
+ FILEOS 0x40004L // VOS_NT_WINDOWS32
  FILETYPE wxVFT
  FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        // US English Ascii; see http://msdn.microsoft.com/library/psdk/winui/rc_3rxn.htm for codes
-        BLOCK "04090000" 
+        BLOCK LANG_WITH_CHARSET
         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, 2001 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 "Comments", "wxWidgets cross-platform GUI framework\0"
+            VALUE "CompanyName", "wxWidgets development team\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 "SpecialBuild", "\0"
-        END
-        //US English Unicode; see http://msdn.microsoft.com/library/psdk/winui/rc_3rxn.htm for codes
-        BLOCK "040904b0"
-        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, 2001 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
     END
+    BLOCK "VarFileInfo"
+    BEGIN
+            VALUE "Translation", LANG, CHARSET
+    END
 END