some fixes

kassane · Jan 21, 2024 · 4b24405 · 4b24405
1 parent 6d8ecce
commit 4b24405
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/build.zig b/build.zig
@@ -429,12 +429,6 @@ pub fn ldcBuildStep(b: *Build, options: DCompileStep) !*RunStep {
             try cmds.append("-link-defaultlib-shared");
         }
 
-        // C include path
-        for (lib_sokol.root_module.include_dirs.items) |include_dir| {
-            const path = include_dir.path_system.getPath(b);
-            try cmds.append(b.fmt("-P-I{s}", .{path}));
-        }
-
         // library paths
         for (lib_sokol.root_module.lib_paths.items) |libpath| {
             if (libpath.path.len > 0) // skip empty paths

diff --git a/src/sokol/imgui.d b/src/sokol/imgui.d
@@ -3,8 +3,7 @@
 module sokol.imgui;
 
 import core.stdc.stdint;
-import core.stdc.stdio;
-import core.stdc.stdarg;
+import core.stdc.stdarg : va_list;
 import sapp = sokol.app;
 import sg = sokol.gfx;
 
@@ -1493,7 +1492,16 @@ struct StbTexteditRow
     int num_chars;
 }
 
-alias ImFileHandle = _IO_FILE*;
+static if({
+	version(WebAssembly) return false;
+	else version(WASI) return false;
+	else return true;
+}){
+	import core.stdc.stdio: FILE;
+	alias ImFileHandle = FILE*;
+}else{
+	alias ImFileHandle = void*;
+}
 
 struct ImVec1
 {