From b6b4b2c6d825c056033c4111a67e83111b5f02e8 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Sat, 11 Nov 2017 14:48:10 +0000 Subject: [PATCH] mapi: Teach es{1,2}api/ABI-check shared library names on Cygwin Ideally we'd be able to get the library filename from libtool, but that doesn't seem to be a feature... Use of ${uname} is presumably ok here as we won't be running 'make check' if we are cross-compiling Signed-off-by: Jon Turney Reviewed-by: Eric Engestrom --- src/mapi/es1api/ABI-check | 13 +++++++++---- src/mapi/es2api/ABI-check | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/mapi/es1api/ABI-check b/src/mapi/es1api/ABI-check index 0a867343c79..b9ae5efafd8 100755 --- a/src/mapi/es1api/ABI-check +++ b/src/mapi/es1api/ABI-check @@ -9,12 +9,17 @@ set -eu # or in extensions that are part of the ES 1.1 extension pack. # (see http://www.khronos.org/registry/gles/specs/1.1/opengles_spec_1_1_extension_pack.pdf) -if [ $(uname) == "Darwin" ] -then +case "$(uname)" in +Darwin) LIB=${1-es1api/.libs/libGLESv1_CM.dylib} -else + ;; +CYGWIN*) + LIB=${1-es1api/.libs/cygGLESv1_CM-1.dll} + ;; +*) LIB=${1-es1api/.libs/libGLESv1_CM.so.1} -fi + ;; +esac if ! [ -f "$LIB" ] then diff --git a/src/mapi/es2api/ABI-check b/src/mapi/es2api/ABI-check index 716e6679a49..7bc78480f76 100755 --- a/src/mapi/es2api/ABI-check +++ b/src/mapi/es2api/ABI-check @@ -6,12 +6,17 @@ set -eu # GL_EXT_multi_draw_arrays # GL_OES_EGL_image -if [ $(uname) == "Darwin" ] -then +case "$(uname)" in +Darwin) LIB=${1-es2api/.libs/libGLESv2.dylib} -else + ;; +CYGWIN*) + LIB=${1-es2api/.libs/cygGLESv2-2.dll} + ;; +*) LIB=${1-es2api/.libs/libGLESv2.so.2} -fi + ;; +esac if ! [ -f "$LIB" ] then -- 2.30.2