Mercurial > repos > blastem
changeset 1496:b82a44729d7c nuklear_ui
Fix GL include issue for 32-bit builds
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Thu, 07 Dec 2017 18:57:38 -0800 |
parents | e9e1910eb2f5 |
children | 224725e8a3a8 |
files | nuklear_ui/blastem_nuklear.h nuklear_ui/nuklear_sdl_gles2.h |
diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/nuklear_ui/blastem_nuklear.h Thu Dec 07 18:57:18 2017 -0800 +++ b/nuklear_ui/blastem_nuklear.h Thu Dec 07 18:57:38 2017 -0800 @@ -7,7 +7,6 @@ #define NK_INCLUDE_DEFAULT_ALLOCATOR #define NK_INCLUDE_VERTEX_BUFFER_OUTPUT #define NK_INCLUDE_FONT_BAKING -#include <SDL_opengl.h> #include "nuklear.h" #include "nuklear_sdl_gles2.h"
--- a/nuklear_ui/nuklear_sdl_gles2.h Thu Dec 07 18:57:18 2017 -0800 +++ b/nuklear_ui/nuklear_sdl_gles2.h Thu Dec 07 18:57:38 2017 -0800 @@ -15,8 +15,10 @@ #ifndef NK_SDL_GLES2_H_ #define NK_SDL_GLES2_H_ -#include <SDL2/SDL.h> -#include <SDL2/SDL_opengles2.h> +#include <SDL.h> +#ifndef DISABLE_OPENGL +#include <GL/glew.h> +#endif NK_API struct nk_context* nk_sdl_init(SDL_Window *win);