diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-01-31 23:52:09 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-02-01 22:05:54 +0100 |
| commit | 0689c111cf7286b449dba6c625d477e47d8a0d39 (patch) | |
| tree | 36278272d96b755680d20b8edf74312aab8f03c4 /src/3rdparty | |
| parent | 62663f29542c4d5139b68c1b6cf69e1275103980 (diff) | |
Avoid duplicated feature defines between tools/v4/v4.pro and src/v4/v4.pro
Centralize the macros in v4.pri that's included by both.
Change-Id: I1ae2ed3b7b97a4e905d2e4ae563c99c964253bb1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/double-conversion/double-conversion.pri | 2 | ||||
| -rw-r--r-- | src/3rdparty/masm/masm-defs.pri | 24 | ||||
| -rw-r--r-- | src/3rdparty/masm/masm.pri | 24 |
3 files changed, 25 insertions, 25 deletions
diff --git a/src/3rdparty/double-conversion/double-conversion.pri b/src/3rdparty/double-conversion/double-conversion.pri index 8bb37c63e9..4ad5f9f7a7 100644 --- a/src/3rdparty/double-conversion/double-conversion.pri +++ b/src/3rdparty/double-conversion/double-conversion.pri @@ -1,4 +1,4 @@ -INCLUDEPATH += $PWD +INCLUDEPATH += $$PWD VPATH += $$PWD SOURCES += $$PWD/*.cc HEADERS += $$PWD/*.h diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri new file mode 100644 index 0000000000..34b86e30e4 --- /dev/null +++ b/src/3rdparty/masm/masm-defs.pri @@ -0,0 +1,24 @@ + +DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE="" + +DEFINES += ENABLE_LLINT=0 +DEFINES += ENABLE_DFG_JIT=0 +DEFINES += ENABLE_JIT=1 +DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0 +DEFINES += ENABLE_ASSEMBLER=1 +DEFINES += ENABLE_YARR_JIT=0 +DEFINES += BUILDING_QT__ + +INCLUDEPATH += $$PWD/jit +INCLUDEPATH += $$PWD/assembler +INCLUDEPATH += $$PWD/runtime +INCLUDEPATH += $$PWD/wtf +INCLUDEPATH += $$PWD/stubs +INCLUDEPATH += $$PWD/stubs/wtf +INCLUDEPATH += $$PWD + +DEFINES += WTF_USE_UDIS86=1 +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 92ad32d4ea..f172762089 100644 --- a/src/3rdparty/masm/masm.pri +++ b/src/3rdparty/masm/masm.pri @@ -1,4 +1,3 @@ - HEADERS += $$PWD/assembler/*.h SOURCES += $$PWD/assembler/ARMAssembler.cpp SOURCES += $$PWD/assembler/ARMv7Assembler.cpp @@ -31,28 +30,6 @@ HEADERS += $$PWD/wtf/PageReservation.h SOURCES += $$PWD/stubs/WTFStubs.cpp HEADERS += $$PWD/stubs/WTFStubs.h -DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE="" - -DEFINES += ENABLE_LLINT=0 -DEFINES += ENABLE_DFG_JIT=0 -DEFINES += ENABLE_JIT=1 -DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0 -DEFINES += ENABLE_ASSEMBLER=1 - -DEFINES += BUILDING_QT__ - -INCLUDEPATH += $$PWD/jit -INCLUDEPATH += $$PWD/assembler -INCLUDEPATH += $$PWD/runtime -INCLUDEPATH += $$PWD/wtf -INCLUDEPATH += $$PWD/stubs -INCLUDEPATH += $$PWD/stubs/wtf -INCLUDEPATH += $$PWD - -DEFINES += WTF_USE_UDIS86=1 -INCLUDEPATH += $$PWD/disassembler -INCLUDEPATH += $$PWD/disassembler/udis86 -INCLUDEPATH += $$_OUT_PWD SOURCES += $$PWD/disassembler/Disassembler.cpp SOURCES += $$PWD/disassembler/UDis86Disassembler.cpp SOURCES += $$PWD/disassembler/udis86/udis86.c @@ -63,7 +40,6 @@ SOURCES += $$PWD/disassembler/udis86/udis86_syn-att.c SOURCES += $$PWD/disassembler/udis86/udis86_syn.c SOURCES += $$PWD/disassembler/udis86/udis86_syn-intel.c -DEFINES += ENABLE_YARR_JIT=0 SOURCES += \ $$PWD/yarr/YarrCanonicalizeUCS2.cpp \ $$PWD/yarr/YarrInterpreter.cpp \ |