Centralize the macros in v4.pri that's included by both.
Change-Id: I1ae2ed3b7b97a4e905d2e4ae563c99c964253bb1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
*.bc
*.ll
RegExpJitTables.h
+.qmake.cache
-INCLUDEPATH += $PWD
+INCLUDEPATH += $$PWD
VPATH += $$PWD
SOURCES += $$PWD/*.cc
HEADERS += $$PWD/*.h
--- /dev/null
+
+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
+
-
HEADERS += $$PWD/assembler/*.h
SOURCES += $$PWD/assembler/ARMAssembler.cpp
SOURCES += $$PWD/assembler/ARMv7Assembler.cpp
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
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 \
--- /dev/null
+
+include(../3rdparty/masm/masm-defs.pri)
+
+!llvm: DEFINES += QMLJS_NO_LLVM
+
+INCLUDEPATH += $$PWD
gen_llvm_runtime.target = llvm_runtime
gen_llvm_runtime.commands = clang -O2 -emit-llvm -c $(INCPATH) $$GEN_LLVM_RUNTIME_FLAGS -DQMLJS_LLVM_RUNTIME llvm_runtime.cpp -o $$LLVM_RUNTIME_BC
-
-} else {
-
-DEFINES += QMLJS_NO_LLVM
-
}
# Use SSE2 floating point math on 32 bit instead of the default
include(moth/moth.pri)
include(../3rdparty/masm/masm.pri)
include(../3rdparty/double-conversion/double-conversion.pri)
+include(v4.pri)
QT = v4-private core-private qmldevtools-private
SOURCES = main.cpp
-INCLUDEPATH += ../../src/v4
-INCLUDEPATH += ../../src/3rdparty/masm
-INCLUDEPATH += ../../src/3rdparty/masm/wtf
-INCLUDEPATH += ../../src/3rdparty/masm/stubs
-INCLUDEPATH += ../../src/3rdparty/masm/stubs/wtf
-INCLUDEPATH += ../../src/3rdparty/masm/jit
-INCLUDEPATH += ../../src/3rdparty/masm/assembler
-INCLUDEPATH += ../../src/3rdparty/masm/disassembler
+include(../../src/v4/v4.pri)
-DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE=""
-DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0 ENABLE_LLINT=0
-
-llvm {
- # TODO LLVM support doesn't work correctly
-} else {
- DEFINES += QMLJS_NO_LLVM
-}
load(qt_tool)