Changeset 2176 in kBuild for trunk

Timestamp:

Jan 2, 2009 11:17:52 PM (16 years ago)

Author:

bird

Message:

qt4.kmk: Implemented QT_INFIX.

File:

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

trunk/kBuild/units/qt4.kmk

@@ -44 +44 @@
  PROPS_ACCUMULATE_R += MOCDEFS MOCFLAGS UICFLAGS LRCFLAGS QT_TRANSLATIONS QT_MOCSRCS QT_MOCHDRS
 endif
-PROPS_SINGLE += RCCTOOL
+PROPS_SINGLE += RCCTOOL QT_INFIX
 PROPS_ACCUMULATE_R += RCCFLAGS QT_MODULES
 
@@ -929 +929 @@
 endif
 
-# Deal with QT_MODULES and QT_PREFIX.
+# Deal with QT_MODULES, QT_PREFIX and QT_INFIX.
 local qt_modules := \
         $($(target)_QT_MODULES.$(bld_trg)) \
@@ -944 +944 @@
         $($(target)_QT_PREFIX.$(bld_type)) \
         $($(target)_QT_PREFIX))
+local qt_infix := $(firstword \
+        $($(target)_QT_INFIX.$(bld_trg)) \
+        $($(target)_QT_INFIX.$(bld_trg_arch)) \
+        $($(target)_QT_INFIX.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_QT_INFIX.$(bld_trg_cpu)) \
+        $($(target)_QT_INFIX.$(bld_type)) \
+        $($(target)_QT_INFIX))
 ifeq ($(bld_trg),darwin)
  # Adding -F to CXXFLAGS is necessary to make #include <QtCore/qstring.h> stuff work...
  $(eval $(target)_CXXFLAGS += -F$(PATH_SDK_QT4_LIB) )
- $(eval $(target)_LDFLAGS  += -F$(PATH_SDK_QT4_LIB) $(addprefix -framework Qt$(qt_prefix),$(qt_modules)) )
- $(eval $(target)_INCS     += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/$(qt_prefix)Qt$(module).framework/Versions/4/Headers) )
+ $(eval $(target)_LDFLAGS  += -F$(PATH_SDK_QT4_LIB) $(foreach module,$(qt_modules), -framework $(qt_prefix)Qt$(module)$(qt_infix)) )
+ $(eval $(target)_INCS     += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/$(qt_prefix)Qt$(module)$(qt_infix).framework/Versions/4/Headers) )
 else
  ifeq ($(bld_trg),win)
-  $(eval $(target)_LIBS    += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/$(qt_prefix)Qt$(module)4$(SUFF_LIB)) )
+  local qt_infix ?= 4
+  $(eval $(target)_LIBS    += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/$(qt_prefix)Qt$(module)$(qt_infix)$(SUFF_LIB)) )
   ifeq ($(tool_do),LINK_PROGRAM)
-   $(eval $(target)_LIBS   += $(PATH_SDK_QT4_LIB)/$(qt_prefix)qtmain$(SUFF_LIB) )
+   $(eval $(target)_LIBS   += $(PATH_SDK_QT4_LIB)/$(qt_prefix)qtmain$(qt_infix)$(SUFF_LIB) )
   endif
  else
-  $(eval $(target)_LIBS    += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/lib$(qt_prefix)Qt$(module)$(SUFF_DLL)) )
+  $(eval $(target)_LIBS    += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/lib$(qt_prefix)Qt$(module)$(qt_infix)$(SUFF_DLL)) )
  endif
  $(eval $(target)_INCS     += $(addprefix $(PATH_SDK_QT4_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT4_INC) )