Ticket #1: Config.kmk.diff

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

     
    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)))
     
    952953 VBOX_WITH_USB=
    953954 VBOX_WITH_EHCI=
    954955 VBOX_WITH_DOCS=
    955  VBOX_WITH_PDM_ASYNC_COMPLETION=
    956956 VBOX_WITH_KCHMVIEWER=
    957957 VBOX_WITH_HARDENING=
    958958endif
     
    18301830 ifeq ($(VBOX_XCURSOR_LIBS),)
    18311831  VBOX_XCURSOR_LIBS := Xcursor
    18321832 endif
     1833 if1of ($(KBUILD_TARGET),os2)
     1834   VBOX_XCURSOR_INCS =
     1835   VBOX_XCURSOR_LIBS =
     1836 endif
    18331837endif
    18341838
    18351839
     
    52055209   TEMPLATE_VBOXQT4GUIEXE_LDFLAGS.darwin     += $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -bind_at_load
    52065210   TEMPLATE_VBOXQT4GUIEXE_LIBS +=
    52075211   TEMPLATE_VBOXQT4GUIEXE_LIBPATH +=
     5212  else ifeq ($(KBUILD_TARGET),os2)
     5213   # ...
    52085214  else
    52095215   TEMPLATE_VBOXQT4GUIEXE_INCS += \
    52105216        $(VBOX_XCURSOR_INCS)