Changeset 10580 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 14, 2008 12:51:54 AM (17 years ago)

Author:

vboxsync

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

33273

Message:

USE_KBUILD_QT_UNIT_PART_2 stuff.

File:

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

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

@@ -89 +89 @@
 VBOX_PATH_QT4_SHARE      ?= $(VBOX_PATH_QT4)
 
+ifndef USE_KBUILD_QT_UNIT_PART_2
 VBOX_MODULE_QT4     = QtCore QtGui
 VBOX_DEFS_QT4       = QT_CORE_LIB QT_GUI_LIB
+endif # !USE_KBUILD_QT_UNIT_PART_2
 
 ifeq ($(KBUILD_TARGET),darwin)
- # This is necessary because we didn't include the Qt header in framework
- # notation (e.g.: <QtCore/QObject>)).
- VBOX_INCS_QT4 = $(patsubst %, $(VBOX_PATH_QT4_FRAMEWORKS)/%.framework/Headers, $(VBOX_MODULE_QT4))
- # No libs cause we are using frameworks
- VBOX_PATH_QT4_LIB =
- VBOX_LIBS_QT4     =
+ ifndef USE_KBUILD_QT_UNIT_PART_2
+  # This is necessary because we didn't include the Qt header in framework
+  # notation (e.g.: <QtCore/QObject>)).
+  VBOX_INCS_QT4 = $(patsubst %, $(VBOX_PATH_QT4_FRAMEWORKS)/%.framework/Headers, $(VBOX_MODULE_QT4))
+  # No libs cause we are using frameworks
+  VBOX_PATH_QT4_LIB =
+  VBOX_LIBS_QT4     =
+ endif # !USE_KBUILD_QT_UNIT_PART_2
 else
 
@@ -290 +294 @@
     $(VBOX_LIBPATH_X11)
  else ifeq ($(KBUILD_TARGET),darwin)
+ifndef USE_KBUILD_QT_UNIT_PART_2
   # We have to add the framework path to both the linker and the compiler also.
   # Note that the -F flag is apple gcc only.
-  TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += -F$(VBOX_PATH_QT4_FRAMEWORKS) $(addprefix -framework , $(VBOX_MODULE_QT4)) \
-        -framework Carbon -framework QuickTime -bind_at_load
+  TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += -F$(VBOX_PATH_QT4_FRAMEWORKS) $(addprefix -framework , $(VBOX_MODULE_QT4))
   TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS += -F$(VBOX_PATH_QT4_FRAMEWORKS)
+endif
+  TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += -framework Carbon -framework QuickTime -bind_at_load
   TEMPLATE_VBOXQT4GUIEXE_LIBS +=
   TEMPLATE_VBOXQT4GUIEXE_LIBPATH +=
@@ -503 +509 @@
  endif
 endif
+# r=bird: what is -lz doing here? it belongs in LIBS
 VirtualBox4_LDFLAGS.darwin = -framework IOKit -framework AppKit -framework ApplicationServices -framework Foundation -lz
 ifdef VBOX_WITH_ICHAT_THEATER
@@ -683 +690 @@
  ## @todo Move to the appropriate places.
 
+ifndef USE_KBUILD_QT_UNIT_PART_2
+ # The Qt modules we're using.
+ # (The include directory and lib/framework for each module will be added by the Qt4 unit.)
+ VirtualBox4_QT_MODULES = Core Gui
+endif
+
  # Import QDesigner UI sources and translations from VBoxUI.pro.
  # Note that the OSE about dialog is always required by lupdate/lrelease.