Changeset 9967 in vbox for trunk/src/VBox/Frontends/VirtualBox4

Timestamp:

Jun 26, 2008 3:53:37 PM (16 years ago)

Author:

vboxsync

Message:

Qt4: allow to link Linux/Solaris builds against our Qt4 compiled by Sun

File:

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

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

@@ -115 +115 @@
   VBOX_LIBS_QT4      = $(patsubst %, VBox%4, $(VBOX_MODULE_QT4))
   VBOX_QT4_RUNTIME   = $(patsubst %, $(VBOX_PATH_QT4_LIB)/VBox%4.dll, $(VBOX_MODULE_QT4))
+ else ifdef VBOX_WITH_QT4_SUN
+  # Qt4 compiled by Sun with altered library names
+  VBOX_LIBS_QT4      = $(patsubst %, VBox%, $(VBOX_MODULE_QT4))
+  VBOX_QT4_RUNTIME   =
  else
   VBOX_LIBS_QT4      = $(VBOX_MODULE_QT4)
@@ -265 +269 @@
   TEMPLATE_VBOXQT4GUIEXE_LIBS += \
     $(VBOX_XCURSOR_LIBS)
+  TEMPLATE_VBOXQT4GUIEXE_LIBPATH += \
+    $(VBOX_LIBPATH_X11)
  else ifeq ($(KBUILD_TARGET),darwin)
   # We have to add the framework path to both the linker and the compiler also.