dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-04-04 07:56:49 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

configure: fix iOS builds

Browse Source 
possibly other cross-compiles; avoids misusing -mavx2/-msse2 in these
cases by checking the usability of the associated intrinsics header
files.

iosbuild.sh has been broken since at least:
6e61a3a configure: test for -msse2

Change-Id: Ic650d9eec70f6a5de7d89997b3b425a4aa50ccd9
This commit is contained in:
James Zern 2014-07-04 21:48:36 -07:00
parent 6422e683af
commit 6450c48d4c
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
configure.ac
View File

@ -63,18 +63,33 @@ TEST_AND_ADD_CFLAGS([AM_CFLAGS], [-Wunused])
TEST_AND_ADD_CFLAGS([AM_CFLAGS], [-Wvla]) TEST_AND_ADD_CFLAGS([AM_CFLAGS], [-Wvla])
AC_SUBST([AM_CFLAGS]) AC_SUBST([AM_CFLAGS])
dnl === Check for machine specific flags
TEST_AND_ADD_CFLAGS([AVX2_FLAGS], [-mavx2]) TEST_AND_ADD_CFLAGS([AVX2_FLAGS], [-mavx2])
# Assume the presence of any flag is enough. This could be made more robust
# with a header and/or compile check if needed.
AS_IF([test -n "$AVX2_FLAGS"], [ AS_IF([test -n "$AVX2_FLAGS"], [
AC_DEFINE(WEBP_HAVE_AVX2, [1], SAVED_CFLAGS=$CFLAGS
[Set to 1 if AVX2 is supported])]) CFLAGS="$CFLAGS $AVX2_FLAGS"
AC_CHECK_HEADER([immintrin.h],
[AC_DEFINE(WEBP_HAVE_AVX2, [1],
[Set to 1 if AVX2 is supported])],
[AVX2_FLAGS=""],
dnl it's illegal to directly include avx2intrin.h, but it's
dnl included conditionally in immintrin.h, tricky!
[#ifndef __AVX2__
#error avx2 is not enabled
#endif
])
CFLAGS=$SAVED_CFLAGS])
AC_SUBST([AVX2_FLAGS]) AC_SUBST([AVX2_FLAGS])
TEST_AND_ADD_CFLAGS([SSE2_FLAGS], [-msse2]) TEST_AND_ADD_CFLAGS([SSE2_FLAGS], [-msse2])
AS_IF([test -n "$SSE2_FLAGS"], [ AS_IF([test -n "$SSE2_FLAGS"], [
AC_DEFINE(WEBP_HAVE_SSE2, [1], SAVED_CFLAGS=$CFLAGS
[Set to 1 if SSE2 is supported])]) CFLAGS="$CFLAGS $SSE2_FLAGS"
AC_CHECK_HEADER([emmintrin.h],
[AC_DEFINE(WEBP_HAVE_SSE2, [1],
[Set to 1 if SSE2 is supported])],
[SSE2_FLAGS=""])
CFLAGS=$SAVED_CFLAGS])
AC_SUBST([SSE2_FLAGS]) AC_SUBST([SSE2_FLAGS])
dnl === CLEAR_LIBVARS([var_pfx]) dnl === CLEAR_LIBVARS([var_pfx])