Changeset 55771 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

May 8, 2015 8:17:50 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

100197

Message:

Use defines in the RC files and make those defines compatible with what we use in C/C++ code.

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• error/VBoxOGLerrorspu.rc (modified) (2 diffs)
• error/errorspu.rc (modified) (3 diffs)
• util/VBoxOGLcrutil.rc (modified) (2 diffs)
• util/util.rc (modified) (3 diffs)

trunk/src/VBox/GuestHost/OpenGL/error/VBoxOGLerrorspu.rc

@@ -36 +36 @@
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION      VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0
-  PRODUCTVERSION   VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0
+  FILEVERSION      VBOX_RC_FILE_VERSION
+  PRODUCTVERSION   VBOX_RC_FILE_VERSION
   FILEFLAGSMASK    VS_FFI_FILEFLAGSMASK
   FILEFLAGS        0x0L
@@ -50 +50 @@
       VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
       VALUE "FileDescription",  DESCRIPTION_STR
-      VALUE "FileVersion",      VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0"
+      VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
       VALUE "InternalName",     FILENAME_STR "\0"
       VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
       VALUE "OriginalFilename", FILENAME_STR ".dll\0"
       VALUE "ProductName",      PRODUCT_STR
-      VALUE "ProductVersion",   VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0"
+      VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR
     END
   END

trunk/src/VBox/GuestHost/OpenGL/error/errorspu.rc

@@ -22 +22 @@
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION          VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0
-  PRODUCTVERSION       VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0
+  FILEVERSION      VBOX_RC_FILE_VERSION
+  PRODUCTVERSION   VBOX_RC_FILE_VERSION
   FILEFLAGSMASK        0x3fL
   FILEFLAGS            0x0L
@@ -36 +36 @@
       VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
       VALUE "FileDescription",  "VirtualBox crOpenGL ICD\0"
-      VALUE "FileVersion",      VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0"
+      VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
       VALUE "InternalName",     "VBoxOGLerrorspu\0"
       VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
@@ -45 +45 @@
 #endif
       VALUE "ProductName",      VBOX_PRODUCT " Guest Additions\0"
-         VALUE "ProductVersion",   VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0"
+         VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR
       END
    END

trunk/src/VBox/GuestHost/OpenGL/util/VBoxOGLcrutil.rc

@@ -36 +36 @@
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION      VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0
-  PRODUCTVERSION   VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0
+  FILEVERSION      VBOX_RC_FILE_VERSION
+  PRODUCTVERSION   VBOX_RC_FILE_VERSION
   FILEFLAGSMASK    VS_FFI_FILEFLAGSMASK
   FILEFLAGS        0x0L
@@ -50 +50 @@
       VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
       VALUE "FileDescription",  DESCRIPTION_STR
-      VALUE "FileVersion",      VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0"
+      VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
       VALUE "InternalName",     FILENAME_STR "\0"
       VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
       VALUE "OriginalFilename", FILENAME_STR ".dll\0"
       VALUE "ProductName",      PRODUCT_STR
-      VALUE "ProductVersion",   VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0"
+      VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR
     END
   END

trunk/src/VBox/GuestHost/OpenGL/util/util.rc

@@ -22 +22 @@
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION      VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0
-  PRODUCTVERSION   VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0
+  FILEVERSION      VBOX_RC_FILE_VERSION
+  PRODUCTVERSION   VBOX_RC_FILE_VERSION
   FILEFLAGSMASK    0x3fL
   FILEFLAGS        0x0L
@@ -36 +36 @@
       VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
       VALUE "FileDescription",  "VirtualBox crOpenGL crutil ICD\0"
-      VALUE "FileVersion",      VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0"
+      VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
       VALUE "InternalName",     "VBoxOGLcrutil\0"
       VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
@@ -45 +45 @@
 #endif
       VALUE "ProductName",      VBOX_PRODUCT " Guest Additions\0"
-      VALUE "ProductVersion",   VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0"
+      VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR
     END
   END