From b30aad552cde507a70c6bf3bc2ce40ed69e0ecf2 Mon Sep 17 00:00:00 2001 From: Benjamin Gordon Date: Wed, 13 Jun 2018 16:17:32 -0600 Subject: configure.ac/meson.build: Add options for library suffixes When building the Chrome OS Android container, we need to build copies of mesa that don't conflict with the Android system-supplied libraries. This adds options to create suffixed versions of EGL and GLES libraries: libEGL.so -> libEGL${egl-lib-suffix}.so libGLESv1_CM.so -> libGLESv1_CM${gles-lib-suffix}.so libGLESv2.so -> libGLES${gles-lib-suffix}.so This is similar to what happens when --enable-libglvnd is specified, but without the side effects of linking against libglvnd. To avoid unexpected clashes with the suffixed appended by libglvnd, make it an error to specify both --enable-libglvnd and --with-egl-lib-suffix. Reviewed-by: Eric Engestrom --- src/mapi/es1api/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mapi/es1api/meson.build') diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build index 016090dac91..47f0f8bd0b9 100644 --- a/src/mapi/es1api/meson.build +++ b/src/mapi/es1api/meson.build @@ -28,7 +28,7 @@ es1_glapi_mapi_tmp_h = custom_target( ) libglesv1_cm = shared_library( - 'GLESv1_CM', + 'GLESv1_CM' + get_option('gles-lib-suffix'), ['../entry.c', es1_glapi_mapi_tmp_h], c_args : [ c_msvc_compat_args, c_vis_args, '-DMAPI_MODE_BRIDGE', -- cgit v1.2.3