diff --git a/1k/manifest.ps1 b/1k/manifest.ps1 index 501d0b2f8cda..989145df855e 100644 --- a/1k/manifest.ps1 +++ b/1k/manifest.ps1 @@ -12,7 +12,7 @@ if ($Global:is_axmol_app -or $Global:is_axmol_engine) { $manifest['nuget'] = '5.5.1' # since 5.6.0, require .net 4.0 $manifest['glslcc'] = '1.9.5+' $manifest['cmake'] = '3.29.3+' - $manifest['emsdk'] = '3.1.61+' + $manifest['emsdk'] = '3.1.63+' $manifest['jdk'] = '17.0.10+' } diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c205ef1d574..1d8cdbcbd7ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -64,7 +64,7 @@ - gradle: 8.7 ==> 8.8 - AGP: 8.2.2 ==> 8.4.0 -- emsdk: 3.1.59 ==> 3.1.61 +- emsdk: 3.1.59 ==> 3.1.63 ### 3rdparty Updates diff --git a/core/platform/GLViewImpl.cpp b/core/platform/GLViewImpl.cpp index ebd5cafdcb6e..dd257f1cb758 100644 --- a/core/platform/GLViewImpl.cpp +++ b/core/platform/GLViewImpl.cpp @@ -115,11 +115,11 @@ class GLFWEventHandler _view->onGLFWMouseMoveCallBack(window, x, y); } #if defined(__EMSCRIPTEN__) - static int onWebTouchCallback(int eventType, const EmscriptenTouchEvent* touchEvent, void* /*userData*/) + static EM_BOOL onWebTouchCallback(int eventType, const EmscriptenTouchEvent* touchEvent, void* /*userData*/) { if (_view) _view->onWebTouchCallback(eventType, touchEvent); - return 0; + return EM_FALSE; } #endif