Changeset 1761 for trunk/kBuild/units/qt3.kmk

Timestamp:

Sep 6, 2008, 9:15:43 AM (17 years ago)

Author:

bird

Message:

qt3/4: _bld_* -> bld_*. Fixed some windows issues in qt3.

File:

• trunk/kBuild/units/qt3.kmk (modified) (6 diffs)

trunk/kBuild/units/qt3.kmk

@@ -675 +675 @@
 # Deal with QT_MODULES and QT_PREFIX.
 local qt_prefix := $(firstword \
-        $($(target)_QT_PREFIX.$(_bld_trg)) \
-        $($(target)_QT_PREFIX.$(_bld_trg_arch)) \
-        $($(target)_QT_PREFIX.$(_bld_trg).$(_bld_trg_arch)) \
-        $($(target)_QT_PREFIX.$(_bld_trg_cpu)) \
-        $($(target)_QT_PREFIX.$(_bld_type)) \
+        $($(target)_QT_PREFIX.$(bld_trg)) \
+        $($(target)_QT_PREFIX.$(bld_trg_arch)) \
+        $($(target)_QT_PREFIX.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_QT_PREFIX.$(bld_trg_cpu)) \
+        $($(target)_QT_PREFIX.$(bld_type)) \
         $($(target)_QT_PREFIX))
 ifeq ($(bld_trg),win)
  local qt_lib := $(firstword $(wildcard \
-        $(PATH_SDK_QT3_LIB)/dynamic/$(qt_prefix)qt-mt3$(SUFF_LIB) \
-        $(PATH_SDK_QT3_LIB)/$(qt_prefix)qt-mt3$(SUFF_LIB) \
+        $(PATH_SDK_QT3_LIB)/dynamic/$(qt_prefix)qt-mt3*$(SUFF_LIB) \
+        $(PATH_SDK_QT3_LIB)/$(qt_prefix)qt-mt3*$(SUFF_LIB) \
         $(PATH_SDK_QT3_LIB)/dynamic/$(qt_prefix)qt-mt$(SUFF_LIB) \
         $(PATH_SDK_QT3_LIB)/$(qt_prefix)qt-mt$(SUFF_LIB) \
-        $(PATH_SDK_QT3_LIB)/dynamic/$(qt_prefix)Qt3$(SUFF_LIB) \
-        $(PATH_SDK_QT3_LIB)/$(qt_prefix)Qt3$(SUFF_LIB) \
-        $(PATH_SDK_QT3_LIB)/dynamic/$(qt_prefix)Qt$(SUFF_LIB) \
-        $(PATH_SDK_QT3_LIB)/$(qt_prefix)Qt$(SUFF_LIB) \
+        $(PATH_SDK_QT3_LIB)/dynamic/$(qt_prefix)Qt3*$(SUFF_LIB) \
+        $(PATH_SDK_QT3_LIB)/$(qt_prefix)Qt3*$(SUFF_LIB) \
+        $(PATH_SDK_QT3_LIB)/dynamic/$(qt_prefix)Qt*$(SUFF_LIB) \
+        $(PATH_SDK_QT3_LIB)/$(qt_prefix)Qt*$(SUFF_LIB) \
         ) $(PATH_SDK_QT3_LIB)/$(qt_prefix)qt-mt$(SUFF_LIB) )
  $(eval $(target)_LIBS    += $(qt_lib) )
@@ -709 +709 @@
 ifndef $(target)_QT_MOCSRCS
  $(foreach source, $(filter %.cxx %.CXX %.cpp %.CPP %.cc %.CC,\
-        $($(target)_SOURCES.$(_bld_trg)) \
-        $($(target)_SOURCES.$(_bld_trg_arch)) \
-        $($(target)_SOURCES.$(_bld_trg).$(_bld_trg_arch)) \
-        $($(target)_SOURCES.$(_bld_trg_cpu)) \
-        $($(target)_SOURCES.$(_bld_type)) \
+        $($(target)_SOURCES.$(bld_trg)) \
+        $($(target)_SOURCES.$(bld_trg_arch)) \
+        $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_SOURCES.$(bld_trg_cpu)) \
+        $($(target)_SOURCES.$(bld_type)) \
         $($(target)_SOURCES) \
         ), $(evalval def_unit_qt3_target_pre_cpp_source))
@@ -732 +732 @@
 # Calc .ui sources so we can add them to the QT_MOCSRCS and QT_MOCHDRS.
 local ui_sources := $(notdir $(basename $(filter %.ui %.UI, \
-        $($(target)_SOURCES.$(_bld_trg)) \
-        $($(target)_SOURCES.$(_bld_trg_arch)) \
-        $($(target)_SOURCES.$(_bld_trg).$(_bld_trg_arch)) \
-        $($(target)_SOURCES.$(_bld_trg_cpu)) \
-        $($(target)_SOURCES.$(_bld_type)) \
+        $($(target)_SOURCES.$(bld_trg)) \
+        $($(target)_SOURCES.$(bld_trg_arch)) \
+        $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_SOURCES.$(bld_trg_cpu)) \
+        $($(target)_SOURCES.$(bld_type)) \
         $($(target)_SOURCES) \
         )))
@@ -743 +743 @@
 # Deal with QT_MOCSRCS.
 $(foreach source, \
-        $($(target)_QT_MOCSRCS.$(_bld_trg)) \
-        $($(target)_QT_MOCSRCS.$(_bld_trg_arch)) \
-        $($(target)_QT_MOCSRCS.$(_bld_trg).$(_bld_trg_arch)) \
-        $($(target)_QT_MOCSRCS.$(_bld_trg_cpu)) \
-        $($(target)_QT_MOCSRCS.$(_bld_type)) \
+        $($(target)_QT_MOCSRCS.$(bld_trg)) \
+        $($(target)_QT_MOCSRCS.$(bld_trg_arch)) \
+        $($(target)_QT_MOCSRCS.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_QT_MOCSRCS.$(bld_trg_cpu)) \
+        $($(target)_QT_MOCSRCS.$(bld_type)) \
         $($(target)_QT_MOCSRCS) \
         $(addsuffix .h,$(addprefix $(qtuicdir)/,$(notdir $(basename $(ui_sources))))) \
@@ -754 +754 @@
 # Deal with QT_MOCHDRS.
 $(foreach source, \
-        $($(target)_QT_MOCHDRS.$(_bld_trg)) \
-        $($(target)_QT_MOCHDRS.$(_bld_trg_arch)) \
-        $($(target)_QT_MOCHDRS.$(_bld_trg).$(_bld_trg_arch)) \
-        $($(target)_QT_MOCHDRS.$(_bld_trg_cpu)) \
-        $($(target)_QT_MOCHDRS.$(_bld_type)) \
+        $($(target)_QT_MOCHDRS.$(bld_trg)) \
+        $($(target)_QT_MOCHDRS.$(bld_trg_arch)) \
+        $($(target)_QT_MOCHDRS.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_QT_MOCHDRS.$(bld_trg_cpu)) \
+        $($(target)_QT_MOCHDRS.$(bld_type)) \
         $($(target)_QT_MOCHDRS) \
         $(addsuffix .h,$(addprefix $(qtuicdir)/,$(notdir $(basename $(ui_sources))))) \
@@ -766 +766 @@
 # ASSUMES (_ALL_)INSTALLS is processed after the targets using this unit.
 local translations := \
-        $($(target)_QT_TRANSLATIONS.$(_bld_trg)) \
-        $($(target)_QT_TRANSLATIONS.$(_bld_trg_arch)) \
-        $($(target)_QT_TRANSLATIONS.$(_bld_trg).$(_bld_trg_arch)) \
-        $($(target)_QT_TRANSLATIONS.$(_bld_trg_cpu)) \
-        $($(target)_QT_TRANSLATIONS.$(_bld_type)) \
+        $($(target)_QT_TRANSLATIONS.$(bld_trg)) \
+        $($(target)_QT_TRANSLATIONS.$(bld_trg_arch)) \
+        $($(target)_QT_TRANSLATIONS.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_QT_TRANSLATIONS.$(bld_trg_cpu)) \
+        $($(target)_QT_TRANSLATIONS.$(bld_type)) \
         $($(target)_QT_TRANSLATIONS)
 ifneq ($(strip $(translations)),)