aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Blanc <guillaumeblanc.sc@gmail.com>2014-06-04 13:46:13 +0200
committerGuillaume Blanc <guillaumeblanc.sc@gmail.com>2014-06-04 13:46:13 +0200
commit32a90388114947983c3ec0c6eef1ef82f1fe47f1 (patch)
treef0cc970e6ddfef65c6801e755b97c9df47986b4b
parentfd9e8330eafcdb9112753ed6729954605f357280 (diff)
Fixes glfwGetProcAddress calls that were causing a ReferenceError exception, trying to call unexisting function _getProcAddress.
-rw-r--r--src/deps_info.json1
-rw-r--r--src/library_glfw.js4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/deps_info.json b/src/deps_info.json
index 029a20e1..e0983064 100644
--- a/src/deps_info.json
+++ b/src/deps_info.json
@@ -3,6 +3,7 @@
"SDL_Init": ["malloc", "free"],
"SDL_GL_GetProcAddress": ["emscripten_GetProcAddress"],
"eglGetProcAddress": ["emscripten_GetProcAddress"],
+ "glfwGetProcAddress": ["emscripten_GetProcAddress"],
"emscripten_GetProcAddress": ["strstr"]
}
diff --git a/src/library_glfw.js b/src/library_glfw.js
index 0b3fccd4..98adee34 100644
--- a/src/library_glfw.js
+++ b/src/library_glfw.js
@@ -507,9 +507,9 @@ var LibraryGLFW = {
return Module.ctx.getSupportedExtensions().indexOf(Pointer_stringify(extension)) > -1;
},
- glfwGetProcAddress__deps: ['glfwGetProcAddress'],
+ glfwGetProcAddress__deps: ['emscripten_GetProcAddress'],
glfwGetProcAddress: function(procname) {
- return _getProcAddress(procname);
+ return _emscripten_GetProcAddress(procname);
},
glfwGetGLVersion: function(major, minor, rev) {