aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2018-05-15 22:00:28 +0200
committerGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2018-05-15 22:00:28 +0200
commit3f45f14bad8d7ffa976a0263164ecd9b3bae623b (patch)
treebbdd2ba974922161b83bce66d1a005c855f7b536
parent976b5fe3d55e5e2a41c01685beb0629aaf97d2bc (diff)
parent3d1bee455e1c29f1c99b1b9b4bc7c359d0e599b3 (diff)
downloadnuk.lv2-3f45f14bad8d7ffa976a0263164ecd9b3bae623b.zip
nuk.lv2-3f45f14bad8d7ffa976a0263164ecd9b3bae623b.tar.gz
nuk.lv2-3f45f14bad8d7ffa976a0263164ecd9b3bae623b.tar.bz2
nuk.lv2-3f45f14bad8d7ffa976a0263164ecd9b3bae623b.tar.xz
Merge commit '3d1bee455e1c29f1c99b1b9b4bc7c359d0e599b3'
-rw-r--r--nk_pugl/nk_pugl.h18
1 files changed, 12 insertions, 6 deletions
diff --git a/nk_pugl/nk_pugl.h b/nk_pugl/nk_pugl.h
index c5a740d..a84d7e8 100644
--- a/nk_pugl/nk_pugl.h
+++ b/nk_pugl/nk_pugl.h
@@ -195,11 +195,14 @@ extern C {
#define NK_COS cosf
#define NK_SQRT sqrtf
-# define NK_IMPLEMENTATION
-# include "nuklear/nuklear.h"
+#define NK_IMPLEMENTATION
+#include "nuklear/nuklear.h"
-# define STB_IMAGE_IMPLEMENTATION
-# include "nuklear/example/stb_image.h"
+#define STB_IMAGE_IMPLEMENTATION
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#include "nuklear/example/stb_image.h"
+#pragma GCC diagnostic pop
typedef struct _nk_pugl_vertex_t nk_pugl_vertex_t;
@@ -440,6 +443,11 @@ _nk_pugl_font_init(nk_pugl_window_t *win)
if(ttf)
nk_style_set_font(&win->ctx, &ttf->handle);
+
+ // to please compiler
+ (void)nk_cos;
+ (void)nk_sin;
+ (void)nk_sqrt;
}
static void
@@ -1197,8 +1205,6 @@ nk_pugl_process_events(nk_pugl_window_t *win)
if(!win->view)
return 1; // quit
- struct nk_context *ctx = &win->ctx;
-
PuglStatus stat = puglProcessEvents(win->view);
(void)stat;