diff options
| author | Robert Bragg <robert.bragg@intel.com> | 2014-06-13 21:21:00 +0100 |
|---|---|---|
| committer | Robert Bragg <robert.bragg@intel.com> | 2014-06-13 21:21:00 +0100 |
| commit | fea7666b55e1739a80b04a5b95fc166ddafea445 (patch) | |
| tree | 7f199589d6993ac042a6afa015e589b190d6d33c | |
| parent | df37bfe4bcd74d1f20a8b9eb86c02de1718b8f2b (diff) | |
| download | cogl-wip/rig.tar.gz | |
emscripten: rely on emcc's EMSCRIPTEN definewip/rig
Instead of having our own USING_EMSCRIPTEN define, we now just rely on
emcc's EMSCRIPTEN define.
| -rw-r--r-- | cogl/cogl-renderer.c | 2 | ||||
| -rw-r--r-- | cogl/winsys/cogl-winsys-sdl.c | 4 | ||||
| -rw-r--r-- | configure.ac | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/cogl/cogl-renderer.c b/cogl/cogl-renderer.c index 0e4bda9e..152dafe0 100644 --- a/cogl/cogl-renderer.c +++ b/cogl/cogl-renderer.c @@ -151,7 +151,7 @@ static CoglDriverDescription _cogl_drivers[] = COGL_GLES2_LIBNAME, }, #endif -#ifdef USING_EMSCRIPTEN +#ifdef EMSCRIPTEN { COGL_DRIVER_WEBGL, "webgl", diff --git a/cogl/winsys/cogl-winsys-sdl.c b/cogl/winsys/cogl-winsys-sdl.c index f6233c7f..f4fb8471 100644 --- a/cogl/winsys/cogl-winsys-sdl.c +++ b/cogl/winsys/cogl-winsys-sdl.c @@ -95,7 +95,7 @@ static CoglBool _cogl_winsys_renderer_connect (CoglRenderer *renderer, CoglError **error) { -#ifdef USING_EMSCRIPTEN +#ifdef EMSCRIPTEN if (renderer->driver != COGL_DRIVER_GLES2) { _cogl_set_error (error, COGL_WINSYS_ERROR, @@ -190,7 +190,7 @@ _cogl_winsys_display_setup (CoglDisplay *display, SDL_GL_SetAttribute (SDL_GL_CONTEXT_MINOR_VERSION, 0); break; -#elif defined (USING_EMSCRIPTEN) +#elif defined (EMSCRIPTEN) case COGL_DRIVER_GLES2: sdl_display->video_mode_flags = SDL_OPENGL; break; diff --git a/configure.ac b/configure.ac index 406c07ba..eca2ab74 100644 --- a/configure.ac +++ b/configure.ac @@ -304,7 +304,6 @@ AS_IF([test "x$enable_emscripten" = "xyes"], enable_sdl=yes enable_gles2=yes enable_gl=no - AC_DEFINE([USING_EMSCRIPTEN], 1, [Cogl is being compiled with emscripten]) COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EMSCRIPTEN_SUPPORT" ] ) |