From 6505bac7106b00e9ffb9151a862df8507e13249c Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Wed, 26 Dec 2018 17:36:03 +0000 Subject: [PATCH] meson - fix meson build to specifically link to GL or GLES these are explicit options to choose gl or gles. i found that evas moduels were not linking to gles, but to GL even wiht gles enabled. --- src/lib/evas/meson.build | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build index 10347d3e5a..dc08666fce 100644 --- a/src/lib/evas/meson.build +++ b/src/lib/evas/meson.build @@ -165,12 +165,13 @@ endif if get_option('opengl') != 'none' - gl_deps += dependency('gl') -endif - -if get_option('opengl') == 'es-egl' - config_h.set('GL_GLES', '1') - gl_deps += dependency('egl') + if get_option('opengl') == 'es-egl' + config_h.set('GL_GLES', '1') + gl_deps += cc.find_library('GLESv2') + gl_deps += cc.find_library('EGL') + else + gl_deps += cc.find_library('GL') + endif endif evas_pre = declare_dependency(