Mercurial > hg > tony

comparison tonyapp.pro @ 510:a3d73feeb850

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "2.0-integration"
author Chris Cannam
date Mon, 19 Oct 2015 14:17:07 +0100
parents fcc7e62bfac7
children 449a0355f864
comparison
equal deleted inserted replaced
508:d8013f97df3c 510:a3d73feeb850
58 linux* { 58 linux* {
59 MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic 59 MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic
60 } 60 }
61 61
62 win* { 62 win* {
63 MY_LIBS = -Lsvapp/release -Lsvgui/release -Lsvcore/release -Ldataquay/release $$MY_LIBS 63 MY_LIBS = -Lsvapp/release -Lsvgui/release -Lsvcore/release -Ldataquay/release -Lrelease $$MY_LIBS
64 } 64 }
65 65
66 LIBS = $$MY_LIBS $$LIBS 66 LIBS = $$MY_LIBS $$LIBS
67 67
68 win32-msvc* { 68 win32-msvc* {