diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fe6542ccb..9e3937f8f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -141,6 +141,8 @@ jobs: repository: bkaradzic/bx path: bx - uses: mymindstorm/setup-emsdk@v14 + with: + version: 5.0.2 - uses: browser-actions/setup-chrome@v1 - name: Build run: | diff --git a/include/bx/platform.h b/include/bx/platform.h index 4e55401b6..72a36228d 100644 --- a/include/bx/platform.h +++ b/include/bx/platform.h @@ -205,7 +205,7 @@ #elif defined(__EMSCRIPTEN__) # include # undef BX_PLATFORM_EMSCRIPTEN -# define BX_PLATFORM_EMSCRIPTEN (__EMSCRIPTEN_major__ * 10000 + __EMSCRIPTEN_minor__ * 100 + __EMSCRIPTEN_tiny__) +# define BX_PLATFORM_EMSCRIPTEN (__EMSCRIPTEN_MAJOR__ * 10000 + __EMSCRIPTEN_MINOR__ * 100 + __EMSCRIPTEN_TINY__) #elif defined(__ORBIS__) # undef BX_PLATFORM_PS4 # define BX_PLATFORM_PS4 1 @@ -354,9 +354,9 @@ # define BX_PLATFORM_NAME "BSD" #elif BX_PLATFORM_EMSCRIPTEN # define BX_PLATFORM_NAME "Emscripten " \ - BX_STRINGIZE(__EMSCRIPTEN_major__) "." \ - BX_STRINGIZE(__EMSCRIPTEN_minor__) "." \ - BX_STRINGIZE(__EMSCRIPTEN_tiny__) + BX_STRINGIZE(__EMSCRIPTEN_MAJOR__) "." \ + BX_STRINGIZE(__EMSCRIPTEN_MINOR__) "." \ + BX_STRINGIZE(__EMSCRIPTEN_TINY__) #elif BX_PLATFORM_HAIKU # define BX_PLATFORM_NAME "Haiku" #elif BX_PLATFORM_HURD