Changeset 55771 in vbox for trunk/src/recompiler

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/recompiler

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxREM.rc (modified) (2 diffs)

trunk/src/recompiler/Makefile.kmk

@@ -323 +323 @@
         $(QUIET)$(REDIRECT) -E 'COMSPEC=$(VBOX_GOOD_COMSPEC_BS)' -- $(TOOL_MINGWW64_PREFIX)windres \
             $(addprefix -I,$(INCS) $(PATH_SDK_$(VBOX_WINPSDK)_INC) $(PATH_TOOL_$(VBOX_VCC_TOOL)_INC)) \
-            -DVBOX_VERSION_MAJOR_NR=$(VBOX_VERSION_MAJOR) \
-            -DVBOX_VERSION_MINOR_NR=$(VBOX_VERSION_MINOR) \
-            -DVBOX_VERSION_BUILD_NR=$(VBOX_VERSION_BUILD) \
-            -DVBOX_SVN_REV_NR=$(VBOX_SVN_REV) $< $@
+            -DVBOX_SVN_REV=$(VBOX_SVN_REV) -DIN_RING3 $< $@
 
 #

trunk/src/recompiler/VBoxREM.rc

@@ -19 +19 @@
 #include <VBox/version.h>
 
-/* stupid windres! */
-#define RT_STR(x) #x
-#define RT_XSTR(x) RT_STR(x)
-
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 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_PRODUCT_VERSION
   FILEFLAGSMASK    VS_FFI_FILEFLAGSMASK
   FILEFLAGS        0x0L
@@ -38 +34 @@
     BLOCK "040904b0" // Lang=US English, CharSet=Unicode
     BEGIN
+      VALUE "FileDescription",  "VirtualBox Recompiler\0"
+      VALUE "InternalName",     "VBoxREM\0"
+      VALUE "OriginalFilename", "VBoxREM.dll\0"
       VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
-      VALUE "FileDescription",  "VirtualBox Recompiler\0"
-      VALUE "FileVersion",      RT_XSTR(VBOX_VERSION_MAJOR_NR) "." RT_XSTR(VBOX_VERSION_MINOR_NR) "." RT_XSTR(VBOX_VERSION_BUILD_NR) "." RT_XSTR(VBOX_SVN_REV_NR) "\0"
-      VALUE "InternalName",     "VBoxREM\0"
+      VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
       VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
-      VALUE "OriginalFilename", "VBoxREM.dll\0"
       VALUE "ProductName",      VBOX_PRODUCT "\0"
-      VALUE "ProductVersion",   RT_XSTR(VBOX_VERSION_MAJOR_NR) "." RT_XSTR(VBOX_VERSION_MINOR_NR) "." RT_XSTR(VBOX_VERSION_BUILD_NR) ".r" RT_XSTR(VBOX_SVN_REV_NR) "\0"
+      VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR
     END
   END