Commit7bcf9a5

committed

fix droid x86_64 cryptopp build

1 parent4053212 commit7bcf9a5Copy full SHA for 7bcf9a5

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ CONFIG += static simd`
`3`	`3`	`CONFIG -=qt`
`4`	`4`
`5`	`5`	`TARGET =qtcryptopp`
`6`		`-VERSION =8.1.0`
	`6`	`+VERSION =8.2.0`
`7`	`7`
`8`	`8`	`load(qt_build_config)`
`9`	`9`
`@@ -372,7 +372,7 @@ NEON_SOURCES += \`
`372`	`372`	`src/simon128_simd.cpp\`
`373`	`373`	`src/speck64_simd.cpp\`
`374`	`374`	`src/speck128_simd.cpp`
`375`		`-`
	`375`	`+`
`376`	`376`	`ARMABI_HEADERS +=\`
`377`	`377`	`src/arm_simd.h`
`378`	`378`
`@@ -438,7 +438,7 @@ win32:!win32-g++ {`
`438`	`438`	`QMAKE_CXXFLAGS -=-mfpu=vfp`
`439`	`439`	`QMAKE_CXXFLAGS +=-mfpu=neon`
`440`	`440`	`CONFIG += neon`
`441`		`-} else:equals(ANDROID_TARGET_ARCH, x86) {`
	`441`	`+} else:contains(ANDROID_TARGET_ARCH, x86(_64)?) {`
`442`	`442`	`# Do this for Android builds for now as the NDK is broken`
`443`	`443`	`warning("Disabled x86 crypto ASM")`
`444`	`444`

Comments

(0)