Changeset 10074 in vbox for trunk/src/VBox

Timestamp:

Jul 1, 2008 3:05:31 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Preparation for building on Solaris.

File:

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

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

@@ -59 +59 @@
    endif
   endif
- else ifeq ($(KBUILD_TARGET),win)
+ 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
@@ -115 +120 @@
   VBOX_LIBS_QT4      = $(patsubst %, VBox%, $(VBOX_MODULE_QT4))
   VBOX_QT4_RUNTIME   = $(patsubst %, $(VBOX_PATH_QT4_LIB)/libVBox%.so.4, $(VBOX_MODULE_QT4))
+  # Export the ld library path
+  export LD_LIBRARY_PATH := $(VBOX_PATH_QT4_LIB):$(LD_LIBRARY_PATH)
  else
   VBOX_LIBS_QT4      = $(VBOX_MODULE_QT4)
@@ -148 +155 @@
   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 ifeq ($(KBUILD_TARGET),darwin)
-  VBOX_MOC4    += -D__APPLE__ -D__GNUC__
 else
  $(error Port me!)
@@ -291 +300 @@
         /usr/X11R6/include \
         /usr/local/include
+  endif
+  ifeq ($(KBUILD_TARGET),solaris)
+   TEMPLATE_VBOXQT4GUIEXE_LIBS += \
+        rt socket nsl
   endif
  endif