Changeset 93238 in vbox

Timestamp:

Jan 14, 2022 7:12:32 PM (3 years ago)

Author:

vboxsync

Message:

/Config.kmk,FE/Qt: HVCI workaround, see bugref:10162 for details.

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -4406 +4406 @@
 # @param 4     The template base name.
 # @param 5     Additional RC options.
+# @param 6     Original filename to use.
 #
 # @remarks     ASSUMES RCFLAGS isn't a simple variable (var := value).
@@ -4412 +4413 @@
 $(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Artwork/win/$(4)
 $(1)_RCFLAGS += /nologo /dIN_INTERNAL_NAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \
-        /dIN_ORIGINAL_NAME="\"$$(notdir $$($(1)_1_INST_TARGET))\"" \
+        /dIN_ORIGINAL_NAME="\"$(if $(6),$6,$$(notdir $$($(1)_1_INST_TARGET)))\"" \
         $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(5)
 $$$$($(1)_0_OUTDIR)/src/VBox/Artwork/win/$(basename $(4)).res: \
@@ -4438 +4439 @@
 # @param 2     The description
 # @param 3     Optional icon file.
-VBOX_SET_VER_INFO_EXE = $(evalcall2 VBOX_SET_VER_INFO_INTERNAL,$1,$2,$3,TemplateExe.rc,)
+# @param 4     Optional OriginalFilename value to use. Defaults to target name w/o dir.
+VBOX_SET_VER_INFO_EXE = $(evalcall2 VBOX_SET_VER_INFO_INTERNAL,$1,$2,$3,TemplateExe.rc,,$4)
 
 ##

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -1220 +1220 @@
         src/platform/win/UIDesktopServices_win.cpp
 
-$(call VBOX_SET_VER_INFO_EXE,VirtualBox,VirtualBox Manager,$(VBOX_WINDOWS_ICON_FILE))
+$(call VBOX_SET_VER_INFO_EXE,VirtualBox,VirtualBox Manager,$(VBOX_WINDOWS_ICON_FILE),VirtualBoxGUI)