On 20 March 2017 at 10:20, Gerd Hoffmann <kra...@redhat.com> wrote:
> Use "unsigned int" instead of GLenum and GLuint, so we don't depend on
> these types from opengl headers. Drop all CONFIG_OPENGL #ifdefs from
> console.h
>
> Reported-by: Peter Maydell <peter.mayd...@linaro.org>
> Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
> diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h
> index aaf226c..1e8d07b 100644
> --- a/include/ui/sdl2.h
> +++ b/include/ui/sdl2.h
> @@ -7,6 +7,10 @@
> #include <SDL.h>
> #include <SDL_syswm.h>
>
> +#ifdef CONFIG_OPENGL
> +# include <epoxy/gl.h>
> +#endif
> +
> struct sdl2_console {
> DisplayChangeListener dcl;
> DisplaySurface *surface;
ui/sdl2.h is included by ui/sdl2.c, ui/sdl2-2d.c, ui/sdl2-gl.c and
ui/sdl2-input.c, but none of those are compiled with OPENGL_CFLAGS
so this won't work if epoxy/gl.h isn't on the default include path,
I think.
thanks
-- PMM
