From a40a8b9fb99a6a14b1e8a4e2df4674b85a512d3c Mon Sep 17 00:00:00 2001 From: Jae B Date: Mon, 19 Feb 2024 19:48:59 +1100 Subject: [PATCH 1/3] add SAFE_HEAP=1 and STACK_OVERFLOW_CHECK=1 --- build.zig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.zig b/build.zig index 3c5bbd3..2b41a9d 100644 --- a/build.zig +++ b/build.zig @@ -301,6 +301,8 @@ pub fn emLinkStep(b: *Build, options: EmLinkOptions) !*Build.Step.Run { try emcc_cmd.append(emcc_path); if (options.optimize == .Debug) { try emcc_cmd.append("-Og"); + try emcc_cmd.append("-sSAFE_HEAP=1"); + try emcc_cmd.append("-sSTACK_OVERFLOW_CHECK=1"); } else { try emcc_cmd.append("-sASSERTIONS=0"); if (options.optimize == .ReleaseSmall) { From e77e89a2067fafa3505fb3056b0ce9bfa3b52943 Mon Sep 17 00:00:00 2001 From: GH Action Date: Wed, 21 Feb 2024 16:17:33 +0000 Subject: [PATCH 2/3] updated (https://github.com/floooh/sokol/commit/c43c6f8c4c1bb7b268b5ab8e7cb366709a7e72e0) --- src/sokol/c/sokol_gfx.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/sokol/c/sokol_gfx.h b/src/sokol/c/sokol_gfx.h index 73103e6..cec6af4 100644 --- a/src/sokol/c/sokol_gfx.h +++ b/src/sokol/c/sokol_gfx.h @@ -6540,8 +6540,13 @@ _SOKOL_PRIVATE void _sg_dummy_update_image(_sg_image_t* img, const sg_image_data // optional GL loader for win32 #if defined(_SOKOL_USE_WIN32_GL_LOADER) +#ifndef SG_GL_FUNCS_EXT +#define SG_GL_FUNCS_EXT +#endif + // X Macro list of GL function names and signatures #define _SG_GL_FUNCS \ + SG_GL_FUNCS_EXT \ _SG_XMACRO(glBindVertexArray, void, (GLuint array)) \ _SG_XMACRO(glFramebufferTextureLayer, void, (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)) \ _SG_XMACRO(glGenFramebuffers, void, (GLsizei n, GLuint * framebuffers)) \ From beb0a21f17a0a8c10d226c1fd22fb876158698a8 Mon Sep 17 00:00:00 2001 From: Andre Weissflog Date: Thu, 22 Feb 2024 17:33:16 +0100 Subject: [PATCH 3/3] update emsdk dependency to 3.1.54 --- build.zig.zon | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.zig.zon b/build.zig.zon index deacf66..693d32d 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -11,8 +11,8 @@ }, .dependencies = .{ .emsdk = .{ - .url = "git+https://github.com/emscripten-core/emsdk#0bbae74935d57ff41739648c12cf90b56668398f", - .hash = "1220f1340cd871b444021c600661f921f96091ce0815fa43008528f4844cece7e245", + .url = "git+https://github.com/emscripten-core/emsdk#c18280c8f3f8f088b4337f0f6a5fdb2be0d67179", + .hash = "12203d61e8947f25993a86b4d73e2d91b4c1d96f1aa07c581b7dffba7cb5ca91bc35", }, }, }