diff options
Diffstat (limited to 'src/actions/make/make_solution.c')
| -rw-r--r-- | src/actions/make/make_solution.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/actions/make/make_solution.c b/src/actions/make/make_solution.c index 2516453..111ec8d 100644 --- a/src/actions/make/make_solution.c +++ b/src/actions/make/make_solution.c @@ -64,7 +64,7 @@ int make_solution_all_rule(Session sess, Solution sln, Stream strm) assert(strm); prj_names = make_get_project_names(sln); - z = stream_writeline_strings(strm, prj_names, "all:", " ", "", ""); + z = stream_writeline_strings(strm, prj_names, "all:", " ", "", "", "", make_write_escaped); z |= stream_writeline(strm, ""); strings_destroy(prj_names); return z; @@ -137,7 +137,7 @@ int make_solution_phony_rule(Session sess, Solution sln, Stream strm) assert(strm); prj_names = make_get_project_names(sln); - z = stream_writeline_strings(strm, prj_names, ".PHONY: all clean", " ", "", ""); + z = stream_writeline_strings(strm, prj_names, ".PHONY: all clean", " ", "", "", "", make_write_escaped); z |= stream_writeline(strm, ""); strings_destroy(prj_names); return z; @@ -159,7 +159,7 @@ const char* make_solution_project_rule(Session sess, Solution sln, Project prj) /* project file paths are specified relative to the solution */ const char* sln_path = path_directory(solution_get_filename(sln, NULL, NULL)); - const char* prj_file = make_get_project_makefile(sess, prj); + const char* prj_file = make_get_project_makefile(sess, prj); const char* prj_file_dir = path_directory(prj_file); const char* prj_file_name = path_filename(prj_file); prj_file_dir = path_relative(sln_path, prj_file_dir); @@ -168,12 +168,12 @@ const char* make_solution_project_rule(Session sess, Solution sln, Project prj) if (!cstr_eq(".", prj_file_dir)) { strcat(buffer, " --no-print-directory -C "); - strcat(buffer, prj_file_dir); + strcat(buffer, make_escape(prj_file_dir)); } if (!cstr_eq("Makefile", prj_file_name)) { strcat(buffer, " -f "); - strcat(buffer, prj_file_name); + strcat(buffer, make_escape(prj_file_name)); } return buffer; @@ -202,7 +202,7 @@ int make_solution_projects(Session sess, Solution sln, Stream strm) const char* prj_name = project_get_name(prj); const char* rule = make_solution_project_rule(sess, sln, prj); - z |= stream_writeline(strm, "%s:", prj_name); + z |= stream_writeline(strm, "%s:", make_escape(prj_name)); z |= stream_writeline(strm, "\t@echo ==== Building %s ====", prj_name); z |= stream_writeline(strm, rule); z |= stream_writeline(strm, ""); @@ -244,7 +244,7 @@ int make_solution_signature(Session sess, Solution sln, Stream strm) z |= stream_writeline(strm, "# Where {config_name} is one of:"); config_names = solution_get_configs(sln); - z |= stream_writeline_strings(strm, config_names, "# ", " ", "", ","); + z |= stream_writeline_strings(strm, config_names, "# ", " ", "", ",", "", NULL); z |= stream_writeline(strm, ""); return z; |