compilation fixes for the compilers with old headers

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

diff --git a/src/common/base.rc b/src/common/base.rc
index 1fdf32aa0b2ec7173ee7470c8c69ff188627716e..5061968f4c287e5067fe0e21bb30f35d70dcb238 100644 (file)
--- a/src/common/base.rc
+++ b/src/common/base.rc
@@ -35,14 +35,14 @@ BEGIN
             VALUE "Comments", "wxBase (part of Windows) cross-platform framework\0"
             VALUE "CompanyName", "wxWindows development team\0"
             VALUE "FileDescription", "wxBase is a non GUI part of wxWindows\0"
-            VALUE "FileVersion", "2.2.1\0"
+            VALUE "FileVersion", wxVERSION_NUM_DOT_STRING "\0"
             VALUE "InternalName", "wxBase\0"
-            VALUE "LegalCopyright", "Copyright © 1993, 2000 wxWindows development team\0"
+            VALUE "LegalCopyright", "Copyright © 1993, 2001 wxWindows development team\0"
             VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "wxbase221" DLL_SUFFIX ".dll\0"
+            VALUE "OriginalFilename", "wxbase" wxVERSION_NUM_STRING DLL_SUFFIX ".dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "wxWindows\0"
-            VALUE "ProductVersion", "2.2.1\0"
+            VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/src/msw/version.rc b/src/msw/version.rc
index 1e53b56e78b762a6d086bf0c8e987ecee7359e20..2ca75bce83cdf85292f47f84760602f35b385c06 100644 (file)
--- a/src/msw/version.rc
+++ b/src/msw/version.rc
@@ -11,10 +11,12 @@
 
 #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
@@ -25,14 +27,12 @@
     #define DLL_SUFFIX ""
 #endif
 
-//see http://msdn.microsoft.com/library/psdk/winui/rc_7x2d.htm for values
 1 VERSIONINFO
  FILEVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxBETA_NUMBER
  PRODUCTVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxBETA_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