use closure-exported FS API for preloading

2 files changed, 6 insertions, 8 deletions

diff --git a/emcc b/emcc
index 5e4ab4e7..859a67dc 100755
--- a/emcc
+++ b/emcc
@@ -924,7 +924,7 @@ try:
         for i in range(len(parts)):
           partial = '/'.join(parts[:i+1])
           if partial not in partial_dirs:
-            code += '''FS.createFolder('/%s', '%s', true, false);\n''' % ('/'.join(parts[:i]), parts[i])
+            code += '''Module['FS_createFolder']('/%s', '%s', true, false);\n''' % ('/'.join(parts[:i]), parts[i])
             partial_dirs.append(partial)
 
     if has_preloaded_files:
@@ -958,11 +958,9 @@ try:
       filename = file_['name']
       if file_['mode'] == 'embed':
         # Embed
-        code += '''FS.createDataFile('/', '%s', %s, true, true);\n''' % (os.path.basename(filename), str(map(ord, open(filename, 'rb').read())))
+        code += '''Module['FS_createDataFile']('/', '%s', %s, true, true);\n''' % (os.path.basename(filename), str(map(ord, open(filename, 'rb').read())))
       elif file_['mode'] == 'preload':
         # Preload
-        assert final_suffix == 'html', 'Can only preload files when generating HTML'
-
         varname = 'filePreload%d' % counter
         counter += 1
         image = filename.endswith(IMAGE_SUFFIXES)
@@ -1032,7 +1030,7 @@ try:
           var arrayBuffer = %(varname)s.response;
           assert(arrayBuffer, 'Loading file %(filename)s failed.');
           var byteArray = arrayBuffer.byteLength ? new Uint8Array(arrayBuffer) : arrayBuffer;
-          FS.createDataFile('/%(dirname)s', '%(basename)s', byteArray, true, true);
+          Module['FS_createDataFile']('/%(dirname)s', '%(basename)s', byteArray, true, true);
           %(finish)s
         };
         addRunDependency();
diff --git a/tests/runner.py b/tests/runner.py
index f8824578..c8e3de37 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -7418,11 +7418,11 @@ elif 'browser' in str(sys.argv):
       self.run_browser('page.html', '', '/report_result?1')
 
     def test_sdl_image(self):
-      # load an image file, get pixel data
+      # load an image file, get pixel data. Also O2 coverage for --preload-file
       shutil.copyfile(path_from_root('tests', 'screenshot.jpg'), os.path.join(self.get_dir(), 'screenshot.jpg'))
       open(os.path.join(self.get_dir(), 'sdl_image.c'), 'w').write(self.with_report_result(open(path_from_root('tests', 'sdl_image.c')).read()))
 
-      Popen(['python', EMCC, os.path.join(self.get_dir(), 'sdl_image.c'), '--preload-file', 'screenshot.jpg', '-o', 'page.html']).communicate()
+      Popen(['python', EMCC, os.path.join(self.get_dir(), 'sdl_image.c'), '-O2', '--preload-file', 'screenshot.jpg', '-o', 'page.html']).communicate()
       self.run_browser('page.html', '', '/report_result?600')
 
     def test_sdl_image_compressed(self):
@@ -7536,7 +7536,7 @@ elif 'browser' in str(sys.argv):
       # SDL, OpenGL, textures, immediate mode. Closure for more coverage
       shutil.copyfile(path_from_root('tests', 'screenshot.png'), os.path.join(self.get_dir(), 'screenshot.png'))
       self.reftest(path_from_root('tests', 'screenshot-gray-purple.png'))
-      Popen(['python', EMCC, path_from_root('tests', 'sdl_ogl_defaultMatrixMode.c'), '-O2', '--minify', '0', '-o', 'something.html', '--pre-js', 'reftest.js', '--preload-file', 'screenshot.png']).communicate()
+      Popen(['python', EMCC, path_from_root('tests', 'sdl_ogl_defaultMatrixMode.c'), '--minify', '0', '-o', 'something.html', '--pre-js', 'reftest.js', '--preload-file', 'screenshot.png']).communicate()
       self.run_browser('something.html', 'You should see an image with gray at the top.', '/report_result?0')
 
     def test_sdl_ogl_p(self):