VirtualBox

Changeset 6348

Show
Ignore:
Timestamp:
01/14/08 12:02:02 (8 months ago)
Author:
vboxsync
Message:

Tools: Added and activated win.x86.qt.v3.3.8.zip.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Config.kmk

    r6293 r6348  
    12331233## @todo convert this into SDK and integrate the Qt stuff into kBuild. 
    12341234ifeq ($(BUILD_TARGET),win) 
    1235  ifeq ($(BUILD_TARGET_ARCH),x86) 
    1236   VBOX_PATH_QT ?= $(PATH_DEVTOOLS_TRG)/qt/v3.3.3 
    1237   LIB_QT ?= $(VBOX_PATH_QT)/lib/dynamic/qt-mt333.lib 
    1238   LIB_QTMAIN ?= $(VBOX_PATH_QT)/lib/dynamic/qtmain.lib 
    1239  else 
    1240   VBOX_PATH_QT ?= $(PATH_DEVTOOLS_TRG)/qt/v3.3.8 
    1241   LIB_QT ?= $(VBOX_PATH_QT)/lib/qt-mt338.lib 
    1242   LIB_QTMAIN ?= $(VBOX_PATH_QT)/lib/qtmain.lib 
    1243  endif 
    1244  ifndef QTDIR 
    1245   QTDIR := $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/v*)) 
    1246   QTDIR := $(call lastword,$(QTDIR)) 
    1247  endif 
     1235 VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v3.*))) 
     1236 VBOX_DLL_QT ?= $(firstword $(wildcard $(VBOX_PATH_QT)/bin/VBoxQt3*.dll) \ 
     1237                            $(wildcard $(VBOX_PATH_QT)/bin/qtmt3*.dll) \ 
     1238                            $(wildcard $(VBOX_PATH_QT)/bin/qt-mt3*.dll) \ 
     1239                            $(wildcard $(VBOX_PATH_QT)/lib/qt-mt3*.dll)) 
     1240 ifneq ($(wildcard $(VBOX_PATH_QT)/bin/accessible/VBoxQtWidgets100.dll),) 
     1241  VBOX_QT_BINARIES += \ 
     1242    $(VBOX_PATH_QT)/bin/accessible/VBoxQtWidgets100.dll=>accessible/VBoxQtWidgets100.dll 
     1243 endif 
     1244 LIB_QT ?= $(firstword $(wildcard $(VBOX_PATH_QT)/lib/VBoxQt3*.lib) \ 
     1245                       $(wildcard $(VBOX_PATH_QT)/lib/qt-mt3*.lib) \ 
     1246                       $(wildcard $(VBOX_PATH_QT)/lib/dynamic/qt-mt3*.lib)) 
     1247 LIB_QT_PRL ?= $(firstword $(wildcard $(VBOX_PATH_QT)/lib/VBoxQt.prl) \ 
     1248                           $(wildcard $(VBOX_PATH_QT)/lib/qt-mt.prl) \ 
     1249                           $(wildcard $(VBOX_PATH_QT)/lib/dynamic/qt-mt.prl)) 
     1250 LIB_QTMAIN ?= $(firstword $(wildcard $(VBOX_PATH_QT)/lib/qtmain.lib) \ 
     1251                           $(wildcard $(VBOX_PATH_QT)/lib/dynamic/qtmain.lib)) 
     1252 QTDIR ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/qt/v3.*))) 
    12481253else ifeq ($(BUILD_TARGET),os2) 
    12491254 QTDIR ?= $(PATH_DEVTOOLS_TRG)/qt/v3.3.1 
    12501255 VBOX_PATH_QT ?= $(QTDIR) 
     1256 VBOX_DLL_QT ?= $(lastword $(sort $(wildcard $(VBOX_PATH_QT)/bin/*qt*.dll))) 
    12511257 LIB_QT ?= $(lastword $(sort $(wildcard $(VBOX_PATH_QT)/lib/*qt*.lib))) 
     1258 LIB_QT_PRL ?= $(lastword $(sort $(wildcard $(VBOX_PATH_QT)/lib/*qt*.prl))) 
    12521259 QTDIR := $(VBOX_PATH_QT) 
    12531260else ifeq ($(BUILD_TARGET),darwin) 
    …… 
    21502157 
    21512158ifeq ($(BUILD_TARGET),win) 
     2159 # drag in library configuration (we need QMAKE_PRL_DEFINES) 
     2160 ifneq ($(LIB_QT_PRL),) 
     2161  include $(LIB_QT_PRL) 
     2162 endif 
    21522163 TEMPLATE_VBOXQTGUIEXE_TOOL = $(VBOX_VCC_TOOL) 
    21532164 TEMPLATE_VBOXQTGUIEXE_DEFS += \ 
    21542165    _WIN32_WINNT=0x0500 UNICODE _UNICODE \ 
    2155     QT_DLL _CRT_SECURE_NO_DEPRECATE 
     2166    QT_DLL _CRT_SECURE_NO_DEPRECATE \ 
     2167    $(QMAKE_PRL_DEFINES) 
    21562168 ## @todo VCC70 flags? 
    21572169 ifdef VBOX_USE_VCC80 
    …… 
    21972209 TEMPLATE_VBOXQTGUIEXE_LDFLAGS.x86 = -m32 
    21982210 TEMPLATE_VBOXQTGUIEXE_LDFLAGS.amd64 = -m64 
    2199  ## @todo no $(LIB_QTMAIN) here? 
    22002211 TEMPLATE_VBOXQTGUIEXE_LIBS = \ 
    22012212        $(LIB_QT) \ 
    …… 
    22212232  TEMPLATE_VBOXQTGUIEXE_LIBPATH += 
    22222233 else ifeq ($(BUILD_TARGET),os2) 
     2234  # drag in library configuration (we need QMAKE_PRL_DEFINES) 
     2235  ifneq ($(LIB_QT_PRL),) 
     2236   include $(LIB_QT_PRL) 
     2237  endif 
     2238  TEMPLATE_VBOXQTGUIEXE_DEFS += $(QMAKE_PRL_DEFINES) 
    22232239  TEMPLATE_VBOXQTGUIEXE_LIBS += 
    22242240  TEMPLATE_VBOXQTGUIEXE_LIBPATH += 

  • trunk/Makefile.kmk

    r6307 r6348  
    5858# The Qt DLLs. 
    5959ifneq ($(VBOX_WITH_QTGUI),) 
    60  ifeq ($(BUILD_TARGET),win) 
     60 ifeq ($(filter-out win os2,$(BUILD_TARGET)),) 
    6161  #include $(PATH_KBUILD)/sdks/QT3.kmk 
    6262  #bin_SOURCES += \ 
    6363  #     $(DLL_SDK_QT3_QT) 
    64   ifeq ($(BUILD_TARGET).$(BUILD_TARGET_ARCH),win.x86) 
    65    VBOX_DLL_QT ?= $(VBOX_PATH_QT)/bin/qt-mt333.dll 
    66   else ifeq ($(BUILD_TARGET).$(BUILD_TARGET_ARCH),win.amd64) 
    67    VBOX_DLL_QT ?= $(PATH_DEVTOOLS)/win.amd64/Qt/v3.3.8/lib/qt-mt338.dll=>qt-mt338.dll 
    68   endif 
    6964  ifdef VBOX_DLL_QT 
    7065   bin_SOURCES += \ 
    7166        $(VBOX_DLL_QT)=>$(not-dir $(VBOX_DLL_QT)) 
    7267  endif 
    73  else ifeq ($(BUILD_TARGET),os2) 
    74   VBOX_DLL_QT ?= $(lastword $(sort $(wildcard $(VBOX_PATH_QT)/bin/*qt*.dll))) 
    75   ifneq ($(strip $(VBOX_DLL_QT)),) 
    76    bin_SOURCES += \ 
    77         $(VBOX_DLL_QT)=>$(not-dir $(VBOX_DLL_QT)) 
     68  ifdef VBOX_QT_BINARIES 
     69   bin_SOURCES += $(VBOX_QT_BINARIES) 
    7870  endif 
    7971 else ifeq ($(VBOX_MUST_INSTALL_LIB_QT),1) 
    …… 
    9082  include $(PATH_KBUILD)/tools/VCC80AMD64.kmk 
    9183  bin_SOURCES.x86 += \ 
    92       $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \ 
     84      $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \ 
    9385        $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcr80.dll=>Microsoft.VC80.CRT/msvcr80.dll \ 
    9486        $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcp80.dll=>Microsoft.VC80.CRT/msvcp80.dll \ 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy