Changeset 10617 in vbox

Timestamp:

Jul 14, 2008 9:33:52 PM (17 years ago)

Author:

vboxsync

Message:

qt4 unit: part 3; clean ups.

File:

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

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

@@ -79 +79 @@
   # gentoo (64-bit)
   VBOX_PATH_QT4          ?= /usr
-  VBOX_PATH_QT4_BIN      ?= /usr/bin
   VBOX_PATH_QT4_INCLUDE  ?= /usr/include/qt4
   VBOX_PATH_QT4_LIB      ?= /usr/lib/qt4
@@ -87 +86 @@
 endif
 VBOX_PATH_QT4            ?= /usr
-VBOX_PATH_QT4_BIN        ?= $(VBOX_PATH_QT4)/bin
 VBOX_PATH_QT4_INCLUDE    ?= $(VBOX_PATH_QT4)/include
 VBOX_PATH_QT4_LIB        ?= $(VBOX_PATH_QT4)/lib
@@ -95 +93 @@
 
 ifneq ($(KBUILD_TARGET),darwin)
+ifndef USE_KBUILD_QT4_UNIT_PART_3
  VBOX_INCS_QT4      += $(VBOX_PATH_QT4_INCLUDE) ## @todo add this to the qt4 unit.
-
- ifeq (enabled,enabled) # Adding mkspecs to the INCS is hopefully not really necessary... Will try disable it later.
+endif
+
+ ifeq (disabled,yes) # Adding mkspecs to the INCS is hopefully not really necessary... Will try disable it later.
   ifeq ($(KBUILD_TARGET),win)
    ifeq ($(KBUILD_TARGET_ARCH),amd64)
@@ -110 +110 @@
  endif
 
- # Move down.
- ifeq ($(KBUILD_TARGET),win)
-  VBOX_LIBS_QT4 := VBoxqtmain.lib
+ ifndef USE_KBUILD_QT4_UNIT_PART_3
+  # Move down.
+  ifeq ($(KBUILD_TARGET),win)
+   VBOX_LIBS_QT4 := VBoxqtmain.lib
+  endif
  endif
 
@@ -126 +128 @@
 # Some default defs
 VBOX_DEFS_QT4 += QT_SHARED HAVE_CONFIG_H QT_NO_DEBUG
-
-VBOX_UIC4      ?= $(VBOX_PATH_QT4_BIN)/uic
-VBOX_MOC4      ?= $(VBOX_PATH_QT4_BIN)/moc
-VBOX_RCC4      ?= $(VBOX_PATH_QT4_BIN)/rcc
-VBOX_LUPDATE4  ?= $(VBOX_PATH_QT4_BIN)/lupdate
-VBOX_LRELEASE4 ?= $(VBOX_PATH_QT4_BIN)/lrelease
-
-# tell moc what platform we are on to let it properly define
-# Q_OS_* and Q_WS_* macros when including qglobal.h
-# (is there a better way?)
-ifeq ($(KBUILD_TARGET),win)
- ifeq ($(KBUILD_TARGET_ARCH),amd64)
-  VBOX_MOC4    += -DWIN64
- else
-  VBOX_MOC4    += -DWIN32
- endif
-else ifeq ($(KBUILD_TARGET),darwin)
-  VBOX_MOC4    += -D__APPLE__ -D__GNUC__
-else ifeq ($(KBUILD_TARGET),solaris)
-  VBOX_MOC4    += -D__sun
-else ifeq ($(KBUILD_TARGET),linux)
- # when nothing special is defined, Q_OS_UNIX/Q_WS_X11 will be set
-else
- $(error Port me!)
-endif
 
 ifdef VBOX_WITH_QT4_SUN
@@ -261 +238 @@
         $(LIB_VMM)
 
+ifeq (disabled,yes)
  ifeq ($(KBUILD_TARGET_ARCH),amd64)
   TEMPLATE_VBOXQT4GUIEXE_LIBPATH = \
@@ -268 +246 @@
         $(VBOX_PATH_QT4_LIB)
  endif
+endif
 
  ifeq ($(KBUILD_TARGET),linux)
@@ -276 +255 @@
     $(VBOX_LIBPATH_X11)
  else ifeq ($(KBUILD_TARGET),darwin)
+ifndef USE_KBUILD_QT4_UNIT_PART_3
   TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS += -F$(VBOX_PATH_QT4_FRAMEWORKS) ## @todo fix in the qt unit. Somehow this fixes the #include <QtCore/qstring.h> stuff.
+endif
   TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += -framework Carbon -framework QuickTime -bind_at_load
   TEMPLATE_VBOXQT4GUIEXE_LIBS +=
@@ -313 +294 @@
         $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB)
 ifdef VBOX_WITH_XPCOM
- ## @todo may be worth creating the VBOX_XPCOM SDK def
+ ## @todo may be worth creating the VBOX_XPCOM SDK def, or just a SDK_VBOXXPCOM.
  TEMPLATE_VBOXQT4GUIEXE_DEFS            += VBOX_WITH_XPCOM
  TEMPLATE_VBOXQT4GUIEXE_INCS            += \