Changeset 9618 in vbox for trunk/src/VBox

Timestamp:

Jun 11, 2008 2:41:35 PM (17 years ago)

Author:

vboxsync

Message:

The darwin qt is (soon) available on the tools server, so, made some adjustments for this.

File:

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

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

@@ -49 +49 @@
 # be cleaned up properly later some time (not important now).
 #
-ifndef VBOX_PATH_QT4
+ifeq ($(VBOX_PATH_QT4),)
+ ifeq ($(KBUILD_TARGET),darwin)
+  VBOX_PATH_QT4 := $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))
+  ifeq ($(VBOX_PATH_QT4),)
+   ifneq ($(wildcard /Library/Frameworks/QtCore.framework),) 
+    # Using the global installation (for OSE).
+    VBOX_PATH_QT4 ?= /usr
+    VBOX_PATH_QT4_FRAMEWORS ?= /Library/Frameworks
+   endif
+  endif
+ endif
+endif
+ifeq ($(VBOX_PATH_QT4),)
  if1of ($(USERNAME), bird)
   # gentoo (64-bit)
@@ -76 +88 @@
 
 ifeq ($(KBUILD_TARGET),darwin)
- # This is temporary until the tools server is updated:
- VBOX_PATH_QT4_FRAMEWORKS = /Library/Frameworks
  # This is necessary because we didn't include the Qt header in framework
  # notation (e.g.: <QtCore/QObject>)).