Ticket #64: kBuild_qt3_os2.patch

units/qt3.kmk

@@ -69 +69 @@
   # If target == host, try look for Qt in the various platform specific places.
   ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
    ifeq ($(KBUILD_TARGET),darwin)
-    # No idea here yet...
+    # No idea here yet... (look at the stuff in vbox/Config.kmk)
    else ifeq ($(KBUILD_TARGET),os2)
-    # No idea here yet...
+    QTDIR ?= $(PATH_DEVTOOLS_TRG)/qt/v3.3.1
+    PATH_SDK_QT3    := $(QTDIR)
+    DLL_SDK_QT3_QT  := $(lastword $(sort $(wildcard $(PATH_SDK_QT3)/bin/*qt*$(SUFF_DLL))))
+    LIB_SDK_QT3_QT  := $(lastword $(sort $(wildcard $(PATH_SDK_QT3)/lib/*qt*$(SUFF_LIB))))
+    QTDIR           := $(PATH_SDK_QT3)
    else ifeq ($(KBUILD_TARGET),win)
-    # No idea here yet...
+    # No idea here yet... (look at the stuff in vbox/Config.kmk)
    else
     # The Unices. Includes and esp. libs are tricky, so override the PATH_SDK_QT3_LIB* stuff if it doesn't work.
     # Try find the general location of the thing by looking for the qm2ts program, then try looking for
@@ -216 +220 @@
  PATH_TOOL_QT3_BIN := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS_BLD)/qt/v3*/bin)))
  ifeq ($(PATH_TOOL_QT3_BIN),)
   if1of ($(KBUILD_HOST), win os2)
-   # sorry, no joy here.
+   PATH_TOOL_QT3_BIN := $(PATH_SDK_QT3)/bin
   else
    ifdef TOOL_QT3_BIN_SUFF
     TOOL_QT3_BIN_SUFF := $(TOOL_QT3_BIN_SUFF)
@@ -274 +278 @@
  TOOL_QT3_UIC       ?= $(PATH_TOOL_QT3_BIN)/uic$(TOOL_QT3_BIN_SUFF)$(HOST_SUFF_EXE)
  TOOL_QT3_LRC       ?= $(PATH_TOOL_QT3_BIN)/lrelease$(TOOL_QT3_BIN_SUFF)$(HOST_SUFF_EXE)
  TOOL_QT3_LUPDATE   ?= $(PATH_TOOL_QT3_BIN)/lupdate$(TOOL_QT3_BIN_SUFF)$(HOST_SUFF_EXE)
+ ifeq ($(KBUILD_TARGET),os2)
+  # search DLLs in the EXE directory first (unless DLL_SDK_QT3_QT is set)
+  local qt_path     := $(dir $(DLL_SDK_QT3_QT))
+  local qt_path     := $(if $(qt_path),$(qt_path);,)
+  TOOL_QT3_MOC      := BEGINLIBPATH="$(qt_path)$(dir $(TOOL_QT3_MOC));%BEGINLIBPATH%" $(TOOL_QT3_MOC)
+  TOOL_QT3_UIC      := BEGINLIBPATH="$(qt_path)$(dir $(TOOL_QT3_UIC));%BEGINLIBPATH%" $(TOOL_QT3_UIC)
+  TOOL_QT3_LRC      := BEGINLIBPATH="$(qt_path)$(dir $(TOOL_QT3_LRC));%BEGINLIBPATH%" $(TOOL_QT3_LRC)
+  TOOL_QT3_LUPDATE  := BEGINLIBPATH="$(qt_path)$(dir $(TOOL_QT3_LUPDATE));%BEGINLIBPATH%" $(TOOL_QT3_LUPDATE)
+ endif
 else
  # Pathless, relies on the environment.
  TOOL_QT3_MOC       ?= moc$(TOOL_QT3_BIN_SUFF)$(HOST_SUFF_EXE)
@@ -799 +812 @@
         ) $(PATH_SDK_QT3_LIB)/$(qt_prefix)qtmain$(SUFF_LIB) )
   $(eval $(target)_LIBS   += $(qt_main_lib) )
  endif
+else ifeq ($(bld_trg),os2)
+ $(eval $(target)_LIBS    += $(LIB_SDK_QT3_QT) )
 else
  local qt_lib := $(PATH_SDK_QT3_LIB)/lib$(qt_prefix)qt-mt$(SUFF_DLL)
  $(eval $(target)_LIBS    += $(qt_lib) )