Ticket #10: Config.diff

File Config.diff, 2.0 KB (added by Valery V. Sedletski, 9 years ago)

The changes for Config.kmk

  • Config.kmk

    old new  
    164164 && (   $(KBUILD_VERSION_MINOR) >= 2 \
    165165     || (   $(KBUILD_VERSION_MINOR) == 1 \
    166166         && $(KBUILD_VERSION_PATCH) >= 999))
    167  if $(KMK_REVISION) >= 2689
     167 if $(KMK_REVISION) >= 2577
     168  # 2689 // vs
    168169  # OK.
    169170 else
    170171  $(error You must update kBuild! Requires kBuild revision 2577 or later, found $(KMK_REVISION) ($(KBUILD_VERSION)))
     
    519520# Enable MSI support in devices
    520521VBOX_WITH_MSI_DEVICES = 1
    521522# Enable host network interface API.
    522 if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win)
     523if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win os2)
    523524 VBOX_WITH_HOSTNETIF_API = 1
    524525endif
    525526# Emulated USB smart card reader
     
    945946 VBOX_WITH_WEBSERVICES=
    946947 VBOX_WITH_INSTALLER=
    947948 VBOX_WITH_SECURELABEL=
    948  VBOX_WITH_VRDP_AUTHMOD=
    949  VBOX_WITH_VRDP_RDESKTOP=
     949# VBOX_WITH_VRDP_AUTHMOD=
     950# VBOX_WITH_VRDP_RDESKTOP=
    950951 VBOX_WITH_VALIDATIONKIT=
    951952 VBOX_WITH_QTGUI=
    952  VBOX_WITH_USB=
    953  VBOX_WITH_EHCI=
     953# VBOX_WITH_MAIN=1
     954 VBOX_WITH_VIRTIO=
     955 VBOX_WITH_PULSE=
     956 VBOX_WITH_ALSA=
     957
     958# VBOX_WITH_USB=1
     959# VBOX_WITH_VUSB=1
     960# VBOX_WITH_USB_CARDREADER=1
     961# VBOX_WITH_EHCI=1
    954962 VBOX_WITH_DOCS=
    955  VBOX_WITH_PDM_ASYNC_COMPLETION=
    956963 VBOX_WITH_KCHMVIEWER=
    957964 VBOX_WITH_HARDENING=
     965 VBOX_WITH_OGL=
     966# VBOX_WITH_PCI_PASSTHROUGH=
     967# VBOX_WITH_EXTPACK=
    958968endif
    959969
    960970ifeq ($(KBUILD_TARGET),solaris)
     
    18301840 ifeq ($(VBOX_XCURSOR_LIBS),)
    18311841  VBOX_XCURSOR_LIBS := Xcursor
    18321842 endif
     1843 if1of ($(KBUILD_TARGET),os2)
     1844   VBOX_XCURSOR_INCS =
     1845   VBOX_XCURSOR_LIBS =
     1846 endif
    18331847endif
    18341848
    18351849
     
    52055219   TEMPLATE_VBOXQT4GUIEXE_LDFLAGS.darwin     += $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -bind_at_load
    52065220   TEMPLATE_VBOXQT4GUIEXE_LIBS +=
    52075221   TEMPLATE_VBOXQT4GUIEXE_LIBPATH +=
     5222  else ifeq ($(KBUILD_TARGET),os2)
     5223   # ...
    52085224  else
    52095225   TEMPLATE_VBOXQT4GUIEXE_INCS += \
    52105226        $(VBOX_XCURSOR_INCS)