Changeset 57112 in vbox for trunk/src/VBox/Installer/win/Resources

Timestamp:

Jul 29, 2015 9:43:26 AM (10 years ago)

Author:

vboxsync

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

101846

Message:

merge VBox/Resources into VBox/Artwork

File:

• trunk/src/VBox/Installer/win/Resources/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Installer/win/Resources/Makefile.kmk

@@ -32 +32 @@
 
 # The resource path.
-VBOX_RESOURCES_PATH_WIN := $(subst /,\\,$(PATH_ROOT))/src/VBox/Resources/win
+VBOX_ARTWORK_PATH_WIN := $(subst /,\\,$(PATH_ROOT))/src/VBox/Artwork/win
 
 # Icon include file.
@@ -39 +39 @@
   # Hack: rc.exe on OSE build boxes don't support Vista icons; so
   # use a special icon version (without the 256x256 size) instead.
-  VBOX_WINDOWS_ICON_EXT_VBOX    := $(VBOX_RESOURCES_PATH_WIN)/OSE/virtualbox-vbox.ico
-  VBOX_WINDOWS_ICON_EXT_EXTPACK := $(VBOX_RESOURCES_PATH_WIN)/OSE/virtualbox-vbox-extpack.ico
-  VBOX_WINDOWS_ICON_EXT_OVA     := $(VBOX_RESOURCES_PATH_WIN)/OSE/virtualbox-ova.ico
-  VBOX_WINDOWS_ICON_EXT_OVF     := $(VBOX_RESOURCES_PATH_WIN)/OSE/virtualbox-ovf.ico
-  VBOX_WINDOWS_ICON_EXT_VDI     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vdi.ico
-  VBOX_WINDOWS_ICON_EXT_VMDK    := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vmdk.ico
-  VBOX_WINDOWS_ICON_EXT_VHD     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vhd.ico
-  VBOX_WINDOWS_ICON_EXT_HDD     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-hdd.ico
+  VBOX_WINDOWS_ICON_EXT_VBOX    := $(VBOX_ARTWORK_PATH_WIN)/OSE/virtualbox-vbox.ico
+  VBOX_WINDOWS_ICON_EXT_EXTPACK := $(VBOX_ARTWORK_PATH_WIN)/OSE/virtualbox-vbox-extpack.ico
+  VBOX_WINDOWS_ICON_EXT_OVA     := $(VBOX_ARTWORK_PATH_WIN)/OSE/virtualbox-ova.ico
+  VBOX_WINDOWS_ICON_EXT_OVF     := $(VBOX_ARTWORK_PATH_WIN)/OSE/virtualbox-ovf.ico
+  VBOX_WINDOWS_ICON_EXT_VDI     := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vdi.ico
+  VBOX_WINDOWS_ICON_EXT_VMDK    := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vmdk.ico
+  VBOX_WINDOWS_ICON_EXT_VHD     := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vhd.ico
+  VBOX_WINDOWS_ICON_EXT_HDD     := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-hdd.ico
 else
-  VBOX_WINDOWS_ICON_EXT_VBOX    := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vbox.ico
-  VBOX_WINDOWS_ICON_EXT_EXTPACK := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vbox-extpack.ico
-  VBOX_WINDOWS_ICON_EXT_OVA     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-ova.ico
-  VBOX_WINDOWS_ICON_EXT_OVF     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-ovf.ico
-  VBOX_WINDOWS_ICON_EXT_VDI     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vdi.ico
-  VBOX_WINDOWS_ICON_EXT_VMDK    := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vmdk.ico
-  VBOX_WINDOWS_ICON_EXT_VHD     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vhd.ico
-  VBOX_WINDOWS_ICON_EXT_HDD     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-hdd.ico
+  VBOX_WINDOWS_ICON_EXT_VBOX    := $(VBOX_ARTWORK_PATH_WIN)/NonOSE/virtualbox-vbox.ico
+  VBOX_WINDOWS_ICON_EXT_EXTPACK := $(VBOX_ARTWORK_PATH_WIN)/NonOSE/virtualbox-vbox-extpack.ico
+  VBOX_WINDOWS_ICON_EXT_OVA     := $(VBOX_ARTWORK_PATH_WIN)/NonOSE/virtualbox-ova.ico
+  VBOX_WINDOWS_ICON_EXT_OVF     := $(VBOX_ARTWORK_PATH_WIN)/NonOSE/virtualbox-ovf.ico
+  VBOX_WINDOWS_ICON_EXT_VDI     := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vdi.ico
+  VBOX_WINDOWS_ICON_EXT_VMDK    := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vmdk.ico
+  VBOX_WINDOWS_ICON_EXT_VHD     := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vhd.ico
+  VBOX_WINDOWS_ICON_EXT_HDD     := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-hdd.ico
 endif