diff options
-rw-r--r-- | src/3rdparty/masm/masm-defs.pri | 4 | ||||
-rw-r--r-- | src/3rdparty/masm/masm.pri | 16 | ||||
-rw-r--r-- | src/v4/qv4isel_masm.cpp | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri index 5744905f93..f8055d0ff4 100644 --- a/src/3rdparty/masm/masm-defs.pri +++ b/src/3rdparty/masm/masm-defs.pri @@ -19,7 +19,9 @@ INCLUDEPATH += $$PWD/stubs INCLUDEPATH += $$PWD/stubs/wtf INCLUDEPATH += $$PWD -DEFINES += WTF_USE_UDIS86=1 +if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")):!win*: DEFINES += WTF_USE_UDIS86=1 +else: DEFINES += WTF_USE_UDIS86=0 + INCLUDEPATH += $$PWD/disassembler INCLUDEPATH += $$PWD/disassembler/udis86 INCLUDEPATH += $$_OUT_PWD diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri index f172762089..87f08e482f 100644 --- a/src/3rdparty/masm/masm.pri +++ b/src/3rdparty/masm/masm.pri @@ -32,13 +32,15 @@ HEADERS += $$PWD/stubs/WTFStubs.h SOURCES += $$PWD/disassembler/Disassembler.cpp SOURCES += $$PWD/disassembler/UDis86Disassembler.cpp -SOURCES += $$PWD/disassembler/udis86/udis86.c -SOURCES += $$PWD/disassembler/udis86/udis86_decode.c -SOURCES += $$PWD/disassembler/udis86/udis86_input.c -SOURCES += $$PWD/disassembler/udis86/udis86_itab_holder.c -SOURCES += $$PWD/disassembler/udis86/udis86_syn-att.c -SOURCES += $$PWD/disassembler/udis86/udis86_syn.c -SOURCES += $$PWD/disassembler/udis86/udis86_syn-intel.c +contains(DEFINES, WTF_USE_UDIS86=1) { + SOURCES += $$PWD/disassembler/udis86/udis86.c + SOURCES += $$PWD/disassembler/udis86/udis86_decode.c + SOURCES += $$PWD/disassembler/udis86/udis86_input.c + SOURCES += $$PWD/disassembler/udis86/udis86_itab_holder.c + SOURCES += $$PWD/disassembler/udis86/udis86_syn-att.c + SOURCES += $$PWD/disassembler/udis86/udis86_syn.c + SOURCES += $$PWD/disassembler/udis86/udis86_syn-intel.c +} SOURCES += \ $$PWD/yarr/YarrCanonicalizeUCS2.cpp \ diff --git a/src/v4/qv4isel_masm.cpp b/src/v4/qv4isel_masm.cpp index bde199d9be..4fdee3fddd 100644 --- a/src/v4/qv4isel_masm.cpp +++ b/src/v4/qv4isel_masm.cpp @@ -52,7 +52,7 @@ #include <iostream> #include <cassert> -#ifndef NO_UDIS86 +#if USE(UDIS86) # include <udis86.h> #endif |