diff options
| author | Sérgio Martins <sergio.martins@kdab.com> | 2013-08-29 09:35:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-29 12:50:44 +0200 |
| commit | 75156b3c213463b240269987e23b5834ede77886 (patch) | |
| tree | 5e649b09199f4c4f3ce58dc290a7c9bf17dd35a6 /src/3rdparty/masm/masm-defs.pri | |
| parent | b9308169341a9756c0047760c9a4d7e357b3bb0d (diff) | |
wince: Build fix, disable the assembler when JIT is disabled.
Change-Id: Ibd22f27401c3751bc64749c6f1eea3aba57d66eb
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/3rdparty/masm/masm-defs.pri')
| -rw-r--r-- | src/3rdparty/masm/masm-defs.pri | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri index 20f5378518..d2925a2b8c 100644 --- a/src/3rdparty/masm/masm-defs.pri +++ b/src/3rdparty/masm/masm-defs.pri @@ -1,4 +1,5 @@ -!wince*:!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 ENABLE_YARR_JIT=1 +else: DEFINES += ENABLE_YARR_JIT=0 # On Qt/Android/ARM release builds are thumb and debug builds arm, # but we'll force the JIT to always generate thumb2 @@ -15,7 +16,7 @@ DEFINES += ENABLE_DFG_JIT=0 DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0 DEFINES += ENABLE_ASSEMBLER=1 DEFINES += BUILDING_QT__ -DEFINES += ENABLE_YARR_JIT=1 + DEFINES += ENABLE_JIT=1 INCLUDEPATH += $$PWD/jit |