Changeset 10596 in vbox

Timestamp:

Jul 14, 2008 12:43:02 PM (17 years ago)

Author:

vboxsync

Message:

darwin build fix.

File:

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

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

@@ -116 +116 @@
 
 ifndef USE_KBUILD_QT_UNIT_PART_2
- VBOX_INCS_QT4       = \
-        $(addprefix $(VBOX_PATH_QT4_INCLUDE)/, $(VBOX_MODULE_QT4) Qt) \
-        $(VBOX_PATH_QT4_INCLUDE)
-endif
- VBOX_INCS_QT4       = $(VBOX_PATH_QT4_INCLUDE) ## @todo add this to the qt4 unit.
+ VBOX_INCS_QT4       = $(addprefix $(VBOX_PATH_QT4_INCLUDE)/, $(VBOX_MODULE_QT4) Qt)
+endif
+ VBOX_INCS_QT4      += $(VBOX_PATH_QT4_INCLUDE) ## @todo add this to the qt4 unit.
  ifeq ($(KBUILD_TARGET),win)
   ifeq ($(KBUILD_TARGET_ARCH),amd64)
@@ -308 +306 @@
   # Note that the -F flag is apple gcc only.
   TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += -F$(VBOX_PATH_QT4_FRAMEWORKS) $(addprefix -framework , $(VBOX_MODULE_QT4))
-  TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS += -F$(VBOX_PATH_QT4_FRAMEWORKS)
-endif
+endif
+  TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS += -F$(VBOX_PATH_QT4_FRAMEWORKS) ## @todo fix in the qt unit. Somehow this fixes the #include <QtCore/qstring.h> stuff.
   TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += -framework Carbon -framework QuickTime -bind_at_load
   TEMPLATE_VBOXQT4GUIEXE_LIBS +=