VirtualBox

Changeset 5362

Show
Ignore:
Timestamp:
10/17/07 19:15:47 (1 year ago)
Author:
vboxsync
Message:

Install the qt shared object when picking it from tools.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Config.kmk

    r5360 r5362  
    783783endif 
    784784 
     785## Enable C++ electric fence heap. (Warning: will easily run out of virtual memory / kernel stuff on Linux/Windows.) 
     786#LIB_RUNTIME += $(LIB_RUNTIME_EF) $(LIB_RUNTIME) 
     787 
    785788# Overridable libraries (unix). 
    786789LIB_PTHREAD      ?= pthread 
    …… 
    800803 endif 
    801804 VBOX_XCURSOR_LIBS ?= Xcursor 
    802 else 
    803  VBOX_XCURSOR_LIBS ?= $(LIB_XCURSOR) 
    804 endif 
    805  
    806 ## Enable C++ electric fence heap. 
    807 #LIB_RUNTIME += $(LIB_RUNTIME_EF) $(LIB_RUNTIME) 
     805endif 
     806 
    808807 
    809808# Intel ASL compiler for ACPI 
    …… 
    11621161  VBOX_PATH_QT ?= $(PATH_DEVTOOLS_TRG)/qt/v3.3.8-r1 
    11631162 endif 
     1163 VBOX_MUST_INSTALL_LIB_QT ?= 1 
    11641164 LIB_QT ?= $(VBOX_PATH_QT)/lib/libqt-mt.3.dylib 
    11651165 LIB_QTMAIN ?= $(NO_SUCH_VARIABLE) 
    …… 
    11701170else 
    11711171 ifndef QTDIR 
    1172   ifdef VBOX_WITH_QTGUI 
    1173    ifeq ($(BUILD_TARGET),solaris) 
    1174     QTDIR := $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v3.*))) 
     1172  ifndef VBOX_PATH_QT 
     1173   # If QTDIR and VBOX_WITH_QTGUI aren't defined, we'll first 
     1174   # look in the tools tree and then on the system. If in the 
     1175   # tools, we'll have to install it. 
     1176   # Results are exported to avoid having to do this for every make file. 
     1177   VBOX_PATH_QT := $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v3.*))) 
     1178   ifneq ($(VBOX_PATH_QT),) 
     1179    export VBOX_PATH_QT 
     1180    export VBOX_MUST_INSTALL_LIB_QT := 1 
     1181    export LIB_QT := $(VBOX_PATH_QT)/lib/libqt-mt.so.3 
     1182    export LD_LIBRARY_PATH := $(VBOX_PATH_QT)/lib:$(LD_LIBRARY_PATH) 
     1183   else 
     1184    QTDIR := $(wildcard /usr/share/qt3) 
     1185    ifeq ($(QTDIR),) 
     1186     QTDIR := $(patsubst %/bin/moc,%,$(firstword $(wildcard /usr/bin/moc /usr/local/bin/moc /usr/X11R6/bin/moc))) 
     1187    endif 
     1188    ifneq ($(QTDIR),) 
     1189     export QTDIR 
     1190    endif 
    11751191   endif 
    1176    ifeq ($(QTDIR),) 
    1177     QTDIR := $(wildcard /usr/share/qt3) 
    1178    else 
    1179     export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH) 
    1180    endif 
    1181    ifeq ($(QTDIR),) 
    1182     QTDIR := $(patsubst %/bin/moc,%,$(firstword $(wildcard /usr/bin/moc /usr/local/bin/moc /usr/X11R6/bin/moc))) 
    1183    endif 
    1184    ifneq ($(QTDIR),) 
    1185     export QTDIR 
    1186    endif 
     1192  else 
     1193   QTDIR := $(VBOX_PATH_QT) 
     1194   export QTDIR 
    11871195  endif 
    11881196 endif 

  • trunk/Makefile.kmk

    r4628 r5362  
    7575        $(VBOX_DLL_QT)=>$(not-dir $(VBOX_DLL_QT)) 
    7676  endif 
    77  else ifeq ($(BUILD_TARGET),darwin) 
    78   ifdef LIB_QT 
     77 else ifeq ($(VBOX_MUST_INSTALL_LIB_QT),1) 
    7978   bin_SOURCES += \ 
    8079        $(LIB_QT) 
    81   endif 
    8280 endif 
    8381endif 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy