summaryrefslogtreecommitdiffstats
path: root/src/angle
diff options
context:
space:
mode:
authorYuchen Deng <loaden@gmail.com>2012-10-28 17:53:51 +0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-03 00:24:37 +0100
commit0d9eba94dc73366a4a222c90d3f8deccc4cb19c6 (patch)
treef19b55c743d5e1442a5eb2d95afbcbede8408348 /src/angle
parent9830ba007a36b9923b7c10d33740952c54cf86e0 (diff)
Angle: Make it call the correct host tools
Change-Id: Ib5a0da0ac50e0d2abebc825d6d6105ad5d84acd8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jason Barron <jason.barron@digia.com>
Diffstat (limited to 'src/angle')
-rw-r--r--src/angle/src/common/common.pri6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri
index e99080d19f..3313462f63 100644
--- a/src/angle/src/common/common.pri
+++ b/src/angle/src/common/common.pri
@@ -22,7 +22,11 @@ win32-msvc2012 {
DXLIB_DIR = $$quote($${DX_DIR}Lib\\x86)
}
- FXC = "\"$${DX_DIR}Utilities\\bin\\x86\\fxc.exe\""
+ equals(QMAKE_TARGET.arch, x86_64) {
+ FXC = "\"$${DX_DIR}Utilities\\bin\\x64\\fxc.exe\""
+ } else {
+ FXC = "\"$${DX_DIR}Utilities\\bin\\x86\\fxc.exe\""
+ }
msvc {
# Unfortunately MinGW cannot use the DirectX headers from the DX SDK because d3d11shader.h uses