From a8a343420b7131b1da920d5bd2d751acaaaf0c6a Mon Sep 17 00:00:00 2001 From: Jacob Dufault Date: Mon, 27 Mar 2017 18:04:37 -0700 Subject: [PATCH] misc-linux-fixes --- src/command_line.cc | 1 + src/message_queue.cc | 1 + src/platform_linux.cc | 2 +- wscript | 6 +++++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/command_line.cc b/src/command_line.cc index 9a0e9304..cfe3f314 100644 --- a/src/command_line.cc +++ b/src/command_line.cc @@ -332,6 +332,7 @@ void QueryDbMainLoop( std::string path = msg->project_path; project->entries = LoadCompilationEntriesFromDirectory(path); + std::cerr << "Loaded compilation entries (" << project->entries.size() << " files)" << std::endl; for (int i = 0; i < project->entries.size(); ++i) { const CompilationEntry& entry = project->entries[i]; std::string filepath = entry.filename; diff --git a/src/message_queue.cc b/src/message_queue.cc index 0fe09f91..9db91a24 100644 --- a/src/message_queue.cc +++ b/src/message_queue.cc @@ -1,6 +1,7 @@ #include "message_queue.h" #include +#include #include #include #include diff --git a/src/platform_linux.cc b/src/platform_linux.cc index efe0defc..c9f4588e 100644 --- a/src/platform_linux.cc +++ b/src/platform_linux.cc @@ -93,7 +93,7 @@ struct PlatformSharedMemoryLinux : public PlatformSharedMemory { PROT_READ | PROT_WRITE, MAP_SHARED, fd_, 0 /*offset*/)); capacity = size; - std::cout << "Open shared memory name=" << name << ", fd=" << fd_ + std::cerr << "Open shared memory name=" << name << ", fd=" << fd_ << ", shared=" << data << ", capacity=" << capacity << std::endl; } diff --git a/wscript b/wscript index 5b483a7c..d86d4ae5 100644 --- a/wscript +++ b/wscript @@ -89,7 +89,11 @@ def build(bld): bld.program( source=cc_files, cxxflags=['-std=c++11', '-Wall'], - includes=['third_party/rapidjson/include', CLANG_INCLUDE_DIR], + includes=[ + 'third_party/', + 'third_party/doctest/', + 'third_party/rapidjson/include', + CLANG_INCLUDE_DIR], lib=['clang', 'rt', 'pthread'], libpath=[CLANG_LIB_DIR], rpath=[CLANG_LIB_DIR],