~hp/nk_pugl

9679b58fb2c6d819346658409306121c6552026a — Hanspeter Portner 1 year, 5 months ago f1fd7fe
Silence clang warnings
3 files changed, 11 insertions(+), 4 deletions(-)

M meson.build
M meson_options.txt
M nk_pugl/nk_pugl.h
M meson.build => meson.build +6 -0
@@ 44,6 44,11 @@ lib_srcs = [
	join_paths('pugl', 'src', 'implementation.c')
]

c_args = [
  '-Wno-unknown-warning-option',
  '-Wno-null-pointer-subtraction'
]

if host_machine.system() == 'windows'
	deps += cc.find_library('opengl32')
	deps += cc.find_library('gdi32')


@@ 79,6 84,7 @@ cousine_regular_ttf = configure_file(

if build_examples
	executable('nk_pugl.gl', [bin_srcs],
    c_args : c_args,
		include_directories : inc_dir,
		dependencies: nk_pugl_gl,
		install : false)

M meson_options.txt => meson_options.txt +1 -1
@@ 10,4 10,4 @@ option('build-examples',
	value : false,
	yield : true)

option('version', type : 'string', value : '0.1.183')
option('version', type : 'string', value : '0.1.189')

M nk_pugl/nk_pugl.h => nk_pugl/nk_pugl.h +4 -3
@@ 170,7 170,7 @@ NK_PUGL_API const char *
nk_pugl_paste_from_clipboard(nk_pugl_window_t *win, size_t *len);

NK_PUGL_API float
nk_pugl_get_scale();
nk_pugl_get_scale(void);

#ifdef __cplusplus
}


@@ 199,6 199,7 @@ extern C {
#define NK_IMPLEMENTATION
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#include "nuklear/nuklear.h"
#pragma GCC diagnostic pop



@@ 417,7 418,7 @@ _nk_pugl_render_gl2(nk_pugl_window_t *win)
}

static void
_nk_pugl_glew_init()
_nk_pugl_glew_init(void)
{
#if defined(__APPLE__)
//FIXME


@@ 1308,7 1309,7 @@ nk_pugl_paste_from_clipboard(nk_pugl_window_t *win, size_t *len)
}

NK_PUGL_API float
nk_pugl_get_scale()
nk_pugl_get_scale(void)
{
	const char *NK_SCALE = getenv("NK_SCALE");
	const float scale = NK_SCALE ? atof(NK_SCALE) : 1.f;