- Timestamp:
- Jan 2, 2009 11:17:52 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/kBuild/units/qt4.kmk
r2144 r2176 44 44 PROPS_ACCUMULATE_R += MOCDEFS MOCFLAGS UICFLAGS LRCFLAGS QT_TRANSLATIONS QT_MOCSRCS QT_MOCHDRS 45 45 endif 46 PROPS_SINGLE += RCCTOOL 46 PROPS_SINGLE += RCCTOOL QT_INFIX 47 47 PROPS_ACCUMULATE_R += RCCFLAGS QT_MODULES 48 48 … … 929 929 endif 930 930 931 # Deal with QT_MODULES and QT_PREFIX.931 # Deal with QT_MODULES, QT_PREFIX and QT_INFIX. 932 932 local qt_modules := \ 933 933 $($(target)_QT_MODULES.$(bld_trg)) \ … … 944 944 $($(target)_QT_PREFIX.$(bld_type)) \ 945 945 $($(target)_QT_PREFIX)) 946 local 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)) 946 953 ifeq ($(bld_trg),darwin) 947 954 # Adding -F to CXXFLAGS is necessary to make #include <QtCore/qstring.h> stuff work... 948 955 $(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) ) 951 958 else 952 959 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)) ) 954 962 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) ) 956 964 endif 957 965 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)) ) 959 967 endif 960 968 $(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.