VirtualBox

Changeset 2176 in kBuild for trunk


Ignore:
Timestamp:
Jan 2, 2009 11:17:52 PM (16 years ago)
Author:
bird
Message:

qt4.kmk: Implemented QT_INFIX.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/kBuild/units/qt4.kmk

    r2144 r2176  
    4444 PROPS_ACCUMULATE_R += MOCDEFS MOCFLAGS UICFLAGS LRCFLAGS QT_TRANSLATIONS QT_MOCSRCS QT_MOCHDRS
    4545endif
    46 PROPS_SINGLE += RCCTOOL
     46PROPS_SINGLE += RCCTOOL QT_INFIX
    4747PROPS_ACCUMULATE_R += RCCFLAGS QT_MODULES
    4848
     
    929929endif
    930930
    931 # Deal with QT_MODULES and QT_PREFIX.
     931# Deal with QT_MODULES, QT_PREFIX and QT_INFIX.
    932932local qt_modules := \
    933933        $($(target)_QT_MODULES.$(bld_trg)) \
     
    944944        $($(target)_QT_PREFIX.$(bld_type)) \
    945945        $($(target)_QT_PREFIX))
     946local qt_infix := $(firstword \
     947        $($(target)_QT_INFIX.$(bld_trg)) \
     948        $($(target)_QT_INFIX.$(bld_trg_arch)) \
     949        $($(target)_QT_INFIX.$(bld_trg).$(bld_trg_arch)) \
     950        $($(target)_QT_INFIX.$(bld_trg_cpu)) \
     951        $($(target)_QT_INFIX.$(bld_type)) \
     952        $($(target)_QT_INFIX))
    946953ifeq ($(bld_trg),darwin)
    947954 # Adding -F to CXXFLAGS is necessary to make #include <QtCore/qstring.h> stuff work...
    948955 $(eval $(target)_CXXFLAGS += -F$(PATH_SDK_QT4_LIB) )
    949  $(eval $(target)_LDFLAGS  += -F$(PATH_SDK_QT4_LIB) $(addprefix -framework Qt$(qt_prefix),$(qt_modules)) )
    950  $(eval $(target)_INCS     += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/$(qt_prefix)Qt$(module).framework/Versions/4/Headers) )
     956 $(eval $(target)_LDFLAGS  += -F$(PATH_SDK_QT4_LIB) $(foreach module,$(qt_modules), -framework $(qt_prefix)Qt$(module)$(qt_infix)) )
     957 $(eval $(target)_INCS     += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/$(qt_prefix)Qt$(module)$(qt_infix).framework/Versions/4/Headers) )
    951958else
    952959 ifeq ($(bld_trg),win)
    953   $(eval $(target)_LIBS    += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/$(qt_prefix)Qt$(module)4$(SUFF_LIB)) )
     960  local qt_infix ?= 4
     961  $(eval $(target)_LIBS    += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/$(qt_prefix)Qt$(module)$(qt_infix)$(SUFF_LIB)) )
    954962  ifeq ($(tool_do),LINK_PROGRAM)
    955    $(eval $(target)_LIBS   += $(PATH_SDK_QT4_LIB)/$(qt_prefix)qtmain$(SUFF_LIB) )
     963   $(eval $(target)_LIBS   += $(PATH_SDK_QT4_LIB)/$(qt_prefix)qtmain$(qt_infix)$(SUFF_LIB) )
    956964  endif
    957965 else
    958   $(eval $(target)_LIBS    += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/lib$(qt_prefix)Qt$(module)$(SUFF_DLL)) )
     966  $(eval $(target)_LIBS    += $(foreach module,$(qt_modules), $(PATH_SDK_QT4_LIB)/lib$(qt_prefix)Qt$(module)$(qt_infix)$(SUFF_DLL)) )
    959967 endif
    960968 $(eval $(target)_INCS     += $(addprefix $(PATH_SDK_QT4_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT4_INC) )
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette