From 1ef74a763a726829bfc26224d82acff207fdc8bb Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Fri, 17 Aug 2012 14:43:01 +0200 Subject: 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 Reviewed-by: Oswald Buddenhagen --- mkspecs/features/simd.prf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mkspecs') 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 -- cgit v1.2.3