diff options
| author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-08-05 12:45:49 (GMT) |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-08-06 17:21:01 (GMT) |
| commit | d81ab877bc4424d918c400af3f65509f80f22f67 (patch) | |
| tree | 954d392e1a4208a759554b176ee41699964e9260 /src/gui/painting | |
| parent | 1b0f790d27cda48137c7114fadc694432a104c90 (diff) | |
| download | Qt-d81ab877bc4424d918c400af3f65509f80f22f67.zip Qt-d81ab877bc4424d918c400af3f65509f80f22f67.tar.gz Qt-d81ab877bc4424d918c400af3f65509f80f22f67.tar.bz2 | |
Move the build of Neon file from painting.pri to gui.pro
Move the build operation of files using Neon from painting.pri to
gui.pro. This will make easier to add Neon files in the future.
Reviewed-by: Andreas Kling
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/painting.pri | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index 4023f65..dfa4a48 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -246,23 +246,8 @@ symbian { QMAKE_CXXFLAGS.ARMCC *= -O3 } -neon:*-g++* { - DEFINES += QT_HAVE_NEON - HEADERS += painting/qdrawhelper_neon_p.h - SOURCES += painting/qdrawhelper_neon.cpp - QMAKE_CXXFLAGS *= -mfpu=neon - - DRAWHELPER_NEON_ASM_FILES = ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S - - neon_compiler.commands = $$QMAKE_CXX -c - neon_compiler.commands += $(CXXFLAGS) $(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 = DRAWHELPER_NEON_ASM_FILES - 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 - QMAKE_EXTRA_COMPILERS += neon_compiler -} +NEON_SOURCES += painting/qdrawhelper_neon.cpp +NEON_HEADERS += painting/qdrawhelper_neon_p.h +NEON_ASM += ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S include($$PWD/../../3rdparty/zlib_dependency.pri) |