diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-12-21 15:54:59 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-12-21 15:54:59 -0800 |
| commit | 2f4401a79e96917f78876c3e09b8d31754a26f70 (patch) | |
| tree | 8ac45e1d7b302a9f0aaa7e9b9e74aff01965a93d /src/library_sdl.js | |
| parent | 2c8c19f60585d4e8cb78af119faba664a35e2268 (diff) | |
| parent | 160cc728e0839e441897d951fa61020bc2176717 (diff) | |
Merge branch 'incoming'
Diffstat (limited to 'src/library_sdl.js')
| -rw-r--r-- | src/library_sdl.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/library_sdl.js b/src/library_sdl.js index 0969f738..1cd99534 100644 --- a/src/library_sdl.js +++ b/src/library_sdl.js @@ -898,7 +898,7 @@ var LibrarySDL = { }, SDL_GetError: function() { - return allocate(intArrayFromString("SDL is cool"), 'i8'); + return allocate(intArrayFromString("unknown SDL-emscripten error"), 'i8'); }, SDL_CreateRGBSurface: function(flags, width, height, depth, rmask, gmask, bmask, amask) { @@ -1533,6 +1533,12 @@ var LibrarySDL = { SDL_GL_SwapBuffers: function() {}, + // TODO + + SDL_SetGamma: function(r, g, b) { + return -1; + }, + // Misc SDL_InitSubSystem: function(flags) { return 0 }, |