diff options
| author | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2020-02-07 15:23:58 +0100 |
|---|---|---|
| committer | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2020-02-07 15:23:58 +0100 |
| commit | 6e8551f1d77f46cf3a34ac9bce0b8475098346f2 (patch) | |
| tree | eb31f400a64a3994021cd2aaa41a83d70d0202f6 | |
| parent | 5ac92a5174929258ab58de311e9dd0aea6a9578e (diff) | |
| download | canvas_display.lv2-6e8551f1d77f46cf3a34ac9bce0b8475098346f2.tar.xz | |
meson: use system GLEW, remove -ffast-math flag.
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | meson.build | 24 |
2 files changed, 17 insertions, 9 deletions
@@ -1 +1 @@ -0.1.435 +0.1.437 diff --git a/meson.build b/meson.build index 694bf96..db44571 100644 --- a/meson.build +++ b/meson.build @@ -5,22 +5,31 @@ project('canvas_display.lv2', 'c', default_options : [ 'b_lto=false', 'c_std=c11']) +build_root = meson.build_root() + cc = meson.get_compiler('c') m_dep = cc.find_library('m') lv2_dep = dependency('lv2', version : '>=1.14.0') cairo_dep = dependency('cairo', version : '>=1.0.0', static : meson.is_cross_build() and false) #FIXME +glew_dep = dependency('glew', version : '>=2.1.0', + static : meson.is_cross_build() and false) #FIXME +if not glew_dep.found() + # use embedded glew + glew_dep = declare_dependency( + include_directories : include_directories('glew-2.1.0'), + sources : join_paths('glew-2.1.0', 'glew.c')) +endif dsp_deps = [m_dep, lv2_dep, cairo_dep] -ui_deps = [m_dep, lv2_dep] +ui_deps = [m_dep, lv2_dep, glew_dep] pugl_inc = include_directories('pugl') nanovg_inc = include_directories('nanovg/src') -glew_inc = include_directories('glew-2.1.0') canvas_inc = include_directories('canvas.lv2') ardour_inc = include_directories('ardour.lv2') -inc_dir = [pugl_inc, nanovg_inc, glew_inc, canvas_inc, ardour_inc] +inc_dir = [pugl_inc, nanovg_inc, canvas_inc, ardour_inc] inst_dir = join_paths(get_option('libdir'), 'lv2', meson.project_name()) @@ -45,14 +54,12 @@ dsp_srcs = ['canvas.c'] ui_srcs = [ 'canvas_ui.c', - join_paths('nanovg', 'src', 'nanovg.c'), - join_paths('glew-2.1.0', 'glew.c') + join_paths('nanovg', 'src', 'nanovg.c') ] ui_links = [] -c_args = ['-fvisibility=hidden', - '-ffast-math'] +c_args = ['-fvisibility=hidden'] if host_machine.system() == 'windows' add_languages('cpp') @@ -122,6 +129,7 @@ endif if lv2lint.found() test('LV2 lint', lv2lint, - args : ['-Ewarn', + args : ['-I', join_paths(build_root, ''), + '-Ewarn', 'http://open-music-kontrollers.ch/lv2/canvas#display']) endif |