diff options
| author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-08-05 14:45:49 +0200 |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-08-06 19:21:01 +0200 |
| commit | d81ab877bc4424d918c400af3f65509f80f22f67 (patch) | |
| tree | 954d392e1a4208a759554b176ee41699964e9260 /src/gui/gui.pro | |
| parent | 1b0f790d27cda48137c7114fadc694432a104c90 (diff) | |
| download | qt4-tools-d81ab877bc4424d918c400af3f65509f80f22f67.tar.gz | |
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/gui.pro')
| -rw-r--r-- | src/gui/gui.pro | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 28440ccf71..89ae06fbbe 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -77,6 +77,24 @@ symbian { DEPLOYMENT = partial_upgrade $$DEPLOYMENT } +neon: QMAKE_CXXFLAGS *= -mfpu=neon +neon:*-g++* { + HEADERS += $$NEON_HEADERS + SOURCES += $$NEON_SOURCES + + DRAWHELPER_NEON_ASM_FILES = $$NEON_ASM + + 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 +} + contains(QMAKE_MAC_XARCH, no) { DEFINES += QT_NO_MAC_XARCH } else { |