diff options
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | kde.py | 16 |
2 files changed, 9 insertions, 9 deletions
@@ -58,7 +58,7 @@ libdir kdeincludes qtincludes tdelibs -qtlibs +tqtlibs extraincludes (a list of paths separated by ':') """ @@ -38,7 +38,7 @@ def detect_kde(env): tdelibs = env['ARGS'].get('tdelibs', None) qtincludes = env['ARGS'].get('qtincludes', None) tqtincludes = env['ARGS'].get('tqtincludes', None) - qtlibs = env['ARGS'].get('qtlibs', None) + tqtlibs = env['ARGS'].get('tqtlibs', None) tdedir = env['ARGS'].get('tdedir', None) if libdir: @@ -93,7 +93,7 @@ def detect_kde(env): libdir = os.popen(kde_config + ' --expandvars --install lib').read().strip() libtdeuiSO = libdir+'/'+getSOfromLA(libdir+'/libtdeui.la') try: - m = re.search('(.*)/lib/libqt.*', os.popen('ldd ' + libtdeuiSO + ' | grep libqt').read().strip().split()[2]) + m = re.search('(.*)/lib/libtqt.*', os.popen('ldd ' + libtdeuiSO + ' | grep libtqt').read().strip().split()[2]) except: m = re.search('(.*)/lib/libtqt.*', os.popen('ldd ' + libtdeuiSO + ' | grep libtqt').read().strip().split()[2]) pass @@ -250,9 +250,9 @@ def detect_kde(env): ## qt libs and includes env['QTINCLUDEPATH']=qtincludes env['TQTINCLUDEPATH']=tqtincludes - if not qtlibs: - qtlibs=qtdir+"/lib" - env['QTLIBPATH']=qtlibs + if not tqtlibs: + tqtlibs=qtdir+"/lib" + env['TQTLIBPATH']=tqtlibs def generate(env): """"Set up the qt and kde environment and builders - the moc part is difficult to understand """ @@ -270,7 +270,7 @@ def generate(env): """+BOLD+"""* kdeincludes"""+NORMAL+""": path to the kde includes (/usr/include/tde on debian, ...) """+BOLD+"""* qtincludes """+NORMAL+""": same punishment, for qt includes (/usr/include/qt on debian, ...) """+BOLD+"""* tdelibs """+NORMAL+""": path to the kde libs, for linking the programs -"""+BOLD+"""* qtlibs """+NORMAL+""": same punishment, for qt libraries +"""+BOLD+"""* tqtlibs """+NORMAL+""": same punishment, for qt libraries ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt """+NORMAL) @@ -419,7 +419,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt ('PREFIX', 'root of the program installation'), ('QTDIR', 'root of qt directory'), - ('QTLIBPATH', 'path to the qt libraries'), + ('TQTLIBPATH', 'path to the qt libraries'), ('QTINCLUDEPATH', 'path to the qt includes'), ('TQTINCLUDEPATH', 'path to the tqt includes'), ('QT_UIC', 'moc directory'), @@ -457,7 +457,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt ## set default variables, one can override them in sconscript files env.Append(CXXFLAGS = ['-I'+env['KDEINCLUDEPATH'], '-I'+env['QTINCLUDEPATH'], '-I'+env['TQTINCLUDEPATH'], '-include', 'tqt.h' ]) - env.Append(LIBPATH = [env['KDELIBPATH'], env['QTLIBPATH'] ]) + env.Append(LIBPATH = [env['KDELIBPATH'], env['TQTLIBPATH'] ]) env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1 |