Various cygwin compilation fixes.

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

diff --git a/src/msw/version.rc b/src/msw/version.rc
index eaca646963ac431b7ac2c4126e212e2d9d6259b6..2ca75bce83cdf85292f47f84760602f35b385c06 100644 (file)
--- a/src/msw/version.rc
+++ b/src/msw/version.rc
@@ -11,6 +11,14 @@
 
 #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
+    #define wxVFT 2 // VFT_DLL
+#else
+    #define wxVFT 1 // VFT_APP
+#endif
+

 #ifdef _DEBUG
     #define DLL_FLAGS 0x1L
     #define DLL_SUFFIX "d"
 #ifdef _DEBUG
     #define DLL_FLAGS 0x1L
     #define DLL_SUFFIX "d"


@@ -24,25 +32,42 @@
  PRODUCTVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxBETA_NUMBER
  FILEFLAGSMASK 0x3fL
  FILEFLAGS DLL_FLAGS
  PRODUCTVERSION wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxBETA_NUMBER
  FILEFLAGSMASK 0x3fL
  FILEFLAGS DLL_FLAGS

- FILEOS 0x40004L
- FILETYPE 0x2L
+ FILEOS 0x40004L // VOS_NT_WINDOWS32
+ FILETYPE wxVFT

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

+        // US English Ascii; see http://msdn.microsoft.com/library/psdk/winui/rc_3rxn.htm for codes
+        BLOCK "04090000" 
+        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
+        //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"
         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", "2.2.1\0"
+            VALUE "FileVersion", "wxWindows 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, 2001 wxWindows development team\0"

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

-            VALUE "OriginalFilename", "wxmsw221" DLL_SUFFIX ".dll\0"
+            VALUE "OriginalFilename", "wxmsw" wxVERSION_NUM_STRING DLL_SUFFIX ".dll\0"

             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "wxWindows\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
             VALUE "SpecialBuild", "\0"
         END
     END