Changeset 12387 in vbox for trunk/src

Timestamp:

Sep 11, 2008 1:02:18 AM (16 years ago)

Author:

vboxsync

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

36433

Message:

VirtualBox/Makefile: Fixed duplicate rules, let the qt4 bundle install win when both qt3 and qt4 are being built.

File:

• trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (2 diffs)

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

@@ -456 +456 @@
 
 
-ifeq ($(KBUILD_TARGET),darwin)
+if "$(KBUILD_TARGET)" == "darwin" && !defined(VBOX_WITH_QT4GUI) # don't conflict the qt4 gui
 #
 # On Mac OS X (darwin) we need to install icon resources and compulsory bundle contents.
 #
+$(warning The qt3 gui will not work right on it own after we renamed it to *3..)
 INSTALLS.darwin += VirtualBox3.app
 VirtualBox3.app_INST = $(INST_VIRTUALBOX)Contents/
@@ -498 +499 @@
                 --output $@ \
                 $<
-endif # darwin
+endif # darwin && !qt4gui