Ignore:
Timestamp:
Sep 13, 2011, 9:00:25 PM (14 years ago)
Author:
bird
Message:

qt4.kmk,qt3.kmk: Probe for qt libs in the right places on multi-arch ubuntu.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/units/qt4.kmk

    r2479 r2544  
    117117        /usr/lib32/libQtCore$(SUFF_DLL) \
    118118        /usr/lib32/qt4/libQtCore$(SUFF_DLL) \
     119        /usr/lib/i386-linux-gnu/libQtCore$(SUFF_DLL) \
    119120        /usr/local/lib32/libQtCore$(SUFF_DLL) \
    120121        /usr/local/lib32/qt4/libQtCore$(SUFF_DLL) \
     122        /usr/local/lib/i386-linux-gnu/libQtCore$(SUFF_DLL) \
    121123        $(PATH_SDK_QT4)/lib/libQtCore$(SUFF_DLL) \
    122124        $(PATH_SDK_QT4)/lib/qt4/libQtCore$(SUFF_DLL) \
     125        $(PATH_SDK_QT4)/lib/i386-linux-gnu/libQtCore$(SUFF_DLL) \
    123126        )))
    124127      ifneq ($(PATH_SDK_QT4_LIB.x86),)
    … …  
    134137        /usr/lib64/qt4/libQtCore$(SUFF_DLL) \
    135138        /usr/lib/amd64/libQtCore$(SUFF_DLL) \
     139        /usr/lib/x86_64-linux-gnu/libQtCore$(SUFF_DLL) \
    136140        /usr/local/lib64/libQtCore$(SUFF_DLL) \
    137141        /usr/local/lib64/qt4/libQtCore$(SUFF_DLL) \
    138142        /usr/local/lib/amd64/libQtCore$(SUFF_DLL) \
     143        /usr/local/lib/x86_64-linux-gnu/libQtCore$(SUFF_DLL) \
    139144        $(PATH_SDK_QT4)/lib/libQtCore$(SUFF_DLL) \
    140145        $(PATH_SDK_QT4)/lib/qt4/libQtCore$(SUFF_DLL) \
     146        $(PATH_SDK_QT4)/lib/x86_64-linux-gnu/libQtCore$(SUFF_DLL) \
    141147        )))
    142148      ifneq ($(PATH_SDK_QT4_LIB.amd64),)
Note: See TracChangeset for help on using the changeset viewer.