VirtualBox

Changeset 3405 in vbox for trunk


Ignore:
Timestamp:
Jul 3, 2007 10:32:10 PM (17 years ago)
Author:
vboxsync
Message:

OS/2: Enabled VBOX_WITH_MAIN, VBOX_WITH_VBOXSDL and VBOX_WITH_QTGUI by default; corrected paths to the Qt tooklit.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r3401 r3405  
    270270
    271271# Most stuff doesn't build yet on the new targets.
    272 ifeq ($(filter-out os2 freebsd solaris,$(BUILD_TARGET)),)
     272ifeq ($(BUILD_TARGET),os2)
     273 VBOX_WITH_DEBUGGER_GUI=
     274 VBOX_WITH_INSTALLER=
     275 VBOX_WITH_SECURELABEL=
     276 VBOX_WITH_VRDP=
     277 VBOX_WITH_VRDP_AUTHMOD=
     278 VBOX_WITH_VRDP_RDESKTOP=
     279 VBOX_WITH_TESTSUITE=
     280 VBOX_WITH_USB=
     281 VBOX_WITH_DOCS=
     282endif
     283
     284# Most stuff doesn't build yet on the new targets.
     285ifeq ($(filter-out freebsd solaris,$(BUILD_TARGET)),)
    273286 #VBOX_WITH_VBOXBFE=
    274287 VBOX_WITH_MAIN=
     
    788801ifneq ($(BUILD_TARGET),win)
    789802 VBOX_WITH_XPCOM      = 1
    790  VBOX_XPIDL          ?= $(PATH_OBJ)/src/libs/xpcom18a4/xpidl/xpidl$(HOSTSUFF_EXE)
     803 VBOX_XPIDL          ?= $(VBOX_PATH_SDK)/bin/xpidl$(HOSTSUFF_EXE)
    791804 VBOX_PATH_XPCOM_IDL ?= $(VBOX_PATH_SDK)/idl
    792805 VBOX_XPCOM_INCS     ?= \
     
    804817 endif
    805818endif
     819
     820## @todo isn't worth to teach kmk_ash.exe to do the following for every .EXE it runs?
     821ifeq ($(BUILD_TARGET),os2)
     822 VBOX_XPIDL    := cmd.exe /c "set BEGINLIBPATH=$(dir $(VBOX_XPIDL)) & $(VBOX_XPIDL)"
     823endif
     824#$(error $(VBOX_XPIDL))
    806825
    807826# The X11 LIBPATH. (The amd64 hack is for RHEL4.)
     
    10851104  QTDIR := $(call lastword,$(QTDIR))
    10861105 endif
    1087 
     1106else ifeq ($(BUILD_TARGET),os2)
     1107 QTDIR ?= $(PATH_DEVTOOLS_TRG)/qt/v3.3.1
     1108 VBOX_PATH_QT ?= $(QTDIR)
     1109 LIB_QT ?= $(lastword $(sort $(wildcard $(VBOX_PATH_QT)/lib/qt331*.lib)))
     1110 QTDIR := $(VBOX_PATH_QT)
    10881111else ifeq ($(BUILD_TARGET),darwin)
    10891112 ifndef VBOX_PATH_QT
     
    11161139VBOX_LUPDATE  ?= $(VBOX_PATH_QT_HOST)/bin/lupdate$(HOSTSUFF_EXE)
    11171140VBOX_LRELEASE ?= $(VBOX_PATH_QT_HOST)/bin/lrelease$(HOSTSUFF_EXE)
     1141
     1142## @todo isn't worth to teach kmk_ash.exe to do the following for every .EXE it runs?
     1143ifeq ($(BUILD_TARGET),os2)
     1144 VBOX_UIC      := cmd.exe /c "set BEGINLIBPATH=$(dir $(VBOX_UIC)) & $(VBOX_UIC)"
     1145 VBOX_MOC      := cmd.exe /c "set BEGINLIBPATH=$(dir $(VBOX_MOC)) & $(VBOX_MOC)"
     1146 VBOX_LUPDATE  := cmd.exe /c "set BEGINLIBPATH=$(dir $(VBOX_LUPDATE)) & $(VBOX_LUPDATE)"
     1147 VBOX_LRELEASE := cmd.exe /c "set BEGINLIBPATH=$(dir $(VBOX_LRELEASE)) & $(VBOX_LRELEASE)"
     1148endif
    11181149
    11191150#
  • trunk/Makefile.kmk

    r3150 r3405  
    5656endif
    5757
     58
    5859# The Qt DLLs.
    59 #ifeq ($(filter-out win os2,$(BUILD_TARGET)),)
    60 ifeq ($(filter-out win,$(BUILD_TARGET)),)
    61  ifneq ($(VBOX_WITH_QTGUI),)
     60ifneq ($(VBOX_WITH_QTGUI),)
     61 ifeq ($(BUILD_TARGET),win)
    6262  #include $(PATH_KBUILD)/sdks/QT3.kmk
    6363  #bin_SOURCES += \
     
    7474        $(VBOX_DLL_QT)=>$(not-dir $(VBOX_DLL_QT))
    7575  endif
    76  endif
    77 endif
    78 
    79 # The GLIB and LIBIDL DLLs.
    80 ifeq ($(filter-out os2,$(BUILD_TARGET)),)
    81  # static libraries of these may be provided instead,
    82  # so copy DLLs only when they are present
    83  bin_SOURCES += $(wildcard $(VBOX_PATH_GLIB)/lib/glib.dll)
    84  bin_SOURCES += $(wildcard $(VBOX_PATH_LIBIDL)/lib/libIDL.dll)
    85 endif
    86 
    87 ifeq ($(BUILD_TARGET),darwin)
    88  ifneq ($(VBOX_WITH_QTGUI),)
     76 else ifeq ($(BUILD_TARGET),os2)
     77  VBOX_DLL_QT ?= $(lastword $(sort $(wildcard $(VBOX_PATH_QT)/bin/qt*.dll)))
     78  ifdef VBOX_DLL_QT
     79   bin_SOURCES += \
     80        $(VBOX_DLL_QT)=>$(not-dir $(VBOX_DLL_QT))
     81  endif
     82 else ifeq ($(BUILD_TARGET),darwin)
    8983  ifdef LIB_QT
    9084   bin_SOURCES += \
     
    9387 endif
    9488endif
     89
    9590
    9691# The compiler runtime DLLs.
  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r3401 r3405  
    8484# Sources containing local definitions of classes that use the Q_OBJECT macro
    8585VirtualBox_QT_MOCSRCS = src/VBoxSelectorWnd.cpp
    86 ifneq ($(BUILD_TARGET),win)
     86ifdef VBOX_WITH_XPCOM
    8787VirtualBox_QT_MOCSRCS += src/COMDefs.cpp
    8888endif
     
    159159## @todo GCC3 seems to lack -Wno-missing-base-class-initializer, so we use
    160160#  more generic -Wno-extra
    161 ifneq ($(BUILD_TARGET),win)
     161ifdef VBOX_WITH_XPCOM
    162162src/COMDefs.cpp_CXXFLAGS  = $(VBOX_GCC_Wno-extra)
    163163endif
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette