From 0c8fe8107201dc49323e3daf6777afdf5fe348fc Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Thu, 20 Jun 2024 13:35:38 +0900 Subject: [PATCH] gl_engine: improve the dependency check - dependency() works with a pkgconfig, more preferred. - add fallback to GL library search with candididates. --- src/renderer/gl_engine/meson.build | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/renderer/gl_engine/meson.build b/src/renderer/gl_engine/meson.build index 4ab14edd..cedace08 100644 --- a/src/renderer/gl_engine/meson.build +++ b/src/renderer/gl_engine/meson.build @@ -21,10 +21,27 @@ source_file = [ 'tvgGlTessellator.h', ] +#find a gl library with fallbacks gles_dep = meson.get_compiler('cpp').find_library('GLESv3', required: false) if not gles_dep.found() - gles_dep = meson.get_compiler('cpp').find_library('GLESv2', required: true) + gles_dep = dependency('GLESv3', required: false) +endif + +if not gles_dep.found() + gles_dep = meson.get_compiler('cpp').find_library('GLESv2', required: false) +endif + +if not gles_dep.found() + gles_dep = dependency('GLESv2', required: false) +endif + +if not gles_dep.found() + gles_dep = dependency('GL') +endif + +if not gles_dep.found() + gles_dep = meson.get_compiler('cpp').find_library('GL') endif engine_dep += [declare_dependency(