diff options
| author | ToadKing <toadking@toadking.com> | 2013-08-12 23:30:49 -0400 |
|---|---|---|
| committer | ToadKing <toadking@toadking.com> | 2013-08-12 23:30:49 -0400 |
| commit | 7466223864929d50d02407dde1da331133a0bef1 (patch) | |
| tree | 60403b8061880e6aea503a20d9c45b3e678ec6ad /src/modules.js | |
| parent | c2b064eb49ea63eec59add5751c8a9c2b80dab92 (diff) | |
| parent | 3090cdd713609a9d3f749d13002a898e03cbd5e3 (diff) | |
Merge branch 'incoming' of https://github.com/kripken/emscripten into fixed_openal_buffers
Conflicts:
src/library_openal.js
Diffstat (limited to 'src/modules.js')
| -rw-r--r-- | src/modules.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules.js b/src/modules.js index edfbae5c..13561777 100644 --- a/src/modules.js +++ b/src/modules.js @@ -424,7 +424,7 @@ var LibraryManager = { load: function() { if (this.library) return; - var libraries = ['library.js', 'library_path.js', 'library_browser.js', 'library_sdl.js', 'library_gl.js', 'library_glut.js', 'library_xlib.js', 'library_egl.js', 'library_gc.js', 'library_jansson.js', 'library_openal.js', 'library_glfw.js'].concat(additionalLibraries); + var libraries = ['library.js', 'library_path.js', 'library_fs.js', 'library_memfs.js', 'library_sockfs.js', 'library_tty.js', 'library_browser.js', 'library_sdl.js', 'library_gl.js', 'library_glut.js', 'library_xlib.js', 'library_egl.js', 'library_gc.js', 'library_jansson.js', 'library_openal.js', 'library_glfw.js'].concat(additionalLibraries); for (var i = 0; i < libraries.length; i++) { eval(processMacros(preprocess(read(libraries[i])))); } |