Commit f7553c9b authored by Hanspeter Portner's avatar Hanspeter Portner

Merge commit 'f00c0f51' into meson

parents a52b05bb f00c0f51
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment