diff options
author | Rafael Roquetto <rafael.roquetto.qnx@kdab.com> | 2012-08-17 14:43:01 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-18 08:34:53 +0200 |
commit | 1ef74a763a726829bfc26224d82acff207fdc8bb (patch) | |
tree | 1638f3062805b0bbf94c0aa9ca2a24fff4d046f1 | |
parent | 8ab56793276eef297483fa203bb6fe40dc20c76d (diff) |
Pass NEON_ASM directly to SOURCES.
This guarantees that qmake gives them the proper flags (non C++) while
building these asm files.
Change-Id: I41150f543b8fac81bcd0da963b4d0e0a19b9db2f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rw-r--r-- | mkspecs/features/simd.prf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/simd.prf b/mkspecs/features/simd.prf index afe9871bb1..6d729a66a7 100644 --- a/mkspecs/features/simd.prf +++ b/mkspecs/features/simd.prf @@ -105,13 +105,14 @@ load(qt_build_config) } neon { HEADERS += $$NEON_HEADERS + SOURCES += $$NEON_ASM neon_compiler.commands = $$QMAKE_CXX -c $(CXXFLAGS) !contains(QT_CPU_FEATURES, neon):neon_compiler.commands += $$QMAKE_CFLAGS_NEON neon_compiler.commands += $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} neon_compiler.dependency_type = TYPE_C neon_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} - neon_compiler.input = NEON_ASM NEON_SOURCES + neon_compiler.input = NEON_SOURCES neon_compiler.variable_out = OBJECTS neon_compiler.name = compiling[neon] ${QMAKE_FILE_IN} silent:neon_compiler.commands = @echo compiling[neon] ${QMAKE_FILE_IN} && $$neon_compiler.commands |