Ticket #1: Config.kmk.2.diff

\Config.kmk

@@ -164 +164 @@
  && (   $(KBUILD_VERSION_MINOR) >= 2 \
      || (   $(KBUILD_VERSION_MINOR) == 1 \
          && $(KBUILD_VERSION_PATCH) >= 999))
- if $(KMK_REVISION) >= 2689
+ if $(KMK_REVISION) >= 2577
+  # 2689 // vs
   # OK.
  else
   $(error You must update kBuild! Requires kBuild revision 2577 or later, found $(KMK_REVISION) ($(KBUILD_VERSION)))
@@ -517 +518 @@
 # Enable MSI support in devices
 VBOX_WITH_MSI_DEVICES = 1
 # Enable host network interface API.
-if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win)
+if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win os2)
  VBOX_WITH_HOSTNETIF_API = 1
 endif
 # Emulated USB smart card reader
@@ -643 +644 @@
 # Enable S3 support (requires libcurl)
 VBOX_WITH_S3 = 1
 # Enable Host=>Guest Drag'n'Drop
-if1of ($(KBUILD_TARGET), darwin linux solaris win)
+if1of ($(KBUILD_TARGET), darwin linux solaris win os2)
  VBOX_WITH_DRAG_AND_DROP = 1
- if1of ($(KBUILD_TARGET), darwin linux solaris win)
+ if1of ($(KBUILD_TARGET), darwin linux solaris win os2)
   VBOX_WITH_DRAG_AND_DROP_GH = $(VBOX_WITH_DRAG_AND_DROP)
  endif
  ifdef VBOX_WITH_DRAG_AND_DROP_GH
@@ -961 +962 @@
  VBOX_WITH_USB=
  VBOX_WITH_EHCI=
  VBOX_WITH_DOCS=
- VBOX_WITH_PDM_ASYNC_COMPLETION=
  VBOX_WITH_KCHMVIEWER=
  VBOX_WITH_HARDENING=
 endif
@@ -1840 +1840 @@
  ifeq ($(VBOX_XCURSOR_LIBS),)
   VBOX_XCURSOR_LIBS := Xcursor
  endif
+ if1of ($(KBUILD_TARGET),os2)
+   VBOX_XCURSOR_INCS = 
+   VBOX_XCURSOR_LIBS = 
+ endif
 endif
 
 
@@ -4213 +4217 @@
         $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \
         $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib \
         $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/oldnames.lib
-else ifn1of ($(KBUILD_TARGET), darwin linux solaris)
+else ifn1of ($(KBUILD_TARGET), darwin linux solaris os2)
  # The gcc guys sans darwin, linux and solaris (don't depend on statically compiled system libs there)
  TEMPLATE_VBOXR3STATIC_CFLAGS          = $(TEMPLATE_VBOXR3EXE_CFLAGS) -static
  TEMPLATE_VBOXR3STATIC_CXXFLAGS        = $(TEMPLATE_VBOXR3EXE_CXXFLAGS) -static
@@ -4794 +4798 @@
 TEMPLATE_VBOXMAINEXE_LDFLAGS.linux       = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
  else ifeq ($(KBUILD_TARGET),os2)
 TEMPLATE_VBOXMAINEXE_TOOL                = GXX3OMF
-TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME)
+TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME) $(PATH_STAGE_LIB)/RuntimeR3$(VBOX_SUFF_LIB)
  else ifeq ($(KBUILD_TARGET),darwin)
 TEMPLATE_VBOXMAINEXE_TOOL                = GXX4MACHO
 TEMPLATE_VBOXMAINEXE_DEFS               += $(VBOX_DARWIN_DEF_SDK_DEFS)
@@ -5272 +5276 @@
    TEMPLATE_VBOXQT4GUIEXE_LDFLAGS.darwin     += $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -bind_at_load
    TEMPLATE_VBOXQT4GUIEXE_LIBS +=
    TEMPLATE_VBOXQT4GUIEXE_LIBPATH +=
+  else ifeq ($(KBUILD_TARGET),os2)
+   # ...
   else
    TEMPLATE_VBOXQT4GUIEXE_INCS += \
         $(VBOX_XCURSOR_INCS)