Browse Source

use lv2 fallback if not found

master
Alexandros Theodotou 2 years ago
parent
commit
06b7e82375
Signed by: alex
GPG Key ID: 022EAE42313D70F3
  1. 7
      .gitignore
  2. 8
      meson.build
  3. 1
      src/meson.build
  4. 10
      src/zlfo_common.h
  5. 6
      src/zlfo_ui.c
  6. 3
      subprojects/lilv.wrap

7
.gitignore vendored

@ -84,8 +84,9 @@ tags @@ -84,8 +84,9 @@ tags
# Valgrind
vgcore.*
# subprojects
subprojects/**/*
# callgrind
callgrind.*
# subprojects
subprojects/**/*
!subprojects/*.wrap

8
meson.build

@ -97,9 +97,17 @@ zlfo_config_h_dep = declare_dependency ( @@ -97,9 +97,17 @@ zlfo_config_h_dep = declare_dependency (
sources: zlfo_config_h,
)
lv2_dep = dependency (
'lv2', version: '>=1.16.0', required: false)
if not lv2_dep.found()
lilv_proj = subproject('lilv')
lv2_dep = lilv_proj.get_variable('lv2_dep')
endif
zlfo_deps = [
zlfo_config_h_dep,
cc.find_library ('m'),
lv2_dep,
]
ztoolkit_dep = dependency(
'ztoolkit', version: '>= 0.1',

1
src/meson.build

@ -63,6 +63,7 @@ lv2_ttl_gen = executable ( @@ -63,6 +63,7 @@ lv2_ttl_gen = executable (
'zlfo_ttl_gen.c',
],
include_directories: inc_dirs,
dependencies: lv2_dep,
c_args: common_cflags,
install: false,
)

10
src/zlfo_common.h

@ -30,22 +30,12 @@ @@ -30,22 +30,12 @@
#include <string.h>
/* use old style for now until distros catch up */
#ifdef _WOE32
#include "lv2/atom/atom.h"
#include "lv2/atom/forge.h"
#include "lv2/core/lv2.h"
#include "lv2/log/log.h"
#include "lv2/urid/urid.h"
#include "lv2/time/time.h"
#else
#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
#include "lv2/lv2plug.in/ns/ext/log/log.h"
#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
#include "lv2/lv2plug.in/ns/ext/time/time.h"
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
#endif
/** Min, max and default frequency. */
#define MIN_FREQ 0.1f

6
src/zlfo_ui.c

@ -46,14 +46,8 @@ @@ -46,14 +46,8 @@
#include <cairo.h>
/* use old style for now until distros catch up */
#ifdef _WOE32
#include <lv2/atom/util.h>
#include <lv2/ui/ui.h>
#else
#include "lv2/lv2plug.in/ns/ext/atom/util.h"
#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
#endif
#include <ztoolkit/ztk.h>

3
subprojects/lilv.wrap

@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
[wrap-git]
url = https://git.zrythm.org/git/zrythm-lilv
revision = a82d0ee0c2d222b91219f5e460a149d51c3a8f66
Loading…
Cancel
Save