aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2018-11-09 13:07:47 +0100
committerHanspeter Portner <dev@open-music-kontrollers.ch>2018-11-09 13:07:47 +0100
commit852f2069731585bf9f3e8690553d2765c9ecf0a5 (patch)
treef8b5bd4a7ef5e27f9f13d30ce151a6ec92e1fb4a
parentaa7390c1ecfbcab1f74def0c18b7c60c5ab9eeda (diff)
downloadcanvas_display.lv2-852f2069731585bf9f3e8690553d2765c9ecf0a5.tar.xz
meson: fixes for mingw and darwin.
-rw-r--r--VERSION2
-rw-r--r--canvas_ui.c4
-rw-r--r--meson.build1
3 files changed, 6 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index 0e4bed1..fa4e50c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.397
+0.1.403
diff --git a/canvas_ui.c b/canvas_ui.c
index b693a75..8ba88f3 100644
--- a/canvas_ui.c
+++ b/canvas_ui.c
@@ -419,6 +419,9 @@ instantiate(const LV2UI_Descriptor *descriptor, const char *plugin_uri,
puglShowWindow(handle->view);
puglEnterContext(handle->view);
+#if defined(__APPLE__)
+//FIXME
+#else
glewExperimental = GL_TRUE;
const GLenum err = glewInit();
if(err != GLEW_OK)
@@ -427,6 +430,7 @@ instantiate(const LV2UI_Descriptor *descriptor, const char *plugin_uri,
free(handle);
return NULL;
}
+#endif
handle->ctx = nvgCreate(NVG_ANTIALIAS | NVG_STENCIL_STROKES | NVG_DEBUG);
if(!handle->ctx)
diff --git a/meson.build b/meson.build
index 48291f6..b6c4e43 100644
--- a/meson.build
+++ b/meson.build
@@ -53,6 +53,7 @@ c_args = ['-fvisibility=hidden',
if host_machine.system() == 'windows'
add_languages('cpp')
+ add_project_arguments('-DGLEW_STATIC', language : 'c')
conf_data.set('UI_TYPE', 'WindowsUI')
ui_deps += cc.find_library('opengl32')
ui_deps += cc.find_library('gdi32')