Changeset 53807 in vbox

Timestamp:

Jan 14, 2015 6:53:17 PM (10 years ago)

Author:

vboxsync

Message:

added another Windows resource file

Location:

trunk/src/recompiler

Files:

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

trunk/src/recompiler/Makefile.kmk

@@ -118 +118 @@
 VBoxRemPrimary_SOURCES.debug  += \
         Sun/testmath.c
+VBoxRemPrimary_SOURCES.win = $(VBoxREMImp_0_OUTDIR)/VBoxREMRes.o
 VBoxRemPrimary_SOURCES.win.x86 = $(VBoxREMImp_0_OUTDIR)/VBoxREMWin.def
 ifdef VBOX_USE_MINGWW64
@@ -317 +318 @@
         $(CP) -f $< $@
 
+$$(VBoxREMImp_0_OUTDIR)/VBoxREMRes.o: $(VBOX_PATH_RECOMPILER_SRC)/VBoxREM.rc $(MAKEFILE_CURRENT) | $$(dir $$@)
+        $(TOOL_MINGWW64_PREFIX)windres \
+            $(addprefix -I,$(INCS)) \
+            -DVBOX_VERSION_MAJOR_NR=$(VBOX_VERSION_MAJOR) \
+            -DVBOX_VERSION_MINOR_NR=$(VBOX_VERSION_MINOR) \
+            -DVBOX_VERSION_BUILD_NR=$(VBOX_VERSION_BUILD) \
+            -DVBOX_SVN_REV=$(VBOX_SVN_REV) $< $@
 
 #

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
 
@@ -36 +40 @@
       VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
       VALUE "FileDescription",  "VirtualBox Recompiler\0"
-      VALUE "FileVersion",      VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\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) "\0"
       VALUE "InternalName",     "VBoxREM\0"
       VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
       VALUE "OriginalFilename", "VBoxREM.dll\0"
       VALUE "ProductName",      VBOX_PRODUCT "\0"
-      VALUE "ProductVersion",   VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\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) "\0"
     END
   END