archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix Cycles OpenCL compile error on Windows.

Browse Source
This commit is contained in:
Brecht Van Lommel
2016-07-31 01:54:05 +02:00
parent 01d5d2853b
commit b2e16c5700
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
intern/cycles/util/util_path.cpp
View File

@@ -728,6 +728,17 @@ bool path_remove(const string& path)
return remove(path.c_str()) == 0; return remove(path.c_str()) == 0;
} }
static string line_directive(const string& path, int line)
{
string escaped_path = path;
string_replace(escaped_path, "\"", "\\\"");
string_replace(escaped_path, "\'", "\\\'");
string_replace(escaped_path, "\?", "\\\?");
string_replace(escaped_path, "\\", "\\\\");
return string_printf("#line %d \"%s\"", line, escaped_path.c_str());
}
string path_source_replace_includes(const string& source, const string& path) string path_source_replace_includes(const string& source, const string& path)
{ {
/* Our own little c preprocessor that replaces #includes with the file /* Our own little c preprocessor that replaces #includes with the file
@@ -759,14 +770,10 @@ string path_source_replace_includes(const string& source, const string& path)
text = path_source_replace_includes( text = path_source_replace_includes(
text, path_dirname(filepath)); text, path_dirname(filepath));
text = path_source_replace_includes(text, path); text = path_source_replace_includes(text, path);
line = token.replace(0, n_end + 1, "\n" + text + "\n"); /* Use line directives for better error messages. */
line = line_directive(filepath, 1)
/* Line directives for better error messages. */ + token.replace(0, n_end + 1, "\n" + text + "\n")
line = string_printf("#line %d \"%s\"\n", + line_directive(path, i);
(int)0, filepath.c_str())
+ line
+ string_printf("\n#line %d \"%s\"",
(int)i, path.c_str());
} }
} }
} }