Changeset 8748 in vbox

Timestamp:

May 10, 2008 2:43:34 AM (17 years ago)

Author:

vboxsync

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

30721

Message:

VBOX_WINDOWS_ICON_FILE

Location:

trunk

Files:

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

trunk/Config.kmk

@@ -1052 +1052 @@
 endif
 
+ifdef VBOX_OSE
+ VBOX_WINDOWS_ICON_FILE ?= $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_win.ico
+ VBOX_MACOSX_ICON_FILE  ?= $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox.icns
+else
+ #VBOX_WINDOWS_ICON_FILE ?= $(PATH_ROOT)/src/VBox/Artwork/VirtualBox-vista.ico - need more recent RC.
+ VBOX_WINDOWS_ICON_FILE ?= $(PATH_ROOT)/src/VBox/Artwork/VirtualBox-winxp.ico
+ VBOX_MACOSX_ICON_FILE  ?= $(PATH_ROOT)/src/VBox/Artwork/VirtualBox.icns
+endif
 
 #

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

@@ -282 +282 @@
 endif
 
-ifdef VBOX_OSE
 VirtualBox_SOURCES.win += \
-        src/win32/VirtualBox_OSE.rc
-else
-VirtualBox_SOURCES.win += \
-        src/win32/VirtualBox.rc
-endif
-
-VirtualBox_SOURCES.win += \
-        src/VBoxFBDDRAW.cpp
+        src/VBoxFBDDRAW.cpp \
+        $(PATH_TARGET)/VirtualBox.rc
 
 VirtualBox_SOURCES.darwin = \
@@ -417 +410 @@
 
 # generated files we need to clean manually
-OTHER_CLEAN           = \
+OTHER_CLEAN        += \
         $(VirtualBox_GENSRCS) \
         $(VirtualBox_GENHDRS) \
         $(WRAPPERSFILE) \
         $(PATH_BIN)/vboxkeyboard.tar.gz
+
+
+#
+# On Windows we'll have to generate/edit the resource file.
+# The IDI_ICON1 name is Qt specific.
+#
+$(PATH_TARGET)/VirtualBox.rc: Makefile.kmk $(VBOX_WINDOWS_ICON_FILE) | $$(call DIRDEP,$$(@D))
+        $(RM) -f $@
+        $(APPEND) $@ 'IDI_ICON1 ICON "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
+        $(CAT) $@
+
+OTHER_CLEAN.win += $(PATH_TARGET)/VirtualBox.rc