build: refactoriong meson script.

move gl dependency to gl_engine part which is right position.

Change-Id: I9d4935f94eff96ca1527762c92d07f9b216f19cd

diff --git a/meson.build b/meson.build
index b1cf7ac..66b907d 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('thorvg',
         'cpp',
-        default_options : ['buildtype=debugoptimized', 'werror=false', 'cpp_std=c++14', 'optimization=s'],
+        default_options : ['buildtype=debugoptimized', 'werror=false', 'cpp_std=c++17', 'optimization=s'],
         version : '0.1.0',
         license : 'Apache-2.0')
 

diff --git a/src/lib/gl_engine/meson.build b/src/lib/gl_engine/meson.build
index 943fb06..6856f1d 100644 (file)
--- a/src/lib/gl_engine/meson.build
+++ b/src/lib/gl_engine/meson.build
@@ -14,7 +14,12 @@ source_file = [
    'tvgGlShaderSrc.cpp',
 ]
 
+egl_dep = meson.get_compiler('cpp').find_library('EGL')
+gles_dep = meson.get_compiler('cpp').find_library('GLESv2')
+external_dep = [egl_dep, gles_dep]
+
 glengine_dep = declare_dependency(
+   dependencies        : external_dep,
    include_directories : include_directories('.'),
-   sources : source_file
+   sources             : source_file,
 )

diff --git a/src/meson.build b/src/meson.build
index 493497b..7320bb2 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -4,12 +4,8 @@ subdir('lib')
 subdir('loaders')
 subdir('examples')
 
-m_dep = meson.get_compiler('cpp').find_library('m')
 thread_dep = meson.get_compiler('cpp').find_library('pthread')
-egl_dep = meson.get_compiler('cpp').find_library('EGL')
-gles_dep = meson.get_compiler('cpp').find_library('GLESv2')
-
-thorvg_lib_dep = [ src_dep, swengine_dep, glengine_dep, m_dep, egl_dep, gles_dep, svgloader_dep, thread_dep]
+thorvg_lib_dep = [ src_dep, swengine_dep, glengine_dep, svgloader_dep, thread_dep]
 
 
 thorvg_lib = library(