Skip to content

Commit

Permalink
Update emsdk to 3.1.63
Browse files Browse the repository at this point in the history
  • Loading branch information
halx99 committed Jul 15, 2024
1 parent 28013e9 commit d8343ea
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion 1k/manifest.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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+'
}

Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions core/platform/GLViewImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit d8343ea

Please sign in to comment.