Changeset 10583 in vbox for trunk/src/VBox

Timestamp:

Jul 14, 2008 1:20:36 AM (16 years ago)

Author:

vboxsync

Message:

Set VBOX_WITH_QT4_SUN on non-ose builds of darwin, solaris and windows. Linux users have to set it them selves until the tools server have been updated (todo). (The configure script should override it if internal builds.) qt4 unit part 2: Added a QT_PREFIX to the template based on the

File:

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

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

@@ -46 +46 @@
 VBOX_WITH_DEBUGGER_GUI :=
 DEFS := $(filter-out VBOX_WITH_DEBUGGER_GUI,$(DEFS))
+
+# Guess VBOX_WITH_QT4_SUN
+ifndef VBOX_WITH_QT4_SUN
+ ifndef VBOX_OSE
+  if1of ($(KBUILD_TARGET), darwin solaris win)
+   VBOX_WITH_QT4_SUN := 1
+  endif
+ endif
+endif
 
 #
@@ -216 +225 @@
  TEMPLATE_VBOXQT4GUIEXE_LRCTOOL = QT4
  TEMPLATE_VBOXQT4GUIEXE_SDKS = QT4
+ ifdef VBOX_WITH_QT4_SUN
+  ifneq ($(KBUILD_TARGET),darwin) ## @todo The next darwin build should also make use the prefix just to make things more uniform.
+   TEMPLATE_VBOXQT4GUIEXE_QT_PREFIX = VBox
+  endif
+ endif
 endif # USE_KBUILD_QT_UNIT
 TEMPLATE_VBOXQT4GUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT $(ARCH_BITS_DEFS) $(VBOX_DEFS_QT4)