Changeset 7223 in vbox for trunk/src/VBox

Timestamp:

Feb 29, 2008 5:01:17 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Made it possible to build VirtualBox4 on a system where Qt3 is the default alternative.

File:

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

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

@@ -44 +44 @@
 
 # Handmade configuration of qt4
-VBOX_PATH_QT4 = /usr
-VBOX_MODULE_QT4 = QtCore QtGui QtNetwork Qt3Support
-VBOX_DEFS_QT4 = QT_CORE_LIB QT_GUI_LIB QT_NETWORK_LIB QT_QT3SUPPORT_LIB
-VBOX_INCS_QT4 = $(VBOX_PATH_QT4)/share/qt4/mkspecs/linux-g++ $(foreach mod, $(VBOX_MODULE_QT4), $(join $(VBOX_PATH_QT4)/include/qt4/, $(mod))) $(VBOX_PATH_QT4)/include/qt4/Qt $(VBOX_PATH_QT4)/include/qt4
-VBOX_LIBS_QT4 = $(VBOX_MODULE_QT4)
-VBOX_LIBPATH_QT4 =  $(VBOX_MODULE_QT4)/lib
-
-# Moc knows ifdefs now
-VBOX_MOCDEF_QT4 = -DQ_WS_X11
+VBOX_PATH_QT4      ?= /usr
+VBOX_MODULE_QT4     = QtCore QtGui QtNetwork Qt3Support
+VBOX_DEFS_QT4       = QT_CORE_LIB QT_GUI_LIB QT_NETWORK_LIB QT_QT3SUPPORT_LIB
+VBOX_INCS_QT4       = $(VBOX_PATH_QT4)/share/qt4/mkspecs/linux-g++ \
+                      $(foreach mod, $(VBOX_MODULE_QT4), $(join $(VBOX_PATH_QT4)/include/qt4/, $(mod))) \
+                      $(VBOX_PATH_QT4)/include/qt4/Qt $(VBOX_PATH_QT4)/include/qt4
+VBOX_LIBS_QT4       = $(VBOX_MODULE_QT4)
+VBOX_LIBPATH_QT4    = $(VBOX_MODULE_QT4)/lib
 
 # Warn about all what you know about porting qt3->qt4.
@@ -61 +60 @@
 
 VBOX_UIC4      := $(VBOX_PATH_QT4)/bin/uic3
-VBOX_MOC4      := $(VBOX_PATH_QT4)/bin/moc
-VBOX_LUPDATE4  := $(VBOX_PATH_QT4)/bin/lupdate
-VBOX_LRELEASE4 := $(VBOX_PATH_QT4)/bin/lrelease
+VBOX_MOC4      := $(VBOX_PATH_QT4)/bin/moc-qt4
+VBOX_LUPDATE4  := $(VBOX_PATH_QT4)/bin/lupdate-qt4
+VBOX_LRELEASE4 := $(VBOX_PATH_QT4)/bin/lrelease-qt4
 
 # Template copy from the qt3 stuff. Appended a "4" on the
@@ -197 +196 @@
  TEMPLATE_VBOXQT4GUIEXE_LIBS            += \
         $(LIB_XPCOM)
- VBOX_MOCDEF_QT4 += -DVBOX_WITH_XPCOM
 endif
 
@@ -646 +644 @@
         $$(call MSG_TOOL,moc,$(target),$(mochdr),$$@)
         $$(QUIET)$$(MKDIR) -p $$(@D)
-        $$(QUIET)$$(VBOX_MOC4) $(VBOX_MOCDEF_QT4) $(mochdr) -o $$@
+        $$(QUIET)$$(VBOX_MOC4) $($(target)_DEFS) $(mochdr) -o $$@
 
 endef
@@ -667 +665 @@
         $$(call MSG_TOOL,moc,$(target),$(mocsrc),$$@)
         $$(QUIET)$$(MKDIR) -p $$(@D)
-        $$(QUIET)$$(VBOX_MOC4) $(VBOX_MOCDEF_QT4) -i $(mocsrc) -o $$@
+        $$(QUIET)$$(VBOX_MOC4) $($(target)_DEFS) -i $(mocsrc) -o $$@
 
 endef
@@ -688 +686 @@
         $$(call MSG_TOOL,moc,$(target),$(mocuihdr),$$@)
         $$(QUIET)$$(MKDIR) -p $$(@D)
-        $$(QUIET)$$(VBOX_MOC4) $(VBOX_MOCDEF_QT4) -i $(mocuihdr) -o $$@
+        $$(QUIET)$$(VBOX_MOC4) $($(target)_DEFS) -i $(mocuihdr) -o $$@
 
 endef
@@ -717 +715 @@
 $(mocsrc): $(uihdr) | $$(call DIRDEP,$(dir $(mocsrc)))
         $$(call MSG_TOOL,moc,$(target),$(uihdr),$$@)
-        $$(QUIET)$$(VBOX_MOC4) $(VBOX_MOCDEF_QT4) $(uihdr) -o $$@
+        $$(QUIET)$$(VBOX_MOC4) $($(target)_DEFS) $(uihdr) -o $$@
 
 endef