diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-08-20 13:38:15 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-22 04:24:00 +0200 |
| commit | e04cadca4a6c0b43d29c83d23ac74393694a5ea5 (patch) | |
| tree | aa495250e8fa420b6b262c76b1d5ad2050067cb9 /src/3rdparty/masm/masm-defs.pri | |
| parent | ff959399c9bd13e4c881cd6aa7f953dce92bda5b (diff) | |
Fix compilation with MSVC 2008 (and prospective Windows CE build fix)
* Only 2010 and newer ship stdint.h, so for 2008 we have to provide a little
stdint.h compat header, for some of the third-party code we import. Our own
Qt code this patch changes to use quint* types instead.
* Include math.h and float.h for some math functions.
* disable the JIT on Windows CE for now.
* Change use of intptr_t to qintptr in Qt code. intptr_t is in inttypes.h,
except that with VS 2008 it is indirectly available through stdio.h. Let's
avoid the mess and just use the qt type, that's always available.
Change-Id: I19055edd89e0a6b147d9edbb3b711798ed3c05a5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/masm/masm-defs.pri')
| -rw-r--r-- | src/3rdparty/masm/masm-defs.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri index 2f44f075d4..20f5378518 100644 --- a/src/3rdparty/masm/masm-defs.pri +++ b/src/3rdparty/masm/masm-defs.pri @@ -1,4 +1,4 @@ -!ios:!if(win*:isEqual(QT_ARCH, "x86_64")): DEFINES += V4_ENABLE_JIT +!wince*:!ios:!if(win*:isEqual(QT_ARCH, "x86_64")): DEFINES += V4_ENABLE_JIT # On Qt/Android/ARM release builds are thumb and debug builds arm, # but we'll force the JIT to always generate thumb2 @@ -33,3 +33,4 @@ INCLUDEPATH += $$PWD/disassembler INCLUDEPATH += $$PWD/disassembler/udis86 INCLUDEPATH += $$_OUT_PWD +win32-msvc2008|wince*: INCLUDEPATH += $$PWD/stubs/compat |