diff options
| author | Laszlo Papp <lpapp@kde.org> | 2013-03-18 12:19:34 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-19 18:22:48 +0100 |
| commit | d46345a49e6d4d180ea0f763f43a3034574d9e4a (patch) | |
| tree | ba536aa0658656f12905e780db94f0ecb7c6ab66 /qmake/generators | |
| parent | 0654c066d9b67e5c261b708196096311d695adcd (diff) | |
Add an initial TI linker support for the unix qmake generator
Task-number: QTBUG-30215
Change-Id: Ica283e6b7f67563504ed81f4db1c2218fe5e8b8c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 7ebb397fba..4f28321b09 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -142,6 +142,7 @@ UnixMakefileGenerator::init() project->values("QMAKE_L_FLAG") << (project->isActiveConfig("rvct_linker") ? "--userlibpath " : project->isActiveConfig("armcc_linker") ? "-L--userlibpath=" + : project->isActiveConfig("ti_linker") ? "--search_path=" : "-L"); ProStringList ldadd; if(!project->isEmpty("QMAKE_LIBDIR")) { @@ -490,6 +491,8 @@ UnixMakefileGenerator::findLibraries() } else if(opt.startsWith("-l")) { if (project->isActiveConfig("rvct_linker") || project->isActiveConfig("armcc_linker")) { (*it) = "lib" + opt.mid(2) + ".so"; + } else if (project->isActiveConfig("ti_linker")) { + (*it) = opt.mid(2); } else { stub = opt.mid(2); } |