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
This commit is contained in:
Vadim Zeitlin 2001-09-30 22:20:03 +00:00
parent d275c7eb84
commit c7b3563e24
2 changed files with 9 additions and 9 deletions

View File

@ -35,14 +35,14 @@ BEGIN
VALUE "Comments", "wxBase (part of Windows) cross-platform framework\0" VALUE "Comments", "wxBase (part of Windows) cross-platform framework\0"
VALUE "CompanyName", "wxWindows development team\0" VALUE "CompanyName", "wxWindows development team\0"
VALUE "FileDescription", "wxBase is a non GUI part of wxWindows\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 "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 "LegalTrademarks", "\0"
VALUE "OriginalFilename", "wxbase221" DLL_SUFFIX ".dll\0" VALUE "OriginalFilename", "wxbase" wxVERSION_NUM_STRING DLL_SUFFIX ".dll\0"
VALUE "PrivateBuild", "\0" VALUE "PrivateBuild", "\0"
VALUE "ProductName", "wxWindows\0" VALUE "ProductName", "wxWindows\0"
VALUE "ProductVersion", "2.2.1\0" VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0"
VALUE "SpecialBuild", "\0" VALUE "SpecialBuild", "\0"
END END
END END

View File

@ -11,10 +11,12 @@
#include "wx/version.h" #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 #ifdef WXMAKINGDLL
#define wxVFT VFT_DLL #define wxVFT 2 // VFT_DLL
#else #else
#define wxVFT VFT_APP #define wxVFT 1 // VFT_APP
#endif #endif
#ifdef _DEBUG #ifdef _DEBUG
@ -25,14 +27,12 @@
#define DLL_SUFFIX "" #define DLL_SUFFIX ""
#endif #endif
//see http://msdn.microsoft.com/library/psdk/winui/rc_7x2d.htm for values
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxBETA_NUMBER FILEVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxBETA_NUMBER
PRODUCTVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxBETA_NUMBER PRODUCTVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxBETA_NUMBER
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
FILEFLAGS DLL_FLAGS FILEFLAGS DLL_FLAGS
// for NT/win2000 use VOS_NT next FILEOS 0x40004L // VOS_NT_WINDOWS32
FILEOS VOS__WINDOWS32
FILETYPE wxVFT FILETYPE wxVFT
FILESUBTYPE 0x0L FILESUBTYPE 0x0L
BEGIN BEGIN