@@ -45,7 +45,7 @@ cdef extern from "emscripten.h":
 
     int emscripten_get_compiler_setting(const char *name)
     void emscripten_debugger()
-    #void emscripten_log(int flags, ...)
+    void emscripten_log(int flags, ...)
     int emscripten_get_callstack(int flags, char *out, int maxbytes)
 
 cdef extern from "emscripten/html5.h":
@@ -557,10 +557,36 @@ def debugger():
 # open the JavaScript console
 # emscripten.debugger()
 
-# No variadic function support in Cython?
-# No va_arg variant for emscripten_log either.
-#def log(flags, *args):
-#    emscripten_log(flags, *args)
+def log(flags, *args):
+    # No variadic function support in Cython?
+    # No va_arg variant for emscripten_log either.
+    # Let's offer limited support
+    cdef char* format
+    cdef char* cstr
+    if len(args) == 0:
+        emscripten_log(flags)
+    elif len(args) > 0:
+        format = args[0]
+        if len(args) == 1:
+            emscripten_log(flags, format)
+        elif len(args) == 2:
+            arg = args[1]
+            if type(arg) == int:
+                emscripten_log(flags, format, <int>arg)
+            elif type(arg) == float:
+                emscripten_log(flags, format, <float>arg)
+            elif type(arg) in (str, unicode):
+                pystr = arg.encode('UTF-8')
+                cstr = pystr
+                emscripten_log(flags, format, cstr)
+            else:
+                pystr = ("emscripten.log: unsupported argument " + str(type(arg))).encode('UTF-8')
+                cstr = pystr
+                emscripten_log(flags, cstr)
+        else:
+            emscripten_log(flags, "emscripten.log: only up to 2 arguments are supported")
+# import emscripten; emscripten.log(0, "hello %02d", 1)
+# import emscripten; emscripten.log(emscripten.LOG_WARN|emscripten.LOG_CONSOLE|emscripten.LOG_C_STACK, "warning!")
 
 def get_callstack(flags):
     cdef int size = emscripten_get_callstack(flags, NULL, 0)