aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2021-01-15 00:07:25 +0100
committerHanspeter Portner <dev@open-music-kontrollers.ch>2021-01-15 00:07:25 +0100
commite03addae77375119171da3fa47c349a1cd34f2f5 (patch)
tree26d20b09fb8bf9e83baf4b4cd9c9e910a9c6a532
parent3958cc080bd4f49809f10eb1225a9ce7b747d74b (diff)
parent407992937dfb787e9208619a1733920c88cf33ce (diff)
downloadsynthpod-e03addae77375119171da3fa47c349a1cd34f2f5.tar.xz
Merge commit '407992937dfb787e9208619a1733920c88cf33ce'
-rw-r--r--subprojects/d2tk/VERSION2
-rw-r--r--subprojects/d2tk/meson.build3
-rw-r--r--subprojects/d2tk/pugl/include/pugl/pugl.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/subprojects/d2tk/VERSION b/subprojects/d2tk/VERSION
index 64acfd0c..d9c32bad 100644
--- a/subprojects/d2tk/VERSION
+++ b/subprojects/d2tk/VERSION
@@ -1 +1 @@
-0.1.1179
+0.1.1185
diff --git a/subprojects/d2tk/meson.build b/subprojects/d2tk/meson.build
index 1f65199d..8050fd5b 100644
--- a/subprojects/d2tk/meson.build
+++ b/subprojects/d2tk/meson.build
@@ -293,7 +293,7 @@ endif
if use_backend_cairo.enabled()
if use_frontend_pugl.enabled()
d2tk_cairo = declare_dependency(
- compile_args : '-DPUGL_HAVE_CAIRO',
+ compile_args : ['-DPUGL_HAVE_CAIRO', '-DPUGL_STATIC'],
include_directories : inc_dir,
dependencies : [deps, cairo_deps, cairo_xlib_dep],
link_args : links,
@@ -328,6 +328,7 @@ endif
if use_backend_nanovg.enabled()
if use_frontend_pugl.enabled()
d2tk_nanovg = declare_dependency(
+ compile_args : ['-DPUGL_STATIC'],
include_directories : inc_dir,
dependencies : [deps, glu_dep, glew_dep],
link_args : links,
diff --git a/subprojects/d2tk/pugl/include/pugl/pugl.h b/subprojects/d2tk/pugl/include/pugl/pugl.h
index 41afc256..8a261c72 100644
--- a/subprojects/d2tk/pugl/include/pugl/pugl.h
+++ b/subprojects/d2tk/pugl/include/pugl/pugl.h
@@ -25,7 +25,7 @@
# define PUGL_API __declspec(dllexport)
#elif defined(_WIN32) && !defined(PUGL_STATIC)
# define PUGL_API __declspec(dllimport)
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) && !defined(PUGL_STATIC)
# define PUGL_API __attribute__((visibility("default")))
#else
# define PUGL_API