From 0a6fbb8aac5c7d1fb6e36ce7bc469e17e081dc4b Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Sat, 21 Sep 2013 23:54:56 +0100 Subject: [PATCH] Specify full path to Windows find.exe, so GNU find is never used. Argument to @contains()@ is @enabled@, not @-m64@, otherwise it will always return true. --- externals.pri | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/externals.pri b/externals.pri index 4aca3e1d7..5ea07510f 100644 --- a/externals.pri +++ b/externals.pri @@ -35,8 +35,9 @@ win32:contains(QMAKE_TARGET.arch, x86) { } win32-g++ { - MINGW = $$system($$QMAKE_CXX -Q --help=target | find \"-m64\") - contains(MINGW,-m64) { + WIN_FIND = $$(SYSTEMROOT)\system32\find + MINGW64 = $$system($$QMAKE_CXX -Q --help=target | $$WIN_FIND \"-m64\") + contains(MINGW64,enabled) { LIBS *= -L$$EXTERNALDIR/mingw64/lib } else {