diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-12-21 20:43:10 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-12-21 20:43:10 -0800 |
| commit | 8aa6919b7acf0b4034735ac7ee597e946fefaf4d (patch) | |
| tree | 3ba77ead655e88db79243d4e00abcc73df5d3402 /src/library_sdl.js | |
| parent | 06bfe6541d88fda62a6b531e16250c63d85dcfe6 (diff) | |
| parent | 160cc728e0839e441897d951fa61020bc2176717 (diff) | |
merge 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 cd27648a..f8d252fb 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) { @@ -1537,6 +1537,12 @@ var LibrarySDL = { SDL_GL_SwapBuffers: function() {}, + // TODO + + SDL_SetGamma: function(r, g, b) { + return -1; + }, + // Misc SDL_InitSubSystem: function(flags) { return 0 }, |