Content-Length: 307265 | pFad | http://github.com/zig-gamedev/zig-gamedev/pull/309/commits/d5a0cd2860fce2658e4dd8632e80a0874e7b5f7d

4B Emscripten support: wasm & webgpu in browser by Deins · Pull Request #309 · zig-gamedev/zig-gamedev · GitHub
Skip to content

Emscripten support: wasm & webgpu in browser #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from
Draft

Emscripten support: wasm & webgpu in browser #309

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5a20226
Emscripten initial implementation
Deins May 29, 2023
b63885f
Improvements
Deins May 31, 2023
b4881d4
Merge branch 'michal-z:main' into emscripten
Deins May 31, 2023
d1b7804
Emscripten: fix imgui, linker warnings. Cleanup
Deins Jun 5, 2023
b4d319e
Refactor emscripten build, add gui sample
Deins Jun 11, 2023
35af55e
Port sample instanced-pills
Deins Jun 11, 2023
a2d1ea9
Merge with main, zig 0.11.0-dev.3892+0a6cd257b
Deins Jun 30, 2023
560dac0
zig update fixes, removes zems custom bindings
Deins Jul 3, 2023
2924d8b
Merge remote-tracking branch 'fork/main' into emscripten
Deins Jul 28, 2023
c341dc7
Merge and latest emsdk a895e3d06 fixes
Deins Jul 28, 2023
f3649d7
Small readme cleanup
Deins Jul 28, 2023
e5c8e91
Minor cleanup
Deins Aug 6, 2023
d5a0cd2
Merge remote-tracking branch 'fork/main' into emscripten
Deins Aug 6, 2023
8098d3c
Merge fixes
Deins Aug 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'fork/main' into emscripten
  • Loading branch information
@Deins
Deins committed Aug 6, 2023
commit d5a0cd2860fce2658e4dd8632e80a0874e7b5f7d
14 changes: 8 additions & 6 deletions libs/zgui/build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ pub fn package(
zgui_c_cpp.disable_stack_probing = true;
}

zgui_c_cpp.addIncludePath(thisDir() ++ "/libs");
zgui_c_cpp.addIncludePath(thisDir() ++ "/libs/imgui");
zgui_c_cpp.addIncludePath(.{ .path = thisDir() ++ "/libs" });
zgui_c_cpp.addIncludePath(.{ .path = thisDir() ++ "/libs/imgui" });

if (!emscripten) {
zgui_c_cpp.linkLibC();
Expand Down Expand Up @@ -119,11 +119,13 @@ pub fn package(
const emscripten_include = b.pathJoin(&.{ emsdk_path, "upstream", "emscripten", "cache", "sysroot", "include" });
zgui_c_cpp.addSystemIncludePath(emscripten_include);
} else {
zgui_c_cpp.addIncludePath(thisDir() ++ "/../zglfw/libs/glfw/include");
zgui_c_cpp.addIncludePath(thisDir() ++ "/../zgpu/libs/dawn/include");
zgui_c_cpp.addIncludePath(.{ .path = thisDir() ++ "/../zglfw/libs/glfw/include" });
zgui_c_cpp.addIncludePath(.{ .path = thisDir() ++ "/../zgpu/libs/dawn/include" });
}
zgui_c_cpp.addCSourceFile(thisDir() ++ "/libs/imgui/backends/imgui_impl_glfw.cpp", cflags);
zgui_c_cpp.addCSourceFile(thisDir() ++ "/libs/imgui/backends/imgui_impl_wgpu.cpp", cflags);
zgui_c_cpp.addCSourceFiles(&.{
thisDir() ++ "/libs/imgui/backends/imgui_impl_glfw.cpp",
thisDir() ++ "/libs/imgui/backends/imgui_impl_wgpu.cpp",
}, cflags);
},
.win32_dx12 => {
zgui_c_cpp.addCSourceFiles(&.{
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/zig-gamedev/zig-gamedev/pull/309/commits/d5a0cd2860fce2658e4dd8632e80a0874e7b5f7d

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy