Changeset 12173 in vbox

Timestamp:

Sep 6, 2008 4:24:33 AM (16 years ago)

Author:

vboxsync

Message:

Makefiles: Moved the Qt4 templates to Config.kmk and the qt4-bin install target to the root makefile.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -2859 +2859 @@
 
 #
+# Qt 4
+# Qt 4
+# Qt 4
+#
+
+# 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
+
+#
+# Handmade configuration of qt4 - very annoying, this needs to
+# be cleaned up properly later some time (not important now).
+#
+ifeq ($(VBOX_PATH_QT4),)
+ ifeq ($(KBUILD_TARGET),darwin)
+  VBOX_PATH_QT4 := $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))
+  ifeq ($(VBOX_PATH_QT4),)
+   ifneq ($(wildcard /Library/Frameworks/QtCore.framework),)
+    # Using the global installation (for OSE).
+    VBOX_PATH_QT4 ?= /usr
+    VBOX_PATH_QT4_FRAMEWORKS ?= /Library/Frameworks
+   endif
+  endif
+ else if1of ($(KBUILD_TARGET),win)
+  VBOX_PATH_QT4 ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))
+ else if1of ($(KBUILD_TARGET),solaris)
+  VBOX_PATH_QT4 ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))
+  ifneq ($(VBOX_PATH_QT4),)
+   VBOX_WITH_QT4_SUN = 1
+  endif
+ endif
+endif
+ifeq ($(VBOX_PATH_QT4),)
+ if1of ($(USERNAME), bird)
+  # gentoo (64-bit)
+  VBOX_PATH_QT4          ?= /usr
+  VBOX_PATH_QT4_LIB      ?= /usr/lib/qt4
+ endif
+endif
+VBOX_PATH_QT4            ?= /usr
+VBOX_PATH_QT4_LIB        ?= $(VBOX_PATH_QT4)/lib
+
+# Hack LD_LIBRARY_PATH for stuff in tools.
+ifdef VBOX_WITH_QT4_SUN
+ if1of ($(KBUILD_TARGET), linux)
+  export LD_LIBRARY_PATH := $(VBOX_PATH_QT4_LIB):$(LD_LIBRARY_PATH)
+ endif
+endif
+
+
+#
+# Template for building Qt GUI executables.
+#
+TEMPLATE_VBOXQT4GUIEXE = VBox Qt4 GUI Executable
+USES += qt4
+TEMPLATE_VBOXQT4GUIEXE_USES = qt4
+TEMPLATE_VBOXQT4GUIEXE_QTTOOL = QT4
+TEMPLATE_VBOXQT4GUIEXE_MOCTOOL = QT4
+TEMPLATE_VBOXQT4GUIEXE_UICTOOL = QT4
+TEMPLATE_VBOXQT4GUIEXE_RCCTOOL = QT4
+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
+TEMPLATE_VBOXQT4GUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS)
+
+ifeq ($(KBUILD_TARGET),win)
+ TEMPLATE_VBOXQT4GUIEXE_TOOL = $(VBOX_VCC_TOOL)
+ TEMPLATE_VBOXQT4GUIEXE_DEFS += \
+    _WIN32_WINNT=0x0500 UNICODE _UNICODE \
+    QT_DLL _CRT_SECURE_NO_DEPRECATE \
+    $(QMAKE_PRL_DEFINES)
+ ## @todo VCC70 flags?
+ ifdef VBOX_USE_VCC80
+  TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = \
+        -nologo -Zm200 -W3 -MD -Zi -EHsc -Zc:wchar_t-
+  TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS.debug = -RTCsu
+ else
+  TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = \
+        -nologo -Zm200 -W3 -MD -Zi -GX
+  TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS.debug = -GZ
+ endif
+ TEMPLATE_VBOXQT4GUIEXE_INCS += \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_INC)
+ TEMPLATE_VBOXQT4GUIEXE_LDFLAGS = \
+        /NOD /NOLOGO /INCREMENTAL:NO /MAPINFO:EXPORTS /DEBUG \
+        /DELAYLOAD:oleaut32.dll
+ TEMPLATE_VBOXQT4GUIEXE_SDKS += WINPSDK
+ TEMPLATE_VBOXQT4GUIEXE_LIBS = \
+        $(VBOX_LIBS_QT4) \
+        $(LIB_RUNTIME) \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcprt.lib \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcrt.lib \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/delayimp.lib \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_LIB)/atls.lib
+ TEMPLATE_VBOXQT4GUIEXE_POST_CMDS = $(VBOX_SIGN_IMAGE_CMDS)
+
+else # the gcc guys:
+ TEMPLATE_VBOXQT4GUIEXE_TOOL = $(VBOX_GCC_TOOL)
+ TEMPLATE_VBOXQT4GUIEXE_DEFS.linux = _REENTRANT
+
+ TEMPLATE_VBOXQT4GUIEXE_DEFS.solaris = _REENTRANT
+
+ TEMPLATE_VBOXQT4GUIEXE_INCS += \
+        $(LIB_SDL_INC)
+ TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = \
+        -g -pipe -Wall -W -frtti -fno-exceptions -Wno-non-virtual-dtor \
+        -Wno-long-long -fshort-wchar -fno-strict-aliasing \
+        $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden)
+ TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS.x86 = -m32
+ TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS.amd64 = -m64
+ TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS.linux = -pthread
+ TEMPLATE_VBOXQT4GUIEXE_LDFLAGS.x86 = -m32
+ TEMPLATE_VBOXQT4GUIEXE_LDFLAGS.amd64 = -m64
+ TEMPLATE_VBOXQT4GUIEXE_LIBS = \
+        $(VBOX_LIBS_QT4) \
+        $(LIB_SDL) \
+        $(LIB_RUNTIME) \
+        $(LIB_REM) \
+        $(LIB_VMM)
+
+ ifeq ($(KBUILD_TARGET),linux)
+  TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += $(VBOX_LD_as_needed)
+  TEMPLATE_VBOXQT4GUIEXE_LIBS += \
+    $(VBOX_XCURSOR_LIBS) \
+        Xext
+  TEMPLATE_VBOXQT4GUIEXE_LIBPATH += \
+    $(VBOX_LIBPATH_X11)
+ else ifeq ($(KBUILD_TARGET),darwin)
+  TEMPLATE_VBOXQT4GUIEXE_LDFLAGS.darwin += -bind_at_load
+  TEMPLATE_VBOXQT4GUIEXE_LIBS +=
+  TEMPLATE_VBOXQT4GUIEXE_LIBPATH +=
+ else
+  TEMPLATE_VBOXQT4GUIEXE_INCS += \
+        $(VBOX_XCURSOR_INCS)
+  TEMPLATE_VBOXQT4GUIEXE_LIBS += \
+    $(VBOX_XCURSOR_LIBS) \
+        Xext \
+        X11 \
+        m \
+        $(LIB_PTHREAD)
+  TEMPLATE_VBOXQT4GUIEXE_LIBPATH += \
+        $(VBOX_LIBPATH_X11)
+  ifeq ($(KBUILD_TARGET),freebsd)
+   TEMPLATE_VBOXQT4GUIEXE_INCS += \
+        /usr/include \
+        /usr/X11R6/include \
+        /usr/local/include
+  endif
+  ifeq ($(KBUILD_TARGET),solaris)
+   TEMPLATE_VBOXQT4GUIEXE_LIBS += \
+        rt socket nsl
+  endif
+ endif
+ # Assume the Qt shared objects are in the same directory as the executable, on Solaris too.
+ ifdef VBOX_WITH_RUNPATH
+  TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)'
+ else ifdef VBOX_WITH_ORIGIN
+  TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)'
+ endif
+
+endif
+
+# Add COM/XPCOM stuff
+TEMPLATE_VBOXQT4GUIEXE_LIBS += \
+        $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB)
+ifdef VBOX_WITH_XPCOM
+ ## @todo may be worth creating the VBOX_XPCOM SDK def, or just a SDK_VBOXXPCOM.
+ TEMPLATE_VBOXQT4GUIEXE_DEFS += VBOX_WITH_XPCOM
+ ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+  TEMPLATE_VBOXQT4GUIEXE_DEFS += VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+ endif
+ TEMPLATE_VBOXQT4GUIEXE_INCS += \
+        $(VBOX_XPCOM_INCS)
+ TEMPLATE_VBOXQT4GUIEXE_LIBS += \
+        $(LIB_XPCOM)
+else  # COM
+ TEMPLATE_VBOXQT4GUIEXE_INCS += \
+        $(VBOX_PATH_SDK)/bindings/mscom/include
+endif # COM
+
+#
+# Template for building Qt4 GUI components.
+#
+TEMPLATE_VBOXQT4GUI = VBox Qt4 GUI Components
+TEMPLATE_VBOXQT4GUI_EXTENDS = VBOXQT4GUIEXE
+TEMPLATE_VBOXQT4GUI_LIBS = $(filter-out $(QTMAIN),$(TEMPLATE_VBOXQT4GUIEXE_LIBS))
+ifeq ($(KBUILD_TARGET),darwin)
+ TEMPLATE_VBOXQT4GUI_LDFLAGS.darwin += $(filter-out -bind_at_load,$(TEMPLATE_VBOXQT4GUIEXE_LDFLAGS.darwin)) \
+        -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
+endif
+ifeq ($(filter-out solaris.x86 %.amd64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),)
+ ifneq ($(KBUILD_TARGET),win)
+  TEMPLATE_VBOXQT4GUI_DEFS     = PIC $(TEMPLATE_VBOXQT4GUIEXE_DEFS)
+  TEMPLATE_VBOXQT4GUI_CFLAGS   = -fPIC $(TEMPLATE_VBOXQT4GUIEXE_CFLAGS)
+  TEMPLATE_VBOXQT4GUI_CXXFLAGS = -fPIC $(TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS)
+  TEMPLATE_VBOXQT4GUI_LDFLAGS  = -fPIC $(TEMPLATE_VBOXQT4GUIEXE_LDFLAGS)
+ endif
+endif
+
+
+
+#
 # Template for building build bldprogs.
 #

trunk/Makefile.kmk

@@ -138 +138 @@
  endif
 endif
+
+
+ifdef VBOX_WITH_QT4_SUN
+#
+# Install our Qt DLLs / Shared Objects / Frameworks.
+#
+## @todo move to the root Makefile.kmk, and remove qt4-bin from INSTALLS below.
+ INSTALLS += qt4-bin
+ qt4-bin_MODE = 644
+ ifeq ($(KBUILD_TARGET),darwin)
+  qt4-bin_INST = $(INST_VIRTUALBOX)Contents/Frameworks/
+  qt4-bin_SOURCES = \
+        $(VBOX_PATH_QT4)/Frameworks/QtCore.framework/Versions/4/QtCore=>QtCore.framework/Versions/4/QtCore \
+        $(VBOX_PATH_QT4)/Frameworks/QtGui.framework/Versions/4/QtGui=>QtGui.framework/Versions/4/QtGui
+ else ifeq ($(KBUILD_TARGET),win)
+  qt4-bin_INST = $(INST_BIN)
+  qt4-bin_SOURCES = \
+        $(VBOX_PATH_QT4_LIB)/VBoxQtCore4.dll \
+        $(VBOX_PATH_QT4_LIB)/VBoxQtGui4.dll
+ else
+  qt4-bin_INST = $(INST_BIN)
+  qt4-bin_SOURCES = \
+        $(VBOX_PATH_QT4_LIB)/libVBoxQtCore.so.4 \
+        $(VBOX_PATH_QT4_LIB)/libVBoxQtGui.so.4
+ endif
+endif # VBOX_WITH_QT4_SUN