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
commit407992937dfb787e9208619a1733920c88cf33ce (patch)
tree00d330ac684b740eedef7d21c731afcb5f8916f8
parent314e9071fe5339fc3c7addf61b23c6042a216934 (diff)
downloadsynthpod-407992937dfb787e9208619a1733920c88cf33ce.tar.xz
Squashed 'subprojects/d2tk/' changes from 9df04584..fd3dce64
fd3dce64 pugl: make API static. ab8e707c Merge commit '3c5e6a74a3e7c45ea82611627516365560b76439' 3c5e6a74 Squashed 'pugl/' changes from 7fc8d9e49..9a38c7629 git-subtree-dir: subprojects/d2tk git-subtree-split: fd3dce64ded7a744945762b9285523cdd6daa7a2
-rw-r--r--VERSION2
-rw-r--r--meson.build3
-rw-r--r--pugl/include/pugl/pugl.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/VERSION b/VERSION
index 64acfd0c..d9c32bad 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.1179
+0.1.1185
diff --git a/meson.build b/meson.build
index 1f65199d..8050fd5b 100644
--- a/meson.build
+++ b/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/pugl/include/pugl/pugl.h b/pugl/include/pugl/pugl.h
index 41afc256..8a261c72 100644
--- a/pugl/include/pugl/pugl.h
+++ b/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