diff options
| author | Hans Kristian Rosbach <hk-git@circlestorm.org> | 2023-02-08 21:56:49 +0100 |
|---|---|---|
| committer | Hans Kristian Rosbach <hk-github@circlestorm.org> | 2023-03-17 21:27:56 +0100 |
| commit | b0f2b37c36bede7fcc1c752cba0b002091dc197c (patch) | |
| tree | fad9232dd5bc0982046c161d78802b7bdea6e0ec | |
| parent | f9f7023b5f52aee6f7a36fe79c982c05ffa1be85 (diff) | |
Fix inconsistent feature enablements in cmake and configure
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rwxr-xr-x | configure | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 94a701d..778d5de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -842,6 +842,17 @@ if(WITH_OPTIM) endif() endif() endif() + if(WITH_SSSE3) + if(HAVE_SSSE3_INTRIN) + add_definitions(-DX86_SSSE3 -DX86_SSSE3_ADLER32) + set(SSSE3_SRCS ${ARCHDIR}/adler32_ssse3.c) + add_feature_info(SSSE3_ADLER32 1 "Support SSSE3-accelerated adler32, using \"${SSSE3FLAG}\"") + list(APPEND ZLIB_ARCH_SRCS ${SSSE3_SRCS}) + set_property(SOURCE ${SSSE3_SRCS} PROPERTY COMPILE_FLAGS "${SSSE3FLAG} ${NOLTOFLAG}") + else() + set(WITH_SSSE3 OFF) + endif() + endif() if(FORCE_TZCNT) add_definitions(-DX86_NOCHECK_TZCNT) endif() @@ -1266,8 +1266,8 @@ case "${ARCH}" in fi if test ${HAVE_SSE2_INTRIN} -eq 1; then - CFLAGS="${CFLAGS} -DX86_SSE2 -DX86_SSE2_CHUNKSET" - SFLAGS="${SFLAGS} -DX86_SSE2 -DX86_SSE2_CHUNKSET" + CFLAGS="${CFLAGS} -DX86_SSE2 -DX86_SSE2_CHUNKSET -DX86_SSE2_SLIDEHASH" + SFLAGS="${SFLAGS} -DX86_SSE2 -DX86_SSE2_CHUNKSET -DX86_SSE2_SLIDEHASH" ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} chunkset_sse.o slide_sse.o" ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} chunkset_sse.lo slide_sse.lo" |