Changeset 51894 in vbox

Timestamp:

Jul 6, 2014 10:05:09 PM (10 years ago)

Author:

vboxsync

Message:

VirtualBox,VBoxHeadless: Icons.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxHeadless/Makefile.kmk (modified) (2 diffs)
• VBoxSDL/Makefile.kmk (modified) (1 diff)
• VirtualBox/Makefile.kmk (modified) (3 diffs)
• VirtualBox/src/platform/win/VirtualBox.rc (modified) (1 diff)

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
 
@@ -53 +54 @@
 endif
 
+
+# Icon include file.
+VBoxHeadless_SOURCES.win += $(VBoxHeadless_0_OUTDIR)/VBoxHeadless-icon.rc
+VBoxHeadless_CLEAN.win   += $(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))"'
+
 include $(FILE_KBUILD_SUB_FOOTER)
 

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

@@ -37 +37 @@
 VBoxSDLHardened_TEMPLATE = VBOXR3HARDENEDEXE
 VBoxSDLHardened_SOURCES = VBoxSDLHardened.cpp
+VBoxSDLHardened_SOURCES.win = $(VBoxSDL_0_OUTDIR)/VBoxSDL-icon.rc
 VBoxSDLHardened_NAME = VBoxSDL
 

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

@@ -55 +55 @@
 VirtualBoxHardened_TEMPLATE = VBOXR3HARDENEDEXE
 VirtualBoxHardened_SOURCES = src/hardenedmain.cpp
+VirtualBoxHardened_SOURCES.win = src/platform/win/VirtualBox.rc
 VirtualBoxHardened_NAME = VirtualBox
 VirtualBoxHardened_INST.darwin = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
@@ -98 +99 @@
         $(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK) \
         $(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI) \
+        $(if $(VBOX_WITH_HARDENING),VBOXR3_HARDENED_DLL) \
         $(if $(VBOX_WITH_DRAG_AND_DROP),VBOX_WITH_DRAG_AND_DROP) \
         $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH) \
@@ -134 +136 @@
     VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\"
 endif
+
 
 

trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBox.rc

@@ -39 +39 @@
     VALUE "FileDescription", VBOX_PRODUCT " Manager\0"
     VALUE "FileVersion",     VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0"
+#ifdef VBOXR3_HARDENED_DLL
     VALUE "InternalName",    "VirtualBox.exe\0"
+#else
+    VALUE "InternalName",    "VirtualBox.dll\0"
+#endif
     VALUE "LegalCopyright",  VBOX_RC_LEGAL_COPYRIGHT
+#ifdef VBOXR3_HARDENED_DLL
+    VALUE "OriginalFilename","VirtualBox.dll\0"
+#else
     VALUE "OriginalFilename","VirtualBox.exe\0"
+#endif
     VALUE "ProductName",     VBOX_PRODUCT "\0"
     VALUE "ProductVersion",  VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0"