Changeset 2245 in kBuild

Timestamp:

Jan 16, 2009 5:07:44 PM (16 years ago)

Author:

bird

Message:

qt4.kmk: turned out '4.dll' is a mandatory suffix on windows (but on on .libs, just like before).

File:

• trunk/kBuild/units/qt4.kmk (modified) (1 diff)

trunk/kBuild/units/qt4.kmk

@@ -958 +958 @@
 else
  ifeq ($(bld_trg),win)
-  ifndef qt_infix
-   local qt_infix  := 4
-   local qt_infix2 :=
-  else
-   local qt_infix2 := $(qt_infix)
-  endif
-  $(eval $(target)_LIBS    += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/$(qt_prefix)Qt$(module)$(qt_infix)$(SUFF_LIB)) )
+  $(eval $(target)_LIBS    += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/$(qt_prefix)Qt$(module)$(qt_infix)4$(SUFF_LIB)) )
   ifeq ($(tool_do),LINK_PROGRAM)
-   $(eval $(target)_LIBS   += $(PATH_SDK_QT4_LIB)/$(qt_prefix)qtmain$(qt_infix2)$(SUFF_LIB) )
+   $(eval $(target)_LIBS   += $(PATH_SDK_QT4_LIB)/$(qt_prefix)qtmain$(qt_infix)$(SUFF_LIB) )
   endif
  else