AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qmake WinRT: Default to x86 for lib path

Browse Source 
If VCPROJ_ARCH is not recognized or unset, make "arch" default to x86,
or link won't find the libs.

Change-Id: If2cbda37a80c0fa43e1464775c036cebf10f931a
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Andrew Knight 2014-02-06 11:20:23 +02:00 committed by The Qt Project
parent 704c4d0e10
commit f13f10ee0d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/win32/msvc_nmake.cpp
View File

@ -123,6 +123,8 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t)
} else if (arch == QStringLiteral("x64")) { } else if (arch == QStringLiteral("x64")) {
compiler = QStringLiteral("x86_amd64"); compiler = QStringLiteral("x86_amd64");
compilerArch = QStringLiteral("amd64"); compilerArch = QStringLiteral("amd64");
} else {
arch = QStringLiteral("x86");
} }
const QString msvcVer = project->first("MSVC_VER").toQString(); const QString msvcVer = project->first("MSVC_VER").toQString();