diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-01-07 10:49:15 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-01-07 10:49:15 -0800 |
| commit | f034e3928783ff7a6491833f358c51cfb082b197 (patch) | |
| tree | b4291ba96c0017aa17c7dce56f16fa1f5a62447a /src/modules.js | |
| parent | 6344b5c8d41ee9489ad51b40f9b0bee770b1a22f (diff) | |
| parent | a4b3e03260b90e288925cc1dfd9d4d591bc7741c (diff) | |
Merge branch 'add-libuuid' of github.com:fadams/emscripten into incoming
Conflicts:
tools/shared.py
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 e2d3433f..c0b98f6f 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_fs.js', 'library_idbfs.js', 'library_memfs.js', 'library_nodefs.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); + var libraries = ['library.js', 'library_path.js', 'library_fs.js', 'library_idbfs.js', 'library_memfs.js', 'library_nodefs.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', 'library_uuid.js'].concat(additionalLibraries); for (var i = 0; i < libraries.length; i++) { eval(processMacros(preprocess(read(libraries[i])))); } |