Merge branch 'master' into multitrait

bhaller · bhaller · commit e13904cf0c04 · 2026-04-10T06:07:24.000-04:00
diff --git a/QtSLiM/QtSLiM.pro b/QtSLiM/QtSLiM.pro
@@ -52,6 +52,7 @@ message("Target architecture is: $${QMAKE_TARGET.arch}")
 contains(QMAKE_TARGET.arch, x86_64) {
 	message("Building for x86_64; enabling AVX2 and FMA")
 	QMAKE_CFLAGS += -mavx2 -mfma
+	QMAKE_CXXFLAGS += -mavx2 -mfma
 	DEFINES += EIDOS_HAS_AVX2=1 EIDOS_HAS_FMA=1
 }
 contains(QMAKE_TARGET.arch, arm64) {
diff --git a/core/core.pro b/core/core.pro
@@ -35,12 +35,13 @@ message("Target architecture is: $${QMAKE_TARGET.arch}")
 contains(QMAKE_TARGET.arch, x86_64) {
 	message("Building for x86_64; enabling AVX2 and FMA")
 	QMAKE_CFLAGS += -mavx2 -mfma
+	QMAKE_CXXFLAGS += -mavx2 -mfma
 	DEFINES += EIDOS_HAS_AVX2=1 EIDOS_HAS_FMA=1
 }
 contains(QMAKE_TARGET.arch, arm64) {
 	# ARM64 NEON is always available on ARM64, no compiler flag needed
 	message("Building for ARM64; enabling NEON")
-    DEFINES += EIDOS_HAS_NEON=1
+	DEFINES += EIDOS_HAS_NEON=1
 }
 
 
diff --git a/eidos/eidos.pro b/eidos/eidos.pro
@@ -35,12 +35,13 @@ message("Target architecture is: $${QMAKE_TARGET.arch}")
 contains(QMAKE_TARGET.arch, x86_64) {
 	message("Building for x86_64; enabling AVX2 and FMA")
 	QMAKE_CFLAGS += -mavx2 -mfma
+	QMAKE_CXXFLAGS += -mavx2 -mfma
 	DEFINES += EIDOS_HAS_AVX2=1 EIDOS_HAS_FMA=1
 }
 contains(QMAKE_TARGET.arch, arm64) {
 	# ARM64 NEON is always available on ARM64, no compiler flag needed
 	message("Building for ARM64; enabling NEON")
-    DEFINES += EIDOS_HAS_NEON=1
+	DEFINES += EIDOS_HAS_NEON=1
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ message("Target architecture is: $${QMAKE_TARGET.arch}")`
`52`	`52`	`contains(QMAKE_TARGET.arch, x86_64) {`
`53`	`53`	`message("Building for x86_64; enabling AVX2 and FMA")`
`54`	`54`	`QMAKE_CFLAGS += -mavx2 -mfma`
	`55`	`+ QMAKE_CXXFLAGS += -mavx2 -mfma`
`55`	`56`	`DEFINES += EIDOS_HAS_AVX2=1 EIDOS_HAS_FMA=1`
`56`	`57`	`}`
`57`	`58`	`contains(QMAKE_TARGET.arch, arm64) {`
Original file line number	Diff line number	Diff line change
`@@ -35,12 +35,13 @@ message("Target architecture is: $${QMAKE_TARGET.arch}")`
`35`	`35`	`contains(QMAKE_TARGET.arch, x86_64) {`
`36`	`36`	`message("Building for x86_64; enabling AVX2 and FMA")`
`37`	`37`	`QMAKE_CFLAGS += -mavx2 -mfma`
	`38`	`+ QMAKE_CXXFLAGS += -mavx2 -mfma`
`38`	`39`	`DEFINES += EIDOS_HAS_AVX2=1 EIDOS_HAS_FMA=1`
`39`	`40`	`}`
`40`	`41`	`contains(QMAKE_TARGET.arch, arm64) {`
`41`	`42`	`# ARM64 NEON is always available on ARM64, no compiler flag needed`
`42`	`43`	`message("Building for ARM64; enabling NEON")`
`43`		`- DEFINES += EIDOS_HAS_NEON=1`
	`44`	`+ DEFINES += EIDOS_HAS_NEON=1`
`44`	`45`	`}`
`45`	`46`
`46`	`47`