git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-08 05:33:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

build: refactoriong meson script.

Browse source 
move gl dependency to gl_engine part which is right position.

Change-Id: I9d4935f94eff96ca1527762c92d07f9b216f19cd
This commit is contained in:
Hermet Park 2020-07-08 10:44:51 +09:00
parent 400ad1c585
commit e2fc353846
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -1,6 +1,6 @@
project('thorvg', project('thorvg',
'cpp', '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', version : '0.1.0',
license : 'Apache-2.0') license : 'Apache-2.0')

7
src/lib/gl_engine/meson.build
View file

@ -14,7 +14,12 @@ source_file = [
'tvgGlShaderSrc.cpp', '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( glengine_dep = declare_dependency(
dependencies : external_dep,
include_directories : include_directories('.'), include_directories : include_directories('.'),
sources : source_file sources : source_file,
) )

6
src/meson.build
View file

@ -4,12 +4,8 @@ subdir('lib')
subdir('loaders') subdir('loaders')
subdir('examples') subdir('examples')
m_dep = meson.get_compiler('cpp').find_library('m')
thread_dep = meson.get_compiler('cpp').find_library('pthread') thread_dep = meson.get_compiler('cpp').find_library('pthread')
egl_dep = meson.get_compiler('cpp').find_library('EGL') thorvg_lib_dep = [ src_dep, swengine_dep, glengine_dep, svgloader_dep, thread_dep]
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 = library( thorvg_lib = library(