Skip to content

Commit

Permalink
Update 3rd libs & emsdk
Browse files Browse the repository at this point in the history
  • Loading branch information
halx99 committed Sep 28, 2024
1 parent 62eebaa commit d033297
Show file tree
Hide file tree
Showing 32 changed files with 449 additions and 598 deletions.
4 changes: 2 additions & 2 deletions 1k/manifest.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
if ($Global:is_axmol_app -or $Global:is_axmol_engine) {
$manifest['nuget'] = '5.5.1' # since 5.6.0, requires .net 4.0
$manifest['glslcc'] = '1.9.5+'
$manifest['cmake'] = '3.29.3~3.30.2+'
$manifest['emsdk'] = '3.1.63+'
$manifest['cmake'] = '3.29.3~3.30.3+'
$manifest['emsdk'] = '3.1.66~3.1.67+'
$manifest['jdk'] = '17.0.10~17.0.12+'
$manifest['vs'] = '16.0+'
}
Expand Down
20 changes: 10 additions & 10 deletions 3rdparty/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

## c-ares
- [![Upstream](https://img.shields.io/github/v/release/c-ares/c-ares?label=Upstream)](https://github.com/c-ares/c-ares)
- Version: 1.33.0
- Version: 1.33.1
- License: MIT

## Chipmunk2D
Expand All @@ -47,7 +47,7 @@

## curl
- [![Upstream](https://img.shields.io/github/v/release/curl/curl?label=Upstream)](https://github.com/curl/curl)
- Version: 8.9.1
- Version: 8.10.1
- License: Curl (MIT/X)

## doctest
Expand Down Expand Up @@ -77,7 +77,7 @@

## Glad
- [![Upstream](https://img.shields.io/github/v/tag/Dav1dde/glad?label=Upstream)](https://github.com/Dav1dde/glad)
- Version: 2.0.6
- Version: 2.0.7
- License: MIT

## glfw
Expand All @@ -97,7 +97,7 @@

## jpeg-turbo
- [![Upstream](https://img.shields.io/github/v/release/libjpeg-turbo/libjpeg-turbo?label=Upstream)](https://github.com/libjpeg-turbo/libjpeg-turbo)
- Version: 3.0.3
- Version: 3.0.4
- License: BSD-style (IJG,BSD-3-Clause,zlib)

## kcp
Expand All @@ -123,7 +123,7 @@

- luajit
- Upstream: https://github.com/LuaJIT/LuaJIT
- Version: 2.1-04dca79
- Version: 2.1-87ae18a
- License: MIT

- tolua
Expand Down Expand Up @@ -179,12 +179,12 @@

## OpenSSL
- [![Upstream](https://img.shields.io/github/v/tag/openssl/openssl?label=Upstream)](https://github.com/openssl/openssl)
- Version: 3.3.1
- Version: 3.0.15
- License: Apache-2.0

## png
- [![Upstream](https://img.shields.io/github/v/tag/glennrp/libpng?label=Upstream)](https://github.com/glennrp/libpng)
- Version: 1.6.43
- Version: 1.6.44
- License: PNG Reference Library License version 2

## poly2tri
Expand All @@ -201,7 +201,7 @@

## rapidjson
- [![Upstream](https://img.shields.io/github/v/tag/Tencent/rapidjson?label=Upstream)](https://github.com/Tencent/rapidjson)
- Version: 1.1.0-b4a6da3
- Version: 1.1.0-815e6e7 (until Sep 24, 2024)
- License: MIT

## recast
Expand All @@ -218,7 +218,7 @@

## simdjson
- [![Upstream](https://img.shields.io/github/v/tag/simdjson/simdjson?label=Upstream)](https://github.com/simdjson/simdjson)
- Version: 3.10.0
- Version: 3.10.1
- License: Apache-2.0

## stb (stb_image)
Expand Down Expand Up @@ -253,7 +253,7 @@

## yasio
- [![Upstream](https://img.shields.io/github/v/release/yasio/yasio?label=Upstream)](https://github.com/yasio/yasio)
- Version: 4.2.4
- Version: 4.3.1
- License: MIT WITH Anti-996

## zlib
Expand Down
12 changes: 8 additions & 4 deletions 3rdparty/glad/include/glad/gl.h

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions 3rdparty/glad/src/gl.c
Original file line number Diff line number Diff line change
Expand Up @@ -871,6 +871,7 @@ int GLAD_GL_QCOM_texture_foveated_subsampled_layout = 0;
int GLAD_GL_QCOM_texture_lod_bias = 0;
int GLAD_GL_QCOM_tiled_rendering = 0;
int GLAD_GL_QCOM_writeonly_rendering = 0;
int GLAD_GL_QCOM_ycbcr_degamma = 0;
int GLAD_GL_VIV_shader_binary = 0;


Expand Down Expand Up @@ -10812,6 +10813,7 @@ static int glad_gl_find_extensions_gles2(void) {
GLAD_GL_QCOM_texture_lod_bias = glad_gl_has_extension(exts, exts_i, "GL_QCOM_texture_lod_bias");
GLAD_GL_QCOM_tiled_rendering = glad_gl_has_extension(exts, exts_i, "GL_QCOM_tiled_rendering");
GLAD_GL_QCOM_writeonly_rendering = glad_gl_has_extension(exts, exts_i, "GL_QCOM_writeonly_rendering");
GLAD_GL_QCOM_ycbcr_degamma = glad_gl_has_extension(exts, exts_i, "GL_QCOM_ycbcr_degamma");
GLAD_GL_VIV_shader_binary = glad_gl_has_extension(exts, exts_i, "GL_VIV_shader_binary");

glad_gl_free_extensions(exts_i);
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/png/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
README for libpng version 1.6.43
README for libpng version 1.6.44
================================

See the note about version numbers near the top of `png.h`.
Expand Down
Loading

0 comments on commit d033297

Please sign in to comment.