aboutsummaryrefslogtreecommitdiff
path: root/src/library_sdl.js
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-01-24 12:02:42 -0800
committerAlon Zakai <alonzakai@gmail.com>2013-01-24 12:02:42 -0800
commit64c779641a2a9587613cc65ad7251890f18e25c3 (patch)
tree87344a57db509e92b3196e5a4291a8c3bd8c2449 /src/library_sdl.js
parent4e09482e006eda934527e1707036d74245d8dd91 (diff)
parent03e2e6c321d28e3df3b37a2c0bed3ba9d04e52b3 (diff)
Merge branch 'incoming'
Diffstat (limited to 'src/library_sdl.js')
-rw-r--r--src/library_sdl.js21
1 files changed, 20 insertions, 1 deletions
diff --git a/src/library_sdl.js b/src/library_sdl.js
index b2ca338b..712ec290 100644
--- a/src/library_sdl.js
+++ b/src/library_sdl.js
@@ -1371,6 +1371,7 @@ var LibrarySDL = {
},
Mix_LoadMUS: 'Mix_LoadWAV_RW',
+ Mix_LoadMUS_RW: 'Mix_LoadWAV_RW',
Mix_FreeMusic: 'Mix_FreeChunk',
@@ -1575,7 +1576,25 @@ var LibrarySDL = {
SDL_CreateThread: function() {
throw 'SDL threads cannot be supported in the web platform because they assume shared state. See emscripten_create_worker etc. for a message-passing concurrency model that does let you run code in another thread.'
- }
+ },
+
+ SDL_WaitThread: function() { throw 'SDL_WaitThread' },
+ SDL_GetThreadID: function() { throw 'SDL_GetThreadID' },
+ SDL_ThreadID: function() { throw 'SDL_ThreadID' },
+ SDL_AllocRW: function() { throw 'SDL_AllocRW: TODO' },
+ SDL_FreeRW: function() { throw 'SDL_FreeRW: TODO' },
+ SDL_CondBroadcast: function() { throw 'SDL_CondBroadcast: TODO' },
+ SDL_CondWaitTimeout: function() { throw 'SDL_CondWaitTimeout: TODO' },
+ SDL_WM_ToggleFullScreen: function() { throw 'SDL_WM_ToggleFullScreen: TODO' },
+
+ Mix_SetPostMix: function() { throw 'Mix_SetPostMix: TODO' },
+ Mix_QuerySpec: function() { throw 'Mix_QuerySpec: TODO' },
+ Mix_FadeInChannelTimed: function() { throw 'Mix_FadeInChannelTimed' },
+ Mix_FadeOutChannel: function() { throw 'Mix_FadeOutChannel' },
+
+ Mix_Linked_Version: function() { throw 'Mix_Linked_Version: TODO' },
+ SDL_CreateRGBSurfaceFrom: function() { throw 'SDL_CreateRGBSurfaceFrom: TODO' },
+ SDL_SaveBMP_RW: function() { throw 'SDL_SaveBMP_RW: TODO' },
};
autoAddDeps(LibrarySDL, '$SDL');