Changeset 2942 for trunk/kBuild

Timestamp:

Sep 19, 2016, 10:02:13 PM (9 years ago)

Author:

bird

Message:

units/qt5.kmk: kSubmit experiments for moc; corrected host exe suffix variable name.

File:

• trunk/kBuild/units/qt5.kmk (modified) (3 diffs)

trunk/kBuild/units/qt5.kmk

@@ -308 +308 @@
 endif
 ifneq ($(PATH_TOOL_QT5_BIN),)
- TOOL_QT5_MOC       ?= $(PATH_TOOL_QT5_BIN)/moc$(TOOL_QT5_BIN_SUFF)$(HOST_SUFF_EXE)
- TOOL_QT5_UIC       ?= $(PATH_TOOL_QT5_BIN)/uic$(TOOL_QT5_BIN_SUFF)$(HOST_SUFF_EXE)
+ TOOL_QT5_MOC       ?= $(PATH_TOOL_QT5_BIN)/moc$(TOOL_QT5_BIN_SUFF)$(HOSTSUFF_EXE)
+ TOOL_QT5_UIC       ?= $(PATH_TOOL_QT5_BIN)/uic$(TOOL_QT5_BIN_SUFF)$(HOSTSUFF_EXE)
  ifndef TOOL_QT5_RCC
-  TOOL_QT5_RCC      := $(PATH_TOOL_QT5_BIN)/rcc$(HOST_SUFF_EXE)
+  TOOL_QT5_RCC      := $(PATH_TOOL_QT5_BIN)/rcc$(HOSTSUFF_EXE)
   ifeq ($(wildcard $(TOOL_QT5_RCC)),)
-   TOOL_QT5_RCC     := $(PATH_TOOL_QT5_BIN)/rcc$(TOOL_QT5_BIN_SUFF)$(HOST_SUFF_EXE)
+   TOOL_QT5_RCC     := $(PATH_TOOL_QT5_BIN)/rcc$(TOOL_QT5_BIN_SUFF)$(HOSTSUFF_EXE)
   endif
  endif
- TOOL_QT5_LRC       ?= $(PATH_TOOL_QT5_BIN)/lrelease$(TOOL_QT5_BIN_SUFF)$(HOST_SUFF_EXE)
- TOOL_QT5_LUPDATE   ?= $(PATH_TOOL_QT5_BIN)/lupdate$(TOOL_QT5_BIN_SUFF)$(HOST_SUFF_EXE)
+ TOOL_QT5_LRC       ?= $(PATH_TOOL_QT5_BIN)/lrelease$(TOOL_QT5_BIN_SUFF)$(HOSTSUFF_EXE)
+ TOOL_QT5_LUPDATE   ?= $(PATH_TOOL_QT5_BIN)/lupdate$(TOOL_QT5_BIN_SUFF)$(HOSTSUFF_EXE)
 else
  # Pathless, relies on the environment.
- TOOL_QT5_MOC       ?= moc$(TOOL_QT5_BIN_SUFF)$(HOST_SUFF_EXE)
- TOOL_QT5_UIC       ?= uic$(TOOL_QT5_BIN_SUFF)$(HOST_SUFF_EXE)
- TOOL_QT5_RCC       ?= rcc$(HOST_SUFF_EXE)
- TOOL_QT5_LRC       ?= lrelease$(TOOL_QT5_BIN_SUFF)$(HOST_SUFF_EXE)
- TOOL_QT5_LUPDATE   ?= lupdate$(TOOL_QT5_BIN_SUFF)$(HOST_SUFF_EXE)
+ TOOL_QT5_MOC       ?= moc$(TOOL_QT5_BIN_SUFF)$(HOSTSUFF_EXE)
+ TOOL_QT5_UIC       ?= uic$(TOOL_QT5_BIN_SUFF)$(HOSTSUFF_EXE)
+ TOOL_QT5_RCC       ?= rcc$(HOSTSUFF_EXE)
+ TOOL_QT5_LRC       ?= lrelease$(TOOL_QT5_BIN_SUFF)$(HOSTSUFF_EXE)
+ TOOL_QT5_LUPDATE   ?= lupdate$(TOOL_QT5_BIN_SUFF)$(HOSTSUFF_EXE)
+endif
+ifdef TOOL_QT5_USE_KSUBMIT
+ ifeq ($(KBUILD_HOST),win)
+  TOOL_QT5_MOC_KSUBMIT ?= kmk_builtin_kSubmit --$(SP)
+ endif
 endif
 
@@ -352 +357 @@
 TOOL_QT5_MOC_CPP_OUTPUT_MAYBE =
 define TOOL_QT5_MOC_CPP_CMDS
-        $(QUIET)$(TOOL_QT5_MOC)\
+        $(QUIET)$(TOOL_QT5_MOC_KSUBMIT)$(TOOL_QT5_MOC)\
                 $(flags)\
                 $(addprefix -I, $(incs))\
@@ -375 +380 @@
 TOOL_QT5_MOC_HPP_OUTPUT_MAYBE =
 define TOOL_QT5_MOC_HPP_CMDS
-        $(QUIET)$(TOOL_QT5_MOC)\
+        $(QUIET)$(TOOL_QT5_MOC_KSUBMIT)$(TOOL_QT5_MOC)\
                 $(flags)\
                 $(addprefix -I, $(incs))\