Changeset 82742 in vbox for trunk/src/VBox/Frontends/VBoxHeadless

Timestamp:

Jan 14, 2020 3:55:03 PM (5 years ago)

Author:

vboxsync

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

135690

Message:

VBoxHeadless: No need for custom RC file, use template and get version info in the hardened .exe too.

Location:

trunk/src/VBox/Frontends/VBoxHeadless

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxHeadless.rc (deleted)

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

@@ -37 +37 @@
 VBoxHeadlessHardened_TEMPLATE = VBOXR3HARDENEDEXE
 VBoxHeadlessHardened_SOURCES = VBoxHeadlessHardened.cpp
-VBoxHeadlessHardened_SOURCES.win = $(VBoxHeadless_0_OUTDIR)/VBoxHeadless-icon.rc
 VBoxHeadlessHardened_NAME = VBoxHeadless
+$(call VBOX_SET_VER_INFO_DLL,VBoxHeadlessHardened,VirtualBox Headless Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
 
 
@@ -58 +58 @@
  VBoxHeadless_LDFLAGS.darwin += -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxHeadless.dylib
 endif
-
-
-ifeq ($(KBUILD_TARGET),win)
-# Icon include file.
-VBoxHeadless_SOURCES   += VBoxHeadless.rc
-VBoxHeadless.rc_INCS    = $(VBoxHeadless_0_OUTDIR)
-VBoxHeadless.rc_DEPS    = $(VBoxHeadless_0_OUTDIR)/VBoxHeadless-icon.rc
-VBoxHeadless.rc_CLEAN   = $(VBoxHeadless_0_OUTDIR)/VBoxHeadless-icon.rc
-$$(VBoxHeadless_0_OUTDIR)/VBoxHeadless-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $$(VBoxHeadless_DEFPATH)/Makefile.kmk | $$(dir $$@)
-        $(RM) -f $@
-        $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
-endif # win
+ifdef VBOX_WITH_HARDENING
+$(call VBOX_SET_VER_INFO_DLL,VBoxHeadless,VirtualBox Headless Frontend (dll),$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
+else
+$(call VBOX_SET_VER_INFO_EXE,VBoxHeadless,VirtualBox Headless Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description.
+endif
 
 include $(FILE_KBUILD_SUB_FOOTER)