diff --git a/AutoSave/AutoSave.project b/AutoSave/AutoSave.project
index ca18eea279..fe1214e729 100644
--- a/AutoSave/AutoSave.project
+++ b/AutoSave/AutoSave.project
@@ -31,11 +31,6 @@
-
-
-
-
-
@@ -231,4 +226,9 @@
+
+
+
+
+
diff --git a/CMakePlugin/CMakePlugin.project b/CMakePlugin/CMakePlugin.project
index 58e8c32e7f..52f830a2c6 100644
--- a/CMakePlugin/CMakePlugin.project
+++ b/CMakePlugin/CMakePlugin.project
@@ -93,10 +93,6 @@
-
-
-
-
@@ -338,4 +334,8 @@
+
+
+
+
diff --git a/CallGraph/CallGraph.project b/CallGraph/CallGraph.project
index fb445a48c8..ea560b5964 100644
--- a/CallGraph/CallGraph.project
+++ b/CallGraph/CallGraph.project
@@ -59,11 +59,6 @@
-
-
-
-
-
@@ -366,4 +361,9 @@
+
+
+
+
+
diff --git a/CodeCompletionsTests/CCTest/CCTest.project b/CodeCompletionsTests/CCTest/CCTest.project
index 48c864597c..90e910bafc 100644
--- a/CodeCompletionsTests/CCTest/CCTest.project
+++ b/CodeCompletionsTests/CCTest/CCTest.project
@@ -61,6 +61,7 @@
+
@@ -103,13 +104,6 @@
-
-
-
-
-
-
-
@@ -361,4 +355,11 @@ PATH=../../$(WorkspacePath)/build-$(WorkspaceConfiguration)/lib;$(WXWIN)/lib/gcc
+
+
+
+
+
+
+
diff --git a/CodeCompletionsTests/SampleWorkspace/SampleWorksapce.project b/CodeCompletionsTests/SampleWorkspace/SampleWorksapce.project
index 1554ce6e91..d317bf3c2c 100644
--- a/CodeCompletionsTests/SampleWorkspace/SampleWorksapce.project
+++ b/CodeCompletionsTests/SampleWorkspace/SampleWorksapce.project
@@ -31,8 +31,6 @@
-
-
@@ -129,4 +127,6 @@ $BOOST_HOME
+
+
diff --git a/CodeFormatter/CodeFormatter.project b/CodeFormatter/CodeFormatter.project
index 616a81c61d..4e5293a433 100644
--- a/CodeFormatter/CodeFormatter.project
+++ b/CodeFormatter/CodeFormatter.project
@@ -94,10 +94,6 @@
-
-
-
-
@@ -330,4 +326,8 @@
+
+
+
+
diff --git a/CodeLite/CodeLite.project b/CodeLite/CodeLite.project
index 9e57d28afc..ba78466076 100644
--- a/CodeLite/CodeLite.project
+++ b/CodeLite/CodeLite.project
@@ -509,17 +509,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -813,4 +802,15 @@ PhpLexer.cpp: PhpLexer.l
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CodeLite/winprocess_impl.cpp b/CodeLite/winprocess_impl.cpp
index 6704c7de55..3adfc91748 100644
--- a/CodeLite/winprocess_impl.cpp
+++ b/CodeLite/winprocess_impl.cpp
@@ -24,16 +24,17 @@
//////////////////////////////////////////////////////////////////////////////
#ifdef __WXMSW__
+#include "winprocess_impl.h"
#include "file_logger.h"
#include "fileutils.h"
#include "processreaderthread.h"
#include "procutils.h"
#include "smart_ptr.h"
-#include "winprocess_impl.h"
#include
#include
#include
#include
+#include
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
@@ -560,28 +561,29 @@ void WinProcessImpl::StartReaderThread()
bool WinProcessImpl::DoReadFromPipe(HANDLE pipe, wxString& buff)
{
- DWORD dwRead;
+ DWORD dwRead = 0;
DWORD dwMode;
DWORD dwTimeout;
// Make the pipe to non-blocking mode
dwMode = PIPE_READMODE_BYTE | PIPE_NOWAIT;
- dwTimeout = 1000;
+ dwTimeout = 100;
SetNamedPipeHandleState(pipe, &dwMode, NULL, &dwTimeout);
bool read_something = false;
while(true) {
- BOOL bRes = ReadFile(pipe, m_buffer, sizeof(m_buffer) - 1, &dwRead, NULL);
- if(bRes) {
+ BOOL bRes = ReadFile(pipe, m_buffer, BUFFER_SIZE - 1, &dwRead, NULL);
+ if(bRes && (dwRead > 0)) {
wxString tmpBuff;
+ tmpBuff.reserve(dwRead * 2); // make enough room for the conversion
// Success read
- m_buffer[dwRead / sizeof(char)] = 0;
- tmpBuff = wxString(m_buffer, wxConvUTF8);
+ tmpBuff = wxString(m_buffer, wxConvUTF8, dwRead);
if(tmpBuff.IsEmpty() && dwRead > 0) {
// conversion failed
- tmpBuff = wxString::From8BitData(m_buffer);
+ tmpBuff = wxString::From8BitData(m_buffer, dwRead);
}
- buff << tmpBuff;
+ buff.reserve(buff.size() + tmpBuff.size() + 1);
+ buff.Append(tmpBuff);
read_something = true;
continue;
}
diff --git a/CodeLite/winprocess_impl.h b/CodeLite/winprocess_impl.h
index 6fad22ecd6..86aba37ed7 100644
--- a/CodeLite/winprocess_impl.h
+++ b/CodeLite/winprocess_impl.h
@@ -37,9 +37,11 @@
class ProcessReaderThread;
class WinWriterThread;
+#define BUFFER_SIZE 16 * 1024
+
class WXDLLIMPEXP_CL WinProcessImpl : public IProcess
{
- char m_buffer[65537];
+ char m_buffer[BUFFER_SIZE];
WinWriterThread* m_writerThread = nullptr;
std::unordered_set m_initialChildren;
diff --git a/CodeLiteDiff/CodeLiteDiff.project b/CodeLiteDiff/CodeLiteDiff.project
index 99acd33331..9ae0aaa8ee 100644
--- a/CodeLiteDiff/CodeLiteDiff.project
+++ b/CodeLiteDiff/CodeLiteDiff.project
@@ -66,11 +66,6 @@
-
-
-
-
-
@@ -375,4 +370,9 @@
+
+
+
+
+
diff --git a/CodeLiteIDE.workspace b/CodeLiteIDE.workspace
index 1233572426..dd113aa7e5 100644
--- a/CodeLiteIDE.workspace
+++ b/CodeLiteIDE.workspace
@@ -93,7 +93,6 @@
-
@@ -168,7 +167,6 @@ WXCFG=gcc_dll\mswu
-
@@ -244,7 +242,6 @@ WXCFG=gcc_dll\mswu
-
@@ -319,7 +316,6 @@ WXCFG=gcc_dll\mswu
-
@@ -395,7 +391,6 @@ WXCFG=gcc_dll\mswu
-
@@ -471,7 +466,6 @@ WXCFG=gcc_dll\mswu
-
@@ -547,7 +541,6 @@ WXCFG=gcc_x64_dll/mswu
-
@@ -624,7 +617,6 @@ WXCFG=gcc_x64_dll/mswu
-
@@ -699,7 +691,6 @@ WXCFG=gcc_x64_dll/mswu
-
@@ -774,7 +765,6 @@ WXCFG=gcc_x64_dll/mswu
-
@@ -849,7 +839,6 @@ WXCFG=gcc_x64_dll/mswu
-
@@ -924,7 +913,6 @@ WXCFG=gcc_x64_dll/mswu
-
diff --git a/ContinuousBuild/ContinuousBuild.project b/ContinuousBuild/ContinuousBuild.project
index 3e7a255dc4..6554d326f5 100644
--- a/ContinuousBuild/ContinuousBuild.project
+++ b/ContinuousBuild/ContinuousBuild.project
@@ -68,10 +68,6 @@
-
-
-
-
@@ -317,4 +313,8 @@
+
+
+
+
diff --git a/Copyright/Copyright.project b/Copyright/Copyright.project
index 3b3b2eebf5..6c5c61c9da 100644
--- a/Copyright/Copyright.project
+++ b/Copyright/Copyright.project
@@ -52,10 +52,6 @@
-
-
-
-
@@ -301,4 +297,8 @@
+
+
+
+
diff --git a/CxxParserTests/CxxParserTests.project b/CxxParserTests/CxxParserTests.project
index 8fd593526a..da97df9707 100644
--- a/CxxParserTests/CxxParserTests.project
+++ b/CxxParserTests/CxxParserTests.project
@@ -14,13 +14,6 @@
-
-
-
-
-
-
-
@@ -166,4 +159,11 @@ CODELITE_DIR=C:\src\codelite]]>
+
+
+
+
+
+
+
diff --git a/DatabaseExplorer/DatabaseExplorer.project b/DatabaseExplorer/DatabaseExplorer.project
index aafd91b667..760c7dda01 100644
--- a/DatabaseExplorer/DatabaseExplorer.project
+++ b/DatabaseExplorer/DatabaseExplorer.project
@@ -125,11 +125,6 @@
-
-
-
-
-
@@ -446,4 +441,9 @@
+
+
+
+
+
diff --git a/Debugger/DebuggerGDB.project b/Debugger/DebuggerGDB.project
index 0622c4afc3..7000f90509 100644
--- a/Debugger/DebuggerGDB.project
+++ b/Debugger/DebuggerGDB.project
@@ -51,10 +51,6 @@
-
-
-
-
@@ -299,4 +295,8 @@
+
+
+
+
diff --git a/Debugger/debuggergdb.cpp b/Debugger/debuggergdb.cpp
index fce6001386..c275648e1c 100644
--- a/Debugger/debuggergdb.cpp
+++ b/Debugger/debuggergdb.cpp
@@ -22,11 +22,11 @@
//
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
+#include "debuggergdb.h"
#include "asyncprocess.h"
#include "cl_command_event.h"
#include "codelite_events.h"
#include "dbgcmd.h"
-#include "debuggergdb.h"
#include "debuggerobserver.h"
#include "dirkeeper.h"
#include "environmentconfig.h"
@@ -1310,7 +1310,6 @@ void DbgGdb::OnDataRead(clProcessEvent& e)
{
// Data arrived from the debugger
const wxString& bufferRead = e.GetOutput();
-
if(!m_gdbProcess || !m_gdbProcess->IsAlive())
return;
@@ -1333,6 +1332,7 @@ void DbgGdb::OnDataRead(clProcessEvent& e)
}
// make sure we have enough memory for the new lines
+
m_gdbOutputArr.reserve(m_gdbOutputArr.size() + lines.size());
for(size_t i = 0; i < lines.GetCount(); ++i) {
wxString& line = lines.Item(i);
diff --git a/Docker/Docker.project b/Docker/Docker.project
index be8fc3aa6b..bbb6174dad 100644
--- a/Docker/Docker.project
+++ b/Docker/Docker.project
@@ -55,9 +55,6 @@
-
-
-
@@ -253,4 +250,7 @@
+
+
+
diff --git a/EOSWiki/EOSWiki.project b/EOSWiki/EOSWiki.project
index 9bee751112..3e780e8822 100644
--- a/EOSWiki/EOSWiki.project
+++ b/EOSWiki/EOSWiki.project
@@ -29,9 +29,6 @@
-
-
-
@@ -227,4 +224,7 @@
+
+
+
diff --git a/EditorConfigPlugin/EditorConfigPlugin.project b/EditorConfigPlugin/EditorConfigPlugin.project
index e2f946971c..387f623cda 100644
--- a/EditorConfigPlugin/EditorConfigPlugin.project
+++ b/EditorConfigPlugin/EditorConfigPlugin.project
@@ -31,9 +31,6 @@
-
-
-
@@ -229,4 +226,7 @@
+
+
+
diff --git a/ExternalTools/ExternalTools.project b/ExternalTools/ExternalTools.project
index d278985bdc..f33da58ee0 100644
--- a/ExternalTools/ExternalTools.project
+++ b/ExternalTools/ExternalTools.project
@@ -62,10 +62,6 @@
-
-
-
-
@@ -309,4 +305,8 @@
+
+
+
+
diff --git a/Gizmos/Gizmos.project b/Gizmos/Gizmos.project
index 4978f22949..4e53ff0028 100644
--- a/Gizmos/Gizmos.project
+++ b/Gizmos/Gizmos.project
@@ -70,10 +70,6 @@
-
-
-
-
@@ -317,4 +313,8 @@
+
+
+
+
diff --git a/HelpPlugin/HelpPlugin.project b/HelpPlugin/HelpPlugin.project
index ef0f348730..a7e47b3889 100644
--- a/HelpPlugin/HelpPlugin.project
+++ b/HelpPlugin/HelpPlugin.project
@@ -61,9 +61,6 @@
-
-
-
@@ -259,4 +256,7 @@
+
+
+
diff --git a/Interfaces/Interfaces.project b/Interfaces/Interfaces.project
index 477ff1e90a..3eb02973fe 100644
--- a/Interfaces/Interfaces.project
+++ b/Interfaces/Interfaces.project
@@ -37,8 +37,6 @@
-
-
@@ -183,5 +181,7 @@
+
+
diff --git a/LLDBDebugger/LLDBDebugger.project b/LLDBDebugger/LLDBDebugger.project
index 851cdb0589..2716561095 100644
--- a/LLDBDebugger/LLDBDebugger.project
+++ b/LLDBDebugger/LLDBDebugger.project
@@ -87,15 +87,6 @@
-
-
-
-
-
-
-
-
-
@@ -409,4 +400,13 @@
+
+
+
+
+
+
+
+
+
diff --git a/LLDBDebugger/LLDBProtocol/LLDBProtocol.project b/LLDBDebugger/LLDBProtocol/LLDBProtocol.project
index dc5a32cfdc..f6c0ddbfbf 100644
--- a/LLDBDebugger/LLDBProtocol/LLDBProtocol.project
+++ b/LLDBDebugger/LLDBProtocol/LLDBProtocol.project
@@ -69,9 +69,6 @@
-
-
-
@@ -241,4 +238,7 @@
+
+
+
diff --git a/LanguageServer/LanguageServer.project b/LanguageServer/LanguageServer.project
index 774ddf9707..58e73de515 100644
--- a/LanguageServer/LanguageServer.project
+++ b/LanguageServer/LanguageServer.project
@@ -57,9 +57,6 @@
-
-
-
@@ -249,4 +246,7 @@
+
+
+
diff --git a/LiteEditor/CodeLiteIDE.project b/LiteEditor/CodeLiteIDE.project
index 34a25a043b..10fad5c811 100644
--- a/LiteEditor/CodeLiteIDE.project
+++ b/LiteEditor/CodeLiteIDE.project
@@ -975,386 +975,40 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1374,69 +1028,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2151,8 +1742,7 @@ resources.cpp: resources.xrc
resources.cpp
resources.cpp: resources.xrc
- wxrc /c /v /o resources.cpp resources.xrc
-
+ wxrc /c /v /o resources.cpp resources.xrc
@@ -2222,7 +1812,7 @@ resources.cpp: resources.xrc
../sdk/clang/include
-
+
@@ -2271,7 +1861,8 @@ resources.cpp: resources.xrc
resources.cpp
resources.cpp: resources.xrc
- wxrc /c /v /o resources.cpp resources.xrc
+ wxrc /c /v /o resources.cpp resources.xrc
+
@@ -2399,4 +1990,411 @@ resources.cpp: resources.xrc
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/MemCheck/MemCheck.project b/MemCheck/MemCheck.project
index 9f49d10ee7..5faad01df2 100644
--- a/MemCheck/MemCheck.project
+++ b/MemCheck/MemCheck.project
@@ -107,11 +107,6 @@
-
-
-
-
-
@@ -408,4 +403,9 @@
+
+
+
+
+
diff --git a/Outline/Outline.project b/Outline/Outline.project
index 7979e4c63d..a9128209fa 100644
--- a/Outline/Outline.project
+++ b/Outline/Outline.project
@@ -56,10 +56,6 @@
-
-
-
-
@@ -305,4 +301,8 @@
+
+
+
+
diff --git a/PCH/PCH.project b/PCH/PCH.project
index 401cd66a96..5401bcef8f 100644
--- a/PCH/PCH.project
+++ b/PCH/PCH.project
@@ -44,13 +44,6 @@
-
-
-
-
-
-
-
@@ -357,4 +350,11 @@
+
+
+
+
+
+
+
diff --git a/PHPLint/PHPLint.project b/PHPLint/PHPLint.project
index 4fd9f59f27..ecb4c621a8 100644
--- a/PHPLint/PHPLint.project
+++ b/PHPLint/PHPLint.project
@@ -25,9 +25,6 @@
-
-
-
@@ -223,4 +220,7 @@
+
+
+
diff --git a/PHPRefactoring/PHPRefactoring.project b/PHPRefactoring/PHPRefactoring.project
index c550f3b4c2..e0462fbef7 100644
--- a/PHPRefactoring/PHPRefactoring.project
+++ b/PHPRefactoring/PHPRefactoring.project
@@ -27,9 +27,6 @@
-
-
-
@@ -218,4 +215,7 @@
+
+
+
diff --git a/Plugin/plugin_sdk.project b/Plugin/plugin_sdk.project
index 0a0a1303d1..82c6748571 100644
--- a/Plugin/plugin_sdk.project
+++ b/Plugin/plugin_sdk.project
@@ -879,18 +879,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1203,4 +1191,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/QmakePlugin/QMakePlugin.project b/QmakePlugin/QMakePlugin.project
index 06168d01e5..2775858ea6 100644
--- a/QmakePlugin/QMakePlugin.project
+++ b/QmakePlugin/QMakePlugin.project
@@ -83,10 +83,6 @@
-
-
-
-
@@ -332,4 +328,8 @@
+
+
+
+
diff --git a/Remoty/Remoty.project b/Remoty/Remoty.project
index 3897223c36..d00979002e 100644
--- a/Remoty/Remoty.project
+++ b/Remoty/Remoty.project
@@ -46,11 +46,6 @@
-
-
-
-
-
@@ -361,4 +356,9 @@
+
+
+
+
+
diff --git a/Rust/Rust.project b/Rust/Rust.project
index 089cd3201a..8a2e031fbd 100644
--- a/Rust/Rust.project
+++ b/Rust/Rust.project
@@ -36,11 +36,6 @@
-
-
-
-
-
@@ -351,4 +346,9 @@
+
+
+
+
+
diff --git a/SFTP/SFTP.project b/SFTP/SFTP.project
index f5ae8bedbc..7ada6ccbb6 100644
--- a/SFTP/SFTP.project
+++ b/SFTP/SFTP.project
@@ -70,11 +70,6 @@
-
-
-
-
-
@@ -386,4 +381,9 @@
+
+
+
+
+
diff --git a/SmartCompletion/SmartCompletion.project b/SmartCompletion/SmartCompletion.project
index 14afe2cb2c..1b9fe91e6d 100644
--- a/SmartCompletion/SmartCompletion.project
+++ b/SmartCompletion/SmartCompletion.project
@@ -24,9 +24,6 @@
-
-
-
@@ -222,4 +219,7 @@
+
+
+
diff --git a/SnipWiz/snipwiz.project b/SnipWiz/snipwiz.project
index fff74f7621..501664218c 100644
--- a/SnipWiz/snipwiz.project
+++ b/SnipWiz/snipwiz.project
@@ -60,10 +60,6 @@
-
-
-
-
@@ -309,4 +305,8 @@
+
+
+
+
diff --git a/SpellChecker/SpellCheck.project b/SpellChecker/SpellCheck.project
index bee93fda8c..31220e7e02 100644
--- a/SpellChecker/SpellCheck.project
+++ b/SpellChecker/SpellCheck.project
@@ -78,15 +78,6 @@
-
-
-
-
-
-
-
-
-
@@ -395,4 +386,13 @@
+
+
+
+
+
+
+
+
+
diff --git a/Subversion2/Subversion2.project b/Subversion2/Subversion2.project
index 23cb5aa918..78b92df41c 100644
--- a/Subversion2/Subversion2.project
+++ b/Subversion2/Subversion2.project
@@ -118,10 +118,6 @@
-
-
-
-
@@ -362,4 +358,8 @@
+
+
+
+
diff --git a/Tail/Tail.project b/Tail/Tail.project
index 28fc2e0c55..aa1e48b7bb 100644
--- a/Tail/Tail.project
+++ b/Tail/Tail.project
@@ -25,9 +25,6 @@
-
-
-
@@ -223,4 +220,7 @@
+
+
+
diff --git a/TestDir/makedir.project b/TestDir/makedir.project
index 5768d78ebe..fab1c7818e 100644
--- a/TestDir/makedir.project
+++ b/TestDir/makedir.project
@@ -21,11 +21,6 @@
-
-
-
-
-
@@ -237,4 +232,9 @@
+
+
+
+
+
diff --git a/Tweaks/Tweaks.project b/Tweaks/Tweaks.project
index 755a606ac7..171da0eea2 100644
--- a/Tweaks/Tweaks.project
+++ b/Tweaks/Tweaks.project
@@ -41,11 +41,6 @@
-
-
-
-
-
@@ -355,4 +350,9 @@
+
+
+
+
+
diff --git a/UnitTestCPP/UnitTestPP.project b/UnitTestCPP/UnitTestPP.project
index c76b9826d2..a23577910e 100644
--- a/UnitTestCPP/UnitTestPP.project
+++ b/UnitTestCPP/UnitTestPP.project
@@ -68,10 +68,6 @@
-
-
-
-
@@ -317,4 +313,8 @@
+
+
+
+
diff --git a/WebTools/WebTools.project b/WebTools/WebTools.project
index 7776122694..b0db272e67 100644
--- a/WebTools/WebTools.project
+++ b/WebTools/WebTools.project
@@ -172,10 +172,6 @@
-
-
-
-
@@ -406,4 +402,8 @@
+
+
+
+
diff --git a/WordCompletion/WordCompletion.project b/WordCompletion/WordCompletion.project
index 43c3c05b1a..890a328d40 100644
--- a/WordCompletion/WordCompletion.project
+++ b/WordCompletion/WordCompletion.project
@@ -63,11 +63,6 @@
-
-
-
-
-
@@ -377,4 +372,9 @@
+
+
+
+
+
diff --git a/ZoomNavigator/ZoomNavigator.project b/ZoomNavigator/ZoomNavigator.project
index 19686a9db7..883cc84a1d 100755
--- a/ZoomNavigator/ZoomNavigator.project
+++ b/ZoomNavigator/ZoomNavigator.project
@@ -41,11 +41,6 @@
-
-
-
-
-
@@ -355,4 +350,9 @@
+
+
+
+
+
diff --git a/abbreviation/abbreviation.project b/abbreviation/abbreviation.project
index 41073a47d5..925b39ab17 100644
--- a/abbreviation/abbreviation.project
+++ b/abbreviation/abbreviation.project
@@ -54,12 +54,6 @@
-
-
-
-
-
-
@@ -294,4 +288,10 @@
+
+
+
+
+
+
diff --git a/codelite_echo/codelite_echo.project b/codelite_echo/codelite_echo.project
index b0b5bc3220..34f0b2d1b3 100644
--- a/codelite_echo/codelite_echo.project
+++ b/codelite_echo/codelite_echo.project
@@ -37,9 +37,6 @@
-
-
-
@@ -214,4 +211,8 @@
+
+
+
+
diff --git a/codelite_launcher/codelite_launcher.project b/codelite_launcher/codelite_launcher.project
index 52a3c94359..5c18c36028 100644
--- a/codelite_launcher/codelite_launcher.project
+++ b/codelite_launcher/codelite_launcher.project
@@ -21,10 +21,6 @@
-
-
-
-
@@ -198,4 +194,8 @@
+
+
+
+
diff --git a/codelite_make/codelite_make.project b/codelite_make/codelite_make.project
index aed70c0344..6aef360532 100644
--- a/codelite_make/codelite_make.project
+++ b/codelite_make/codelite_make.project
@@ -32,11 +32,6 @@
-
-
-
-
-
@@ -290,4 +285,9 @@
+
+
+
+
+
diff --git a/codelite_terminal/codelite_terminal.project b/codelite_terminal/codelite_terminal.project
index 6602870f24..9baad2f948 100644
--- a/codelite_terminal/codelite_terminal.project
+++ b/codelite_terminal/codelite_terminal.project
@@ -71,12 +71,6 @@
-
-
-
-
-
-
@@ -422,4 +416,11 @@ PATH=/home/eran/devl/wxWidgets/build-release-gtk3/:$PATH]]>
+
+
+
+
+
+
+
diff --git a/codelite_vim/codelite_vim.project b/codelite_vim/codelite_vim.project
index 4ea4d7b4a2..b4cf182d03 100644
--- a/codelite_vim/codelite_vim.project
+++ b/codelite_vim/codelite_vim.project
@@ -46,11 +46,6 @@
-
-
-
-
-
@@ -239,4 +234,9 @@
+
+
+
+
+
diff --git a/codelitegcc/codelitegcc.project b/codelitegcc/codelitegcc.project
index 2cf3a35b7c..e1b9197f02 100644
--- a/codelitegcc/codelitegcc.project
+++ b/codelitegcc/codelitegcc.project
@@ -41,10 +41,6 @@
-
-
-
-
@@ -221,4 +217,8 @@
+
+
+
+
diff --git a/codelitephp/PHPParser/PHPParser.project b/codelitephp/PHPParser/PHPParser.project
index 129ad0e682..5712970a27 100644
--- a/codelitephp/PHPParser/PHPParser.project
+++ b/codelitephp/PHPParser/PHPParser.project
@@ -103,13 +103,6 @@
-
-
-
-
-
-
-
@@ -398,4 +391,11 @@ php_expr_lexer.cpp: php_expr.l
+
+
+
+
+
+
+
diff --git a/codelitephp/PHPParserUnitTests/PHPParserUnitTests.project b/codelitephp/PHPParserUnitTests/PHPParserUnitTests.project
index b8a3eefbb3..3099d599b5 100644
--- a/codelitephp/PHPParserUnitTests/PHPParserUnitTests.project
+++ b/codelitephp/PHPParserUnitTests/PHPParserUnitTests.project
@@ -104,18 +104,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -377,4 +365,16 @@ PATH=C:\src\codelite\lib\gcc_lib;$WXWIN\lib\gcc_dll;$PATH]]>
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/codelitephp/php-plugin/PHPPlugin.project b/codelitephp/php-plugin/PHPPlugin.project
index 91d09224ff..216c134800 100644
--- a/codelitephp/php-plugin/PHPPlugin.project
+++ b/codelitephp/php-plugin/PHPPlugin.project
@@ -197,23 +197,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -552,4 +535,21 @@ PATH=$(WXWIN)\lib\gcc_dll;$(PATH)]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cppchecker/CppChecker.project b/cppchecker/CppChecker.project
index d4cd011a8d..579fad484c 100644
--- a/cppchecker/CppChecker.project
+++ b/cppchecker/CppChecker.project
@@ -73,10 +73,6 @@
-
-
-
-
@@ -326,4 +322,8 @@
+
+
+
+
diff --git a/cscope/Cscope.project b/cscope/Cscope.project
index 8d6addff9e..56c9cc4f75 100644
--- a/cscope/Cscope.project
+++ b/cscope/Cscope.project
@@ -64,10 +64,6 @@
-
-
-
-
@@ -318,4 +314,8 @@
+
+
+
+
diff --git a/git/git.project b/git/git.project
index fe3df95740..8c2a1e6de7 100644
--- a/git/git.project
+++ b/git/git.project
@@ -85,11 +85,6 @@
-
-
-
-
-
@@ -403,4 +398,9 @@
+
+
+
+
+
diff --git a/le_exec/le_exec.project b/le_exec/le_exec.project
index fbd09b5336..3a83ad1a0e 100644
--- a/le_exec/le_exec.project
+++ b/le_exec/le_exec.project
@@ -21,10 +21,6 @@
-
-
-
-
@@ -196,4 +192,8 @@
+
+
+
+
diff --git a/sdk/codelite_cppcheck/codelite_cppcheck.project b/sdk/codelite_cppcheck/codelite_cppcheck.project
index b498a271cd..9d9e85c9d1 100644
--- a/sdk/codelite_cppcheck/codelite_cppcheck.project
+++ b/sdk/codelite_cppcheck/codelite_cppcheck.project
@@ -158,9 +158,6 @@
-
-
-
@@ -346,4 +343,8 @@
+
+
+
+
diff --git a/sdk/codelite_indexer/codelite_indexer.project b/sdk/codelite_indexer/codelite_indexer.project
index 34a3e9b64b..d0b4ff29f1 100644
--- a/sdk/codelite_indexer/codelite_indexer.project
+++ b/sdk/codelite_indexer/codelite_indexer.project
@@ -131,20 +131,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -497,4 +483,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sdk/databaselayer/databaselayer_sqlite.project b/sdk/databaselayer/databaselayer_sqlite.project
index 11f939dce2..77f23fb8a0 100644
--- a/sdk/databaselayer/databaselayer_sqlite.project
+++ b/sdk/databaselayer/databaselayer_sqlite.project
@@ -78,12 +78,6 @@
-
-
-
-
-
-
@@ -358,4 +352,10 @@
+
+
+
+
+
+
diff --git a/sdk/wxshapeframework/wxshapeframework.project b/sdk/wxshapeframework/wxshapeframework.project
index 15e2aaecd5..e12f67d5bc 100644
--- a/sdk/wxshapeframework/wxshapeframework.project
+++ b/sdk/wxshapeframework/wxshapeframework.project
@@ -127,12 +127,6 @@
-
-
-
-
-
-
@@ -436,4 +430,10 @@
+
+
+
+
+
+
diff --git a/sdk/wxsqlite3/wxsqlite3.project b/sdk/wxsqlite3/wxsqlite3.project
index 6748a7ee31..e50f47b6ae 100644
--- a/sdk/wxsqlite3/wxsqlite3.project
+++ b/sdk/wxsqlite3/wxsqlite3.project
@@ -69,18 +69,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -277,4 +265,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/wxcrafter/wxcLib/wxcLib.project b/wxcrafter/wxcLib/wxcLib.project
index a7cb35cfde..45d04fc2e6 100644
--- a/wxcrafter/wxcLib/wxcLib.project
+++ b/wxcrafter/wxcLib/wxcLib.project
@@ -81,10 +81,6 @@
-
-
-
-
@@ -261,4 +257,8 @@
+
+
+
+
diff --git a/wxcrafter/wxcrafter.project b/wxcrafter/wxcrafter.project
index f7aa0af8e3..56fbcc329e 100644
--- a/wxcrafter/wxcrafter.project
+++ b/wxcrafter/wxcrafter.project
@@ -641,24 +641,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1204,4 +1186,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/wxformbuilder/wxFormBuilder.project b/wxformbuilder/wxFormBuilder.project
index fbfe6af669..283842dcf3 100644
--- a/wxformbuilder/wxFormBuilder.project
+++ b/wxformbuilder/wxFormBuilder.project
@@ -50,10 +50,6 @@
-
-
-
-
@@ -299,4 +295,8 @@
+
+
+
+