diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-04-03 20:26:45 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-04-03 20:26:45 -0700 |
| commit | e2bdb34948cf09c85de75d4f283c0dbe02227f9b (patch) | |
| tree | f94ffb5880f8650eb758121f614b0eb9c10748b5 | |
| parent | be9eba1fcf197178816d3d70a8e875ad979a6e8c (diff) | |
| parent | 8d73ecdc51a72a50c082b15914f3d8c1a1b66791 (diff) | |
merge fixes
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | src/library_glut.js | 1 | ||||
| -rw-r--r-- | tools/shared.py | 8 |
3 files changed, 8 insertions, 3 deletions
@@ -18,3 +18,5 @@ under the licensing terms detailed in LICENSE. * Nathan Hammond <emscripten@nathanhammond.com> * Behdad Esfahbod <behdad@behdad.org> * David Benjamin <davidben@mit.edu> +* Pierre Renaux <pierre@talansoft.com> + diff --git a/src/library_glut.js b/src/library_glut.js index 0569c9e8..e9329d02 100644 --- a/src/library_glut.js +++ b/src/library_glut.js @@ -271,6 +271,7 @@ var LibraryGLUT = { #else Module.print('(USE_TYPED_ARRAYS needs to be enabled for WebGL)'); #endif + return 1; }, glutInitDisplayMode: function(mode) {}, diff --git a/tools/shared.py b/tools/shared.py index 17887afe..6fa4444e 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -277,7 +277,7 @@ def read_pgo_data(filename): ''' signs_lines = [] overflows_lines = [] - + for line in open(filename, 'r'): try: if line.rstrip() == '': continue @@ -740,7 +740,9 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)''' % { 'winfix': '' if not WINDOWS e # Something like this (adjust memory as needed): # java -Xmx1024m -jar CLOSURE_COMPILER --compilation_level ADVANCED_OPTIMIZATIONS --variable_map_output_file src.cpp.o.js.vars --js src.cpp.o.js --js_output_file src.cpp.o.cc.js - args = ['java', '-jar', CLOSURE_COMPILER, + args = ['java', + '-Xmx1024m', + '-jar', CLOSURE_COMPILER, '--compilation_level', 'ADVANCED_OPTIMIZATIONS', '--formatting', 'PRETTY_PRINT', #'--variable_map_output_file', filename + '.vars', @@ -799,7 +801,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)''' % { 'winfix': '' if not WINDOWS e elif ord(b[0]) == 222 and ord(b[1]) == 192 and ord(b[2]) == 23 and ord(b[3]) == 11: b = open(filename, 'r').read(24) return b[20] == 'B' and b[21] == 'C' - + return False # Permanent cache for dlmalloc and stdlibc++ |