mirror of
https://github.com/thorvg/thorvg.git
synced 2025-06-20 15:03:25 +00:00
infra build: revise the binding builds.
The thorvg lib should not have a dependency on the bindings. In fact, it's inverted.
This commit is contained in:
parent
1ed48ccbdb
commit
3fe6c7126a
4 changed files with 5 additions and 11 deletions
|
@ -25,7 +25,7 @@ option('bindings',
|
|||
type: 'array',
|
||||
choices: ['', 'capi'],
|
||||
value: [''],
|
||||
description: 'Enable C API binding')
|
||||
description: 'Enable API bindings')
|
||||
|
||||
option('tools',
|
||||
type: 'array',
|
||||
|
|
|
@ -2,7 +2,7 @@ source_file = [
|
|||
'tvgCapi.cpp',
|
||||
]
|
||||
|
||||
subbinding_dep += [declare_dependency(
|
||||
thorvg_lib_dep += [declare_dependency(
|
||||
include_directories : include_directories('.'),
|
||||
sources : source_file
|
||||
)]
|
||||
|
|
|
@ -1,10 +1,3 @@
|
|||
subbinding_dep = []
|
||||
|
||||
if get_option('bindings').contains('capi') == true
|
||||
subdir('capi')
|
||||
endif
|
||||
|
||||
binding_dep = declare_dependency(
|
||||
dependencies: subbinding_dep,
|
||||
include_directories : include_directories('.'),
|
||||
)
|
||||
|
|
|
@ -40,14 +40,15 @@ endif
|
|||
subdir('lib')
|
||||
subdir('loaders')
|
||||
subdir('savers')
|
||||
subdir('bindings')
|
||||
|
||||
thorvg_lib_dep = [common_dep, loader_dep, saver_dep, binding_dep]
|
||||
thorvg_lib_dep = [common_dep, loader_dep, saver_dep]
|
||||
if host_machine.system() != 'windows'
|
||||
thread_dep = meson.get_compiler('cpp').find_library('pthread')
|
||||
thorvg_lib_dep += [thread_dep]
|
||||
endif
|
||||
|
||||
subdir('bindings')
|
||||
|
||||
thorvg_lib = library(
|
||||
'thorvg',
|
||||
include_directories : headers,
|
||||
|
|
Loading…
Add table
Reference in a new issue