diff options
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/android/android.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/qt_example_installs.prf | 1 | ||||
| -rw-r--r-- | mkspecs/features/simd.prf | 12 |
3 files changed, 15 insertions, 1 deletions
diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf index 5e21f0b845..9e86110da6 100644 --- a/mkspecs/features/android/android.prf +++ b/mkspecs/features/android/android.prf @@ -8,4 +8,7 @@ contains(TEMPLATE, ".*app") { INSTALLS *= target } } +} else: contains(TEMPLATE, "lib"):!QTDIR_build:android_install { + target.path = /libs/$$ANDROID_TARGET_ARCH/ + INSTALLS *= target } diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf index 2db752c1e4..ff842ca754 100644 --- a/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf @@ -97,6 +97,7 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) TEMPLATE = aux CONFIG -= have_target qt staticlib dll SOURCES = + OBJECTIVE_SOURCES = INSTALLS -= target } } diff --git a/mkspecs/features/simd.prf b/mkspecs/features/simd.prf index a98683d929..ad8c545819 100644 --- a/mkspecs/features/simd.prf +++ b/mkspecs/features/simd.prf @@ -174,10 +174,19 @@ QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH) mips_dsp_assembler.name = assembling[mips_dsp] ${QMAKE_FILE_IN} silent:mips_dsp_assembler.commands = @echo assembling[mips_dsp] ${QMAKE_FILE_IN} && $$mips_dsp_assembler.commands QMAKE_EXTRA_COMPILERS += mips_dsp_compiler + QMAKE_EXTRA_COMPILERS += mips_dsp_assembler } mips_dspr2 { HEADERS += $$MIPS_DSP_HEADERS + mips_dspr2_compiler.commands = $$QMAKE_CXX -c + mips_dspr2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} + mips_dspr2_compiler.dependency_type = TYPE_C + mips_dspr2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} + mips_dspr2_compiler.input = MIPS_DSPR2_SOURCES + mips_dspr2_compiler.variable_out = OBJECTS + mips_dspr2_compiler.name = compiling[mips_dspr2] ${QMAKE_FILE_IN} + silent:mips_dspr2_compiler.commands = @echo compiling[mips_dspr2] ${QMAKE_FILE_IN} && $$mips_dspr2_compiler.commands mips_dspr2_assembler.commands = $$QMAKE_CC -c mips_dspr2_assembler.commands += $(CFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} mips_dspr2_assembler.dependency_type = TYPE_C @@ -186,6 +195,7 @@ QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH) mips_dspr2_assembler.variable_out = OBJECTS mips_dspr2_assembler.name = assembling[mips_dspr2] ${QMAKE_FILE_IN} silent:mips_dspr2_assembler.commands = @echo assembling[mips_dspr2] ${QMAKE_FILE_IN} && $$mips_dspr2_assembler.commands + QMAKE_EXTRA_COMPILERS += mips_dspr2_compiler QMAKE_EXTRA_COMPILERS += mips_dspr2_assembler } } else:win32-msvc*|winrt { @@ -297,7 +307,7 @@ QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH) $$AVX_SOURCES $$AVX2_SOURCES \ $$NEON_SOURCES $$NEON_ASM \ $$IWMMXT_SOURCES \ - $$MIPS_DSP_SOURCES $$MIPS_DSP_ASM $$MIPS_DSPR2_ASM + $$MIPS_DSP_SOURCES $$MIPS_DSPR2_SOURCES $$MIPS_DSP_ASM $$MIPS_DSPR2_ASM # Headers are already done in the above sections. } |