diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml index 0fe3849..519eed7 100644 --- a/.github/workflows/emscripten.yml +++ b/.github/workflows/emscripten.yml @@ -2,7 +2,7 @@ name: Emscripten Build on: [push, pull_request] env: - EM_VERSION: 3.1.18 + EM_VERSION: 3.1.32 EM_CACHE_FOLDER: 'emsdk-cache' jobs: @@ -22,7 +22,7 @@ jobs: key: ${{env.EM_VERSION}}-${{ runner.os }} - name: Setup Emscripten toolchain - uses: mymindstorm/setup-emsdk@v11 + uses: mymindstorm/setup-emsdk@v12 with: version: ${{ env.EM_VERSION }} actions-cache-folder: ${{env.EM_CACHE_FOLDER}} diff --git a/src/texthook.cpp b/src/texthook.cpp index e446f0f..5c3603f 100644 --- a/src/texthook.cpp +++ b/src/texthook.cpp @@ -9,17 +9,17 @@ void texthook_character(int page, int character) { character, page); } -EM_JS(void, texthook_newline, (void), { - xsystem35.texthook.newline(); -}); +void texthook_newline() { + EM_ASM(xsystem35.texthook.newline()); +} -EM_JS(void, texthook_nextpage, (void), { - xsystem35.texthook.nextpage(); -}); +void texthook_nextpage() { + EM_ASM(xsystem35.texthook.nextpage()); +} -EM_JS(void, texthook_keywait, (void), { - xsystem35.texthook.keywait(); -}); +void texthook_keywait(void) { + EM_ASM(xsystem35.texthook.keywait()); +} #elif defined(TEXTHOOK_PRINT) // -------------------------------------- diff --git a/src/texthook.h b/src/texthook.h index aba722f..4df418d 100644 --- a/src/texthook.h +++ b/src/texthook.h @@ -1,13 +1,9 @@ #ifndef _TEXTHOOK_H_ #define _TEXTHOOK_H_ -extern "C" { - void texthook_character(int page, int character); -void texthook_newline(void); -void texthook_nextpage(void); -void texthook_keywait(void); - -} +void texthook_newline(); +void texthook_nextpage(); +void texthook_keywait(); #endif /* _TEXTHOOK_H_ */