From 5d303867f57578fcbe0c2fb30a9646b1f4fd6b46 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sat, 11 Jun 2016 14:53:50 +0000 Subject: [PATCH] Use correct names for dlopen()ed files on Cygwin Signed-off-by: Yaakov Selkowitz Reviewed-by: Jon Turney --- src/egl/drivers/dri2/egl_dri2.c | 2 ++ src/gallium/auxiliary/util/u_format_s3tc.c | 2 ++ src/mesa/main/texcompress_s3tc.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index bfde6400a5a..ac2be862726 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -2733,6 +2733,8 @@ dri2_load(_EGLDriver *drv) const char *libname = "libglapi.so"; #elif defined(__APPLE__) const char *libname = "libglapi.0.dylib"; +#elif defined(__CYGWIN__) + const char *libname = "cygglapi-0.dll"; #else const char *libname = "libglapi.so.0"; #endif diff --git a/src/gallium/auxiliary/util/u_format_s3tc.c b/src/gallium/auxiliary/util/u_format_s3tc.c index cd3e165d3f0..8c4f2150bef 100644 --- a/src/gallium/auxiliary/util/u_format_s3tc.c +++ b/src/gallium/auxiliary/util/u_format_s3tc.c @@ -32,6 +32,8 @@ #if defined(_WIN32) || defined(WIN32) #define DXTN_LIBNAME "dxtn.dll" +#elif defined(__CYGWIN__) +#define DXTN_LIBNAME "cygtxc_dxtn.dll" #elif defined(__APPLE__) #define DXTN_LIBNAME "libtxc_dxtn.dylib" #else diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c index 7ddb0ed38c0..992ad058bf3 100644 --- a/src/mesa/main/texcompress_s3tc.c +++ b/src/mesa/main/texcompress_s3tc.c @@ -46,6 +46,8 @@ #define DXTN_LIBNAME "dxtn.dll" #define RTLD_LAZY 0 #define RTLD_GLOBAL 0 +#elif defined(__CYGWIN__) +#define DXTN_LIBNAME "cygtxc_dxtn.dll" #else #define DXTN_LIBNAME "libtxc_dxtn.so" #endif -- 2.30.2