adrien/raylib-zig
1
0
Fork 0
mirror of https://github.com/Not-Nik/raylib-zig.git synced 2025-09-09 03:57:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

emcc: Remove webhack_c (#149)

Browse Source 
I am unsure what the point of this file is, so maybe I should not be
removing it. But the comment says to try removing it to see if things
work fine, and things work fine on my machine when I remove it.

I tested 3 or 4 of the builtin examples using commands like this:
zig build raw_stream -Dtarget=wasm32-emscripten --sysroot ~/.emscripten_cache/sysroot

(see also #134; my sysroot setup is a bit weird. but I don't think
that would affect this at all)
This commit is contained in:
pancelor 2024-09-28 05:56:36 -07:00 committed by GitHub
parent 6418a87091
commit c94e68d872
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
emcc.zig
View File

@ -41,24 +41,13 @@ pub fn compileForEmscripten(
// the make function of the step. However it might also be a bad idea since // the make function of the step. However it might also be a bad idea since
// it messes with the build system itself. // it messes with the build system itself.
//const new_target = updateTargetForWeb(target);
// The project is built as a library and linked later. // The project is built as a library and linked later.
const exe_lib = b.addStaticLibrary(.{ return b.addStaticLibrary(.{
.name = name, .name = name,
.root_source_file = b.path(root_source_file), .root_source_file = b.path(root_source_file),
.target = target, .target = target,
.optimize = optimize, .optimize = optimize,
}); });
// There are some symbols that need to be defined in C.
const webhack_c_file_step = b.addWriteFiles();
const webhack_c_file = webhack_c_file_step.add("webhack.c", webhack_c);
exe_lib.addCSourceFile(.{ .file = webhack_c_file, .flags = &[_][]u8{} });
// Since it's creating a static library, the symbols raylib uses to webgl
// and glfw don't need to be linked by emscripten yet.
exe_lib.step.dependOn(&webhack_c_file_step.step);
return exe_lib;
} }
// Links a set of items together using emscripten. // Links a set of items together using emscripten.
@ -127,17 +116,3 @@ fn lastIndexOf(string: []const u8, character: u8) usize {
} }
return string.len - 1; return string.len - 1;
} }
const webhack_c =
\\// Zig adds '__stack_chk_guard', '__stack_chk_fail', and 'errno',
\\// which emscripten doesn't actually support.
\\// Seems that zig ignores disabling stack checking,
\\// and I honestly don't know why emscripten doesn't have errno.
\\// TODO: when the updateTargetForWeb workaround gets removed, see if those are nessesary anymore
\\#include <stdint.h>
\\uintptr_t __stack_chk_guard;
\\//I'm not certain if this means buffer overflows won't be detected,
\\// However, zig is pretty safe from those, so don't worry about it too much.
\\void __stack_chk_fail(void){}
\\int errno;
;