diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 14:57:41 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 14:57:42 +0200 |
| commit | 276fb8ee82394b8fe414196677ce6af4028c5652 (patch) | |
| tree | 10fb46e05a825f367dce6204a90d93b83e7f8718 /Source/JavaScriptCore/Target.pri | |
| parent | 3436b01e6296fa23d6b7a2fad875af6116a9650b (diff) | |
| parent | fad1b063ed174a07392561c0323355115aa66992 (diff) | |
| download | qtwebkit-276fb8ee82394b8fe414196677ce6af4028c5652.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ibb1f73326070b66000c54c3c722a45cb7b4791c1
Diffstat (limited to 'Source/JavaScriptCore/Target.pri')
| -rw-r--r-- | Source/JavaScriptCore/Target.pri | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Source/JavaScriptCore/Target.pri b/Source/JavaScriptCore/Target.pri index f609de10b..e1da901c1 100644 --- a/Source/JavaScriptCore/Target.pri +++ b/Source/JavaScriptCore/Target.pri @@ -297,6 +297,19 @@ linux-*:if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")) { disassembler/udis86/udis86_syn.c \ } +win32:!win32-g++*:isEqual(QT_ARCH, "x86_64"):{ + asm_compiler.commands = ml64 /c + asm_compiler.commands += /Fo ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} + asm_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} + asm_compiler.input = ASM_SOURCES + asm_compiler.variable_out = OBJECTS + asm_compiler.name = compiling[asm] ${QMAKE_FILE_IN} + silent:asm_compiler.commands = @echo compiling[asm] ${QMAKE_FILE_IN} && $$asm_compiler.commands + QMAKE_EXTRA_COMPILERS += asm_compiler + + ASM_SOURCES += jit/JITStubsMSVC64.asm +} + HEADERS += $$files(*.h, true) *sh4* { |