Merge pull request #95 from Metadorius/fix/windows-path-2-the-electric-boogaloo

SanderMertens · web-flow · commit 245706cd97cf · 2023-04-12T14:41:24.000-07:00
Add %VAR% handling, add space before /I for clarity
diff --git a/drivers/lang/c/src/msvc/driver.c b/drivers/lang/c/src/msvc/driver.c
@@ -174,10 +174,10 @@ void compile_src(
             bake_attr *include = ut_iter_next(&it);
             char* file = include->is.string;
 
-            if (file[0] == '/' || file[0] == '$' || file[0] == '\\' || (file[0] != 0 && file[1] == ':')) {
-                ut_strbuf_append(&cmd, " /I%s", file);
+            if (file[0] == '/' || file[0] == '$' || file[0] == '%' || file[0] == '\\' || (file[0] != 0 && file[1] == ':')) {
+                ut_strbuf_append(&cmd, " /I %s", file);
             } else {
-                ut_strbuf_append(&cmd, " /I%s\\%s", project->path, file);
+                ut_strbuf_append(&cmd, " /I %s\\%s", project->path, file);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -174,10 +174,10 @@ void compile_src(`
`174`	`174`	`bake_attr *include = ut_iter_next(&it);`
`175`	`175`	`char* file = include->is.string;`
`176`	`176`
`177`		`- if (file[0] == '/' \|\| file[0] == '$' \|\| file[0] == '\\' \|\| (file[0] != 0 && file[1] == ':')) {`
`178`		`- ut_strbuf_append(&cmd, " /I%s", file);`
	`177`	`+ if (file[0] == '/' \|\| file[0] == '$' \|\| file[0] == '%' \|\| file[0] == '\\' \|\| (file[0] != 0 && file[1] == ':')) {`
	`178`	`+ ut_strbuf_append(&cmd, " /I %s", file);`
`179`	`179`	`} else {`
`180`		`- ut_strbuf_append(&cmd, " /I%s\\%s", project->path, file);`
	`180`	`+ ut_strbuf_append(&cmd, " /I %s\\%s", project->path, file);`
`181`	`181`	`}`
`182`	`182`	`}`
`183`	`183`	`}`