diff options
| author | Thomas Miller <thomaslmiller91@gmail.com> | 2018-10-15 11:20:10 -0700 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-11 09:05:10 +0000 |
| commit | fbbe8aba9d70a3c13d1cd7797eb4dbbd1f05ade5 (patch) | |
| tree | fdfbd7fd5d86e5984aa596efd71faa1bf4bfdd34 /src/3rdparty/angle/src/common/platform.h | |
| parent | 59a09022f3a6b773f73c21054b7a6c52434a8939 (diff) | |
Add Windows Desktop arm64 target to Qtbase
Allows a qt build to be configured to target arm64 desktop apps cross
platform and build them with nmake.
Change-Id: I99fed12047b45a504a1644201bcc19b18c69f3e6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/3rdparty/angle/src/common/platform.h')
| -rw-r--r-- | src/3rdparty/angle/src/common/platform.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/angle/src/common/platform.h b/src/3rdparty/angle/src/common/platform.h index 47cd57b999..fb251da579 100644 --- a/src/3rdparty/angle/src/common/platform.h +++ b/src/3rdparty/angle/src/common/platform.h @@ -83,7 +83,7 @@ # undef far #endif -#if defined(_MSC_VER) && !defined(_M_ARM) +#if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64) #include <intrin.h> #define ANGLE_USE_SSE #elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) && !defined(__MINGW32__) |