Angle: Make it call the correct host tools
authorYuchen Deng <loaden@gmail.com>
Sun, 28 Oct 2012 09:53:51 +0000 (17:53 +0800)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 2 Nov 2012 23:24:37 +0000 (00:24 +0100)
Change-Id: Ib5a0da0ac50e0d2abebc825d6d6105ad5d84acd8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Jason Barron <jason.barron@digia.com>
src/angle/src/common/common.pri

index e99080d..3313462 100644 (file)
@@ -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