[Scummvm-cvs-logs] scummvm master -> fc074fef48cff8a6c8cfc93b8f31353233830de5

[fingolfin]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fc074fef48 WIN32: Use names for various magic constants in resource definitions


Commit: fc074fef48cff8a6c8cfc93b8f31353233830de5
    https://github.com/scummvm/scummvm/commit/fc074fef48cff8a6c8cfc93b8f31353233830de5
Author: Max Horn (max at quendi.de)
Date: 2011-03-08T07:19:11-08:00

Commit Message:
WIN32: Use names for various magic constants in resource definitions

Changed paths:
    dists/scummvm.rc
    dists/scummvm.rc.in



diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 34e1ff2..61981b3 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -7,21 +7,21 @@ IDI_ICON               ICON    DISCARDABLE     "../../icons/scummvm.ico"
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
- FILEFLAGSMASK 0x3fL
+ FILEVERSION     1,3,0,0
+ PRODUCTVERSION  1,3,0,0
+ FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
- FILEFLAGS 0x1L
+ FILEFLAGS       VS_FF_DEBUG
 #else
- FILEFLAGS 0x0L
+ FILEFLAGS       0
 #endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
+ FILEOS          VOS_NT_WINDOWS32
+ FILETYPE        VFT_APP
+ FILESUBTYPE     VFT2_UNKNOWN
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "040904b0"
+        BLOCK "040904b0" // US English, Unicode
         BEGIN
             VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
             VALUE "FileDescription", "http://www.scummvm.org/\0"
@@ -34,8 +34,9 @@ BEGIN
             VALUE "ProductVersion", "1.3.0git\0"
         END
     END
+
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x409, 1200
+        VALUE "Translation", 0x409, 1200 // US English, Unicode
     END
 END
diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in
index 17415f3..a0fcf82 100644
--- a/dists/scummvm.rc.in
+++ b/dists/scummvm.rc.in
@@ -7,21 +7,21 @@ IDI_ICON               ICON    DISCARDABLE     "../../icons/scummvm.ico"
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION @VER_MAJOR@, at VER_MINOR@, at VER_PATCH@,0
- PRODUCTVERSION @VER_MAJOR@, at VER_MINOR@, at VER_PATCH@,0
- FILEFLAGSMASK 0x3fL
+ FILEVERSION     @VER_MAJOR@, at VER_MINOR@, at VER_PATCH@,0
+ PRODUCTVERSION  @VER_MAJOR@, at VER_MINOR@, at VER_PATCH@,0
+ FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
- FILEFLAGS 0x1L
+ FILEFLAGS       VS_FF_DEBUG
 #else
- FILEFLAGS 0x0L
+ FILEFLAGS       0
 #endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
+ FILEOS          VOS_NT_WINDOWS32
+ FILETYPE        VFT_APP
+ FILESUBTYPE     VFT2_UNKNOWN
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "040904b0"
+        BLOCK "040904b0" // US English, Unicode
         BEGIN
             VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
             VALUE "FileDescription", "http://www.scummvm.org/\0"
@@ -34,8 +34,9 @@ BEGIN
             VALUE "ProductVersion", "@VERSION@\0"
         END
     END
+
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x409, 1200
+        VALUE "Translation", 0x409, 1200 // US English, Unicode
     END
 END