aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/library_sdl.js7
-rw-r--r--system/include/libcxx/ostream5
2 files changed, 9 insertions, 3 deletions
diff --git a/src/library_sdl.js b/src/library_sdl.js
index 5ca049fe..acc14fb9 100644
--- a/src/library_sdl.js
+++ b/src/library_sdl.js
@@ -463,6 +463,9 @@ mergeInto(LibraryManager.library, {
return r + (g << 8) + (b << 16);
},
+ SDL_WM_GrabInput: function() {},
+ SDL_ShowCursor: function() {},
+
// SDL_Image
IMG_Load: function(filename) {
@@ -551,5 +554,9 @@ mergeInto(LibraryManager.library, {
//SDL_CreateYUVOverlay
//SDL_CreateThread, SDL_WaitThread etc
+
+ // SDL Mixer
+
+ Mix_OpenAudio: function() { return -1 },
});
diff --git a/system/include/libcxx/ostream b/system/include/libcxx/ostream
index c70f3c15..dd28e686 100644
--- a/system/include/libcxx/ostream
+++ b/system/include/libcxx/ostream
@@ -1285,10 +1285,9 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, const bitset<_Size>& __x)
(use_facet<ctype<_CharT> >(__os.getloc()).widen('0'),
use_facet<ctype<_CharT> >(__os.getloc()).widen('1'));
}
-
-extern template class basic_ostream<char>;
-extern template class basic_ostream<wchar_t>;
*/
+//extern template class basic_ostream<char>; /* XXX EMScripten */
+//extern template class basic_ostream<wchar_t>; /* XXX EMScripten */
_LIBCPP_END_NAMESPACE_STD