aboutsummaryrefslogtreecommitdiff
path: root/src/modules.js
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2014-01-07 15:40:53 -0800
committerAlon Zakai <alonzakai@gmail.com>2014-01-07 15:40:53 -0800
commit0b3416a1dcd808fb71043a9f400f3ef2aa636abc (patch)
tree9a7ff926af193e432f5646afbcfb2c7365b17879 /src/modules.js
parent6fee37fceb9e06a805c8074aa68bf678f406ff5b (diff)
parente4e8063f6d568277b297f19d51801cd7dda9545c (diff)
Merge branch 'incoming' into llvm-3.41.8.6
Conflicts: tests/test_benchmark.py tools/shared.py
Diffstat (limited to 'src/modules.js')
-rw-r--r--src/modules.js2
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]))));
}