1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
Description: use c_static_args
Author: Sébastien Noel <sebastien@twolife.be>
Forwarded: not-needed
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,6 @@ project('plutovg', 'c',
)
plutovg_deps = []
-plutovg_compile_args = []
cc = meson.get_compiler('c')
@@ -20,11 +19,6 @@ if get_option('font-face-cache-load').di
plutovg_c_args += ['-DPLUTOVG_DISABLE_FONT_FACE_CACHE_LOAD']
endif
-if get_option('default_library') == 'static'
- plutovg_c_args += ['-DPLUTOVG_BUILD_STATIC']
- plutovg_compile_args += ['-DPLUTOVG_BUILD_STATIC']
-endif
-
math_dep = cc.find_library('m', required: false)
if math_dep.found()
plutovg_deps += [math_dep]
@@ -61,6 +55,7 @@ plutovg_lib = library('plutovg', plutovg
dependencies: plutovg_deps,
version: meson.project_version(),
c_args: plutovg_c_args,
+ c_static_args : host_machine.system() == 'windows' ? ['-DPLUTOVG_BUILD_STATIC'] : [],
gnu_symbol_visibility: 'hidden',
install: true
)
@@ -68,7 +63,6 @@ plutovg_lib = library('plutovg', plutovg
plutovg_dep = declare_dependency(
link_with: plutovg_lib,
include_directories: include_directories('include'),
- compile_args: plutovg_compile_args
)
meson.override_dependency('plutovg', plutovg_dep)
|
