VirtualBox

儲存庫 kBuild 的更動 1761


忽略:
時間撮記:
2008-9-6 上午07:15:43 (16 年 以前)
作者:
bird
訊息:

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

位置:
trunk/kBuild/units
檔案:
修改 2 筆資料

圖例:

未更動
新增
刪除

  • trunk/kBuild/units/qt3.kmk

    r1760 r1761  
    675675# Deal with QT_MODULES and QT_PREFIX.
    676676local qt_prefix := $(firstword \
    677         $($(target)_QT_PREFIX.$(_bld_trg)) \
    678         $($(target)_QT_PREFIX.$(_bld_trg_arch)) \
    679         $($(target)_QT_PREFIX.$(_bld_trg).$(_bld_trg_arch)) \
    680         $($(target)_QT_PREFIX.$(_bld_trg_cpu)) \
    681         $($(target)_QT_PREFIX.$(_bld_type)) \
     677        $($(target)_QT_PREFIX.$(bld_trg)) \
     678        $($(target)_QT_PREFIX.$(bld_trg_arch)) \
     679        $($(target)_QT_PREFIX.$(bld_trg).$(bld_trg_arch)) \
     680        $($(target)_QT_PREFIX.$(bld_trg_cpu)) \
     681        $($(target)_QT_PREFIX.$(bld_type)) \
    682682        $($(target)_QT_PREFIX))
    683683ifeq ($(bld_trg),win)
    684684 local qt_lib := $(firstword $(wildcard \
    685         $(PATH_SDK_QT3_LIB)/dynamic/$(qt_prefix)qt-mt3$(SUFF_LIB) \
    686         $(PATH_SDK_QT3_LIB)/$(qt_prefix)qt-mt3$(SUFF_LIB) \
     685        $(PATH_SDK_QT3_LIB)/dynamic/$(qt_prefix)qt-mt3*$(SUFF_LIB) \
     686        $(PATH_SDK_QT3_LIB)/$(qt_prefix)qt-mt3*$(SUFF_LIB) \
    687687        $(PATH_SDK_QT3_LIB)/dynamic/$(qt_prefix)qt-mt$(SUFF_LIB) \
    688688        $(PATH_SDK_QT3_LIB)/$(qt_prefix)qt-mt$(SUFF_LIB) \
    689         $(PATH_SDK_QT3_LIB)/dynamic/$(qt_prefix)Qt3$(SUFF_LIB) \
    690         $(PATH_SDK_QT3_LIB)/$(qt_prefix)Qt3$(SUFF_LIB) \
    691         $(PATH_SDK_QT3_LIB)/dynamic/$(qt_prefix)Qt$(SUFF_LIB) \
    692         $(PATH_SDK_QT3_LIB)/$(qt_prefix)Qt$(SUFF_LIB) \
     689        $(PATH_SDK_QT3_LIB)/dynamic/$(qt_prefix)Qt3*$(SUFF_LIB) \
     690        $(PATH_SDK_QT3_LIB)/$(qt_prefix)Qt3*$(SUFF_LIB) \
     691        $(PATH_SDK_QT3_LIB)/dynamic/$(qt_prefix)Qt*$(SUFF_LIB) \
     692        $(PATH_SDK_QT3_LIB)/$(qt_prefix)Qt*$(SUFF_LIB) \
    693693        ) $(PATH_SDK_QT3_LIB)/$(qt_prefix)qt-mt$(SUFF_LIB) )
    694694 $(eval $(target)_LIBS    += $(qt_lib) )
    … …  
    709709ifndef $(target)_QT_MOCSRCS
    710710 $(foreach source, $(filter %.cxx %.CXX %.cpp %.CPP %.cc %.CC,\
    711         $($(target)_SOURCES.$(_bld_trg)) \
    712         $($(target)_SOURCES.$(_bld_trg_arch)) \
    713         $($(target)_SOURCES.$(_bld_trg).$(_bld_trg_arch)) \
    714         $($(target)_SOURCES.$(_bld_trg_cpu)) \
    715         $($(target)_SOURCES.$(_bld_type)) \
     711        $($(target)_SOURCES.$(bld_trg)) \
     712        $($(target)_SOURCES.$(bld_trg_arch)) \
     713        $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) \
     714        $($(target)_SOURCES.$(bld_trg_cpu)) \
     715        $($(target)_SOURCES.$(bld_type)) \
    716716        $($(target)_SOURCES) \
    717717        ), $(evalval def_unit_qt3_target_pre_cpp_source))
    … …  
    732732# Calc .ui sources so we can add them to the QT_MOCSRCS and QT_MOCHDRS.
    733733local ui_sources := $(notdir $(basename $(filter %.ui %.UI, \
    734         $($(target)_SOURCES.$(_bld_trg)) \
    735         $($(target)_SOURCES.$(_bld_trg_arch)) \
    736         $($(target)_SOURCES.$(_bld_trg).$(_bld_trg_arch)) \
    737         $($(target)_SOURCES.$(_bld_trg_cpu)) \
    738         $($(target)_SOURCES.$(_bld_type)) \
     734        $($(target)_SOURCES.$(bld_trg)) \
     735        $($(target)_SOURCES.$(bld_trg_arch)) \
     736        $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) \
     737        $($(target)_SOURCES.$(bld_trg_cpu)) \
     738        $($(target)_SOURCES.$(bld_type)) \
    739739        $($(target)_SOURCES) \
    740740        )))
    … …  
    743743# Deal with QT_MOCSRCS.
    744744$(foreach source, \
    745         $($(target)_QT_MOCSRCS.$(_bld_trg)) \
    746         $($(target)_QT_MOCSRCS.$(_bld_trg_arch)) \
    747         $($(target)_QT_MOCSRCS.$(_bld_trg).$(_bld_trg_arch)) \
    748         $($(target)_QT_MOCSRCS.$(_bld_trg_cpu)) \
    749         $($(target)_QT_MOCSRCS.$(_bld_type)) \
     745        $($(target)_QT_MOCSRCS.$(bld_trg)) \
     746        $($(target)_QT_MOCSRCS.$(bld_trg_arch)) \
     747        $($(target)_QT_MOCSRCS.$(bld_trg).$(bld_trg_arch)) \
     748        $($(target)_QT_MOCSRCS.$(bld_trg_cpu)) \
     749        $($(target)_QT_MOCSRCS.$(bld_type)) \
    750750        $($(target)_QT_MOCSRCS) \
    751751        $(addsuffix .h,$(addprefix $(qtuicdir)/,$(notdir $(basename $(ui_sources))))) \
    … …  
    754754# Deal with QT_MOCHDRS.
    755755$(foreach source, \
    756         $($(target)_QT_MOCHDRS.$(_bld_trg)) \
    757         $($(target)_QT_MOCHDRS.$(_bld_trg_arch)) \
    758         $($(target)_QT_MOCHDRS.$(_bld_trg).$(_bld_trg_arch)) \
    759         $($(target)_QT_MOCHDRS.$(_bld_trg_cpu)) \
    760         $($(target)_QT_MOCHDRS.$(_bld_type)) \
     756        $($(target)_QT_MOCHDRS.$(bld_trg)) \
     757        $($(target)_QT_MOCHDRS.$(bld_trg_arch)) \
     758        $($(target)_QT_MOCHDRS.$(bld_trg).$(bld_trg_arch)) \
     759        $($(target)_QT_MOCHDRS.$(bld_trg_cpu)) \
     760        $($(target)_QT_MOCHDRS.$(bld_type)) \
    761761        $($(target)_QT_MOCHDRS) \
    762762        $(addsuffix .h,$(addprefix $(qtuicdir)/,$(notdir $(basename $(ui_sources))))) \
    … …  
    766766# ASSUMES (_ALL_)INSTALLS is processed after the targets using this unit.
    767767local translations := \
    768         $($(target)_QT_TRANSLATIONS.$(_bld_trg)) \
    769         $($(target)_QT_TRANSLATIONS.$(_bld_trg_arch)) \
    770         $($(target)_QT_TRANSLATIONS.$(_bld_trg).$(_bld_trg_arch)) \
    771         $($(target)_QT_TRANSLATIONS.$(_bld_trg_cpu)) \
    772         $($(target)_QT_TRANSLATIONS.$(_bld_type)) \
     768        $($(target)_QT_TRANSLATIONS.$(bld_trg)) \
     769        $($(target)_QT_TRANSLATIONS.$(bld_trg_arch)) \
     770        $($(target)_QT_TRANSLATIONS.$(bld_trg).$(bld_trg_arch)) \
     771        $($(target)_QT_TRANSLATIONS.$(bld_trg_cpu)) \
     772        $($(target)_QT_TRANSLATIONS.$(bld_type)) \
    773773        $($(target)_QT_TRANSLATIONS)
    774774ifneq ($(strip $(translations)),)

  • trunk/kBuild/units/qt4.kmk

    r1689 r1761  
    799799# Deal with QT_MODULES and QT_PREFIX.
    800800local qt_modules := \
    801         $($(target)_QT_MODULES.$(_bld_trg)) \
    802         $($(target)_QT_MODULES.$(_bld_trg_arch)) \
    803         $($(target)_QT_MODULES.$(_bld_trg).$(_bld_trg_arch)) \
    804         $($(target)_QT_MODULES.$(_bld_trg_cpu)) \
    805         $($(target)_QT_MODULES.$(_bld_type)) \
     801        $($(target)_QT_MODULES.$(bld_trg)) \
     802        $($(target)_QT_MODULES.$(bld_trg_arch)) \
     803        $($(target)_QT_MODULES.$(bld_trg).$(bld_trg_arch)) \
     804        $($(target)_QT_MODULES.$(bld_trg_cpu)) \
     805        $($(target)_QT_MODULES.$(bld_type)) \
    806806        $($(target)_QT_MODULES)
    807807local qt_prefix := $(firstword \
    808         $($(target)_QT_PREFIX.$(_bld_trg)) \
    809         $($(target)_QT_PREFIX.$(_bld_trg_arch)) \
    810         $($(target)_QT_PREFIX.$(_bld_trg).$(_bld_trg_arch)) \
    811         $($(target)_QT_PREFIX.$(_bld_trg_cpu)) \
    812         $($(target)_QT_PREFIX.$(_bld_type)) \
     808        $($(target)_QT_PREFIX.$(bld_trg)) \
     809        $($(target)_QT_PREFIX.$(bld_trg_arch)) \
     810        $($(target)_QT_PREFIX.$(bld_trg).$(bld_trg_arch)) \
     811        $($(target)_QT_PREFIX.$(bld_trg_cpu)) \
     812        $($(target)_QT_PREFIX.$(bld_type)) \
    813813        $($(target)_QT_PREFIX))
    814814ifeq ($(bld_trg),darwin)
    … …  
    835835ifndef $(target)_QT_MOCSRCS
    836836 $(foreach source, $(filter %.cxx %.CXX %.cpp %.CPP %.cc %.CC,\
    837         $($(target)_SOURCES.$(_bld_trg)) \
    838         $($(target)_SOURCES.$(_bld_trg_arch)) \
    839         $($(target)_SOURCES.$(_bld_trg).$(_bld_trg_arch)) \
    840         $($(target)_SOURCES.$(_bld_trg_cpu)) \
    841         $($(target)_SOURCES.$(_bld_type)) \
     837        $($(target)_SOURCES.$(bld_trg)) \
     838        $($(target)_SOURCES.$(bld_trg_arch)) \
     839        $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) \
     840        $($(target)_SOURCES.$(bld_trg_cpu)) \
     841        $($(target)_SOURCES.$(bld_type)) \
    842842        $($(target)_SOURCES) \
    843843        ), $(evalval def_unit_qt4_target_pre_cpp_source))
    … …  
    861861# Deal with QT_MOCSRCS.
    862862$(foreach source, \
    863         $($(target)_QT_MOCSRCS.$(_bld_trg)) \
    864         $($(target)_QT_MOCSRCS.$(_bld_trg_arch)) \
    865         $($(target)_QT_MOCSRCS.$(_bld_trg).$(_bld_trg_arch)) \
    866         $($(target)_QT_MOCSRCS.$(_bld_trg_cpu)) \
    867         $($(target)_QT_MOCSRCS.$(_bld_type)) \
     863        $($(target)_QT_MOCSRCS.$(bld_trg)) \
     864        $($(target)_QT_MOCSRCS.$(bld_trg_arch)) \
     865        $($(target)_QT_MOCSRCS.$(bld_trg).$(bld_trg_arch)) \
     866        $($(target)_QT_MOCSRCS.$(bld_trg_cpu)) \
     867        $($(target)_QT_MOCSRCS.$(bld_type)) \
    868868        $($(target)_QT_MOCSRCS) \
    869869        , $(evalvalctx def_unit_qt4_target_pre_handle_moc_src))
    … …  
    871871# Deal with QT_MOCHDRS.
    872872$(foreach source, \
    873         $($(target)_QT_MOCHDRS.$(_bld_trg)) \
    874         $($(target)_QT_MOCHDRS.$(_bld_trg_arch)) \
    875         $($(target)_QT_MOCHDRS.$(_bld_trg).$(_bld_trg_arch)) \
    876         $($(target)_QT_MOCHDRS.$(_bld_trg_cpu)) \
    877         $($(target)_QT_MOCHDRS.$(_bld_type)) \
     873        $($(target)_QT_MOCHDRS.$(bld_trg)) \
     874        $($(target)_QT_MOCHDRS.$(bld_trg_arch)) \
     875        $($(target)_QT_MOCHDRS.$(bld_trg).$(bld_trg_arch)) \
     876        $($(target)_QT_MOCHDRS.$(bld_trg_cpu)) \
     877        $($(target)_QT_MOCHDRS.$(bld_type)) \
    878878        $($(target)_QT_MOCHDRS) \
    879879        , $(evalvalctx def_unit_qt4_target_pre_handle_moc_hdr))
    … …  
    882882# ASSUMES (_ALL_)INSTALLS is processed after the targets using this unit.
    883883local translations := \
    884         $($(target)_QT_TRANSLATIONS.$(_bld_trg)) \
    885         $($(target)_QT_TRANSLATIONS.$(_bld_trg_arch)) \
    886         $($(target)_QT_TRANSLATIONS.$(_bld_trg).$(_bld_trg_arch)) \
    887         $($(target)_QT_TRANSLATIONS.$(_bld_trg_cpu)) \
    888         $($(target)_QT_TRANSLATIONS.$(_bld_type)) \
     884        $($(target)_QT_TRANSLATIONS.$(bld_trg)) \
     885        $($(target)_QT_TRANSLATIONS.$(bld_trg_arch)) \
     886        $($(target)_QT_TRANSLATIONS.$(bld_trg).$(bld_trg_arch)) \
     887        $($(target)_QT_TRANSLATIONS.$(bld_trg_cpu)) \
     888        $($(target)_QT_TRANSLATIONS.$(bld_type)) \
    889889        $($(target)_QT_TRANSLATIONS)
    890890ifneq ($(strip $(translations)),)
注意: 瀏覽 TracChangeset 來幫助您使用更動檢視器

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