Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-01-31 09:50:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More work to fix AppVeyor

Browse Source
This commit is contained in:
Jacob Dufault 2018-01-03 18:32:15 -08:00
parent f5f3887dd3
commit 31c7fddf3d
3 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/platform_win.cc
View File

@ -135,15 +135,7 @@ std::vector<std::string> GetPlatformClangArguments() {
// clang-format off // clang-format off
return { return {
"-isystem","C:/Program Files/Microsoft Visual Studio 10.0/VC/include", "-fms-extensions", "-fms-compatibility", "-fdelayed-template-parsing"
"-isystem","C:/Program Files/Microsoft Visual Studio 9.0/VC/include",
"-isystem","C:/Program Files/Microsoft Visual Studio 9.0/VC/PlatformSDK/Include",
"-isystem","C:/Program Files/Microsoft Visual Studio 8/VC/include",
"-isystem","C:/Program Files/Microsoft Visual Studio 8/VC/PlatformSDK/Include",
"-isystem","C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.10.25017/include",
"-isystem","C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
"-isystem","C:/Program Files/LLVM/lib/clang/5.0.1/include",
"-fms-extensions", "-fms-compatibility", "-fms-compatibility-version=18", "-fdelayed-template-parsing"
}; };
// clang-format on // clang-format on
} }

1
src/test.cc
View File

@ -196,6 +196,7 @@ void RunIndexTests(const std::string& filter_path) {
// Get output from index operation. // Get output from index operation.
IndexFile* db = FindDbForPathEnding(expected_path, dbs); IndexFile* db = FindDbForPathEnding(expected_path, dbs);
assert(db);
if (!db->diagnostics_.empty()) { if (!db->diagnostics_.empty()) {
std::cout << "For " << path << std::endl; std::cout << "For " << path << std::endl;
for (const lsDiagnostic& diagnostic : db->diagnostics_) { for (const lsDiagnostic& diagnostic : db->diagnostics_) {

6
src/utils.cc
View File

@ -508,11 +508,7 @@ std::string GetDefaultResourceDirectory() {
result = resource_directory; result = resource_directory;
} }
result = NormalizePath(result); return NormalizePath(result);
#if defined(_WIN32)
std::replace(result.begin(), result.end(), '/', '\\');
#endif
return result;
} }
std::string UpdateToRnNewlines(std::string output) { std::string UpdateToRnNewlines(std::string output) {