From 551fea7ed79e46e16f7a7c3b8dc80201b884e879 Mon Sep 17 00:00:00 2001 From: Sam Hocevar <sam@hocevar.net> Date: Thu, 4 Apr 2013 00:41:15 +0000 Subject: [PATCH] build: use GLES (not GL) when using emscripten, and disable SdlInput too. --- src/lolgl.h | 5 +++++ src/platform/sdl/sdlapp.cpp | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/lolgl.h b/src/lolgl.h index c4e410f8..1878a64d 100644 --- a/src/lolgl.h +++ b/src/lolgl.h @@ -18,6 +18,11 @@ #define GL_GLEXT_PROTOTYPES +/* Prefer GLES on browsers */ +#if defined EMSCRIPTEN +# undef HAVE_GL_2X +#endif + /* Only define one GL platform */ #if defined HAVE_GL_2X # undef HAVE_GLES_2X diff --git a/src/platform/sdl/sdlapp.cpp b/src/platform/sdl/sdlapp.cpp index 267926b2..658069fd 100644 --- a/src/platform/sdl/sdlapp.cpp +++ b/src/platform/sdl/sdlapp.cpp @@ -100,7 +100,10 @@ SdlApp::SdlApp(char const *title, ivec2 res, float fps) : * advertised with the proper number of axes. */ new D3d9Input(); # endif + +# if !defined EMSCRIPTEN new SdlInput(); +# endif #endif }