compilation fix for gcc4 (patch 1428840)

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

diff --git a/src/msw/version.rc b/src/msw/version.rc
index 9a1a536efdf8e8e7fc7472b3eb4c28d27ecd5c8e..6a294e5dab32965e7a272dd486fc6fef73e34f0d 100644 (file)
--- a/src/msw/version.rc
+++ b/src/msw/version.rc
@@ -6,42 +6,60 @@
 // 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:     wxWindows license
+// Licence:     wxWidgets license

 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 

-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,0,0
- PRODUCTVERSION 2,2,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef __WXDEBUG__
- FILEFLAGS 0x1L
+#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 2 // VFT_DLL

 #else
 #else

- FILEFLAGS 0x0L
+    #define wxVFT 1 // VFT_APP

 #endif
 #endif

- FILEOS 0x40004L
- FILETYPE 0x2L
+
+#ifdef _DEBUG
+    #define DLL_FLAGS 0x1L
+#else
+    #define DLL_FLAGS 0x0L
+#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,wxSUBRELEASE_NUMBER
+ PRODUCTVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxSUBRELEASE_NUMBER
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS DLL_FLAGS
+ FILEOS 0x40004L // VOS_NT_WINDOWS32
+ FILETYPE wxVFT

  FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
  FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN

-        BLOCK "040904b0"
+        // US English Ascii; see http://msdn.microsoft.com/library/psdk/winui/rc_3rxn.htm for codes
+        BLOCK LANG

         BEGIN
         BEGIN

-            VALUE "Comments", "wxWindows cross-platform GUI framework\0"
-            VALUE "CompanyName", "wxWindows development team\0"
-            VALUE "FileDescription", "wxWindows for MSW\0"
-            VALUE "FileVersion", "2, 2, 0, 0\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 "InternalName", "wxMSW\0"

-            VALUE "LegalCopyright", "Copyright © 1993,2000 wxWindows development team\0"
+            VALUE "LegalCopyright", "Copyright © 1993-2006 wxWidgets development team\0"

             VALUE "LegalTrademarks", "\0"
             VALUE "LegalTrademarks", "\0"

-            VALUE "OriginalFilename", "wx220.dll\0"
+            VALUE "OriginalFilename", STRINGIZE(WXDLLNAME) ".dll\0"

             VALUE "PrivateBuild", "\0"
             VALUE "PrivateBuild", "\0"

-            VALUE "ProductName", "wxMSW\0"
-            VALUE "ProductVersion", "2, 2, 0, 0\0"
+            VALUE "ProductName", "wxWidgets\0"
+            VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0"

             VALUE "SpecialBuild", "\0"
         END
     END
             VALUE "SpecialBuild", "\0"
         END
     END

-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END

 END
 END