aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2019-05-09 19:18:23 +0200
committerGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2019-05-09 19:18:23 +0200
commitb28ec545154a66c004bc8c030e939ab5f1c5e8a9 (patch)
treec23df7803d26e2654753565dd12444a5aef62568
parent964a2f450910180a3e3f04dedbdd81e0bd7f318c (diff)
parent2af0ffccfad0a5e2398524b70f3fd224cd6489b7 (diff)
downloadtracker.lv2-b28ec545154a66c004bc8c030e939ab5f1c5e8a9.zip
tracker.lv2-b28ec545154a66c004bc8c030e939ab5f1c5e8a9.tar.gz
tracker.lv2-b28ec545154a66c004bc8c030e939ab5f1c5e8a9.tar.bz2
tracker.lv2-b28ec545154a66c004bc8c030e939ab5f1c5e8a9.tar.xz
Merge commit '2af0ffccfad0a5e2398524b70f3fd224cd6489b7'
-rw-r--r--subprojects/d2tk/VERSION2
-rw-r--r--subprojects/d2tk/meson.build40
2 files changed, 16 insertions, 26 deletions
diff --git a/subprojects/d2tk/VERSION b/subprojects/d2tk/VERSION
index 0014166..7428e76 100644
--- a/subprojects/d2tk/VERSION
+++ b/subprojects/d2tk/VERSION
@@ -1 +1 @@
-0.1.713
+0.1.717
diff --git a/subprojects/d2tk/meson.build b/subprojects/d2tk/meson.build
index e2e5b73..b11bb64 100644
--- a/subprojects/d2tk/meson.build
+++ b/subprojects/d2tk/meson.build
@@ -96,9 +96,6 @@ test_base_srcs = [
join_paths('test', 'mock.c')
]
-cp = find_program('cp')
-clone = [cp, '@INPUT@', '@OUTPUT@']
-
c_args = ['-fvisibility=hidden',
'-ffast-math']
@@ -133,8 +130,7 @@ if freetype_dep.found() and pixman_dep.found() and cairo_dep.found() and (host_m
c_args : c_args,
include_directories : inc_dir,
dependencies: d2tk_cairo,
- install : true,
- install_dir : bindir)
+ install : false)
if input_dep.found() and udev_dep.found()
d2tk_fbdev = declare_dependency(
@@ -147,8 +143,7 @@ if freetype_dep.found() and pixman_dep.found() and cairo_dep.found() and (host_m
c_args : c_args,
include_directories : inc_dir,
dependencies: d2tk_fbdev,
- install : true,
- install_dir : bindir)
+ install : false)
endif
endif
@@ -162,36 +157,31 @@ executable('d2tk.nanovg', [bin_srcs],
c_args : c_args,
include_directories : inc_dir,
dependencies: d2tk_nanovg,
- install : true,
- install_dir : bindir)
+ install : false)
-custom_target('roboto_bold_ttf',
+configure_file(
input : join_paths('nanovg', 'example', 'Roboto-Bold.ttf'),
output : 'Roboto-Bold.ttf',
- command : clone,
- install : true,
- install_dir : pdatadir)
+ copy : true,
+ install : false)
-custom_target('libre-arrow-circle-right_png',
+configure_file(
input : join_paths('example', 'libre-arrow-circle-right.png'),
output : 'libre-arrow-circle-right.png',
- command : clone,
- install : true,
- install_dir : pdatadir)
+ copy : true,
+ install : false)
-custom_target('libre-gui-folder_png',
+configure_file(
input : join_paths('example', 'libre-gui-folder.png'),
output : 'libre-gui-folder.png',
- command : clone,
- install : true,
- install_dir : pdatadir)
+ copy : true,
+ install : false)
-custom_target('libre-gui-file_png',
+configure_file(
input : join_paths('example', 'libre-gui-file.png'),
output : 'libre-gui-file.png',
- command : clone,
- install : true,
- install_dir : pdatadir)
+ copy : true,
+ install : false)
test_core = executable('test.core', [test_core_srcs, lib_srcs],
c_args : c_args,