header files fix to eliminate Windows types for mir_app

16 files changed, 191 insertions, 154 deletions

diff --git a/codelite/Makefile b/codelite/Makefile
index fa195bea86..04521d512f 100644
--- a/codelite/Makefile
+++ b/codelite/Makefile
@@ -3,6 +3,10 @@
 All:
 	@echo "----------Building project:[ mir_core - Release ]----------"
 	@cd "/var/www/miranda-ng/src/mir_core" && "$(MAKE)" -f  "mir_core.mk"
+	@echo "----------Building project:[ mir_app - Release ]----------"
+	@cd "/var/www/miranda-ng/src/mir_app" && "$(MAKE)" -f  "mir_app.mk"
 clean:
 	@echo "----------Cleaning project:[ mir_core - Release ]----------"
-	@cd "/var/www/miranda-ng/src/mir_core" && "$(MAKE)" -f  "mir_core.mk" clean
+	@cd "/var/www/miranda-ng/src/mir_core" && "$(MAKE)" -f  "mir_core.mk"  clean
+	@echo "----------Cleaning project:[ mir_app - Release ]----------"
+	@cd "/var/www/miranda-ng/src/mir_app" && "$(MAKE)" -f  "mir_app.mk" clean
diff --git a/codelite/Miranda.workspace b/codelite/Miranda.workspace
index 545c4afe70..a6e9c4eaec 100644
--- a/codelite/Miranda.workspace
+++ b/codelite/Miranda.workspace
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CodeLite_Workspace Name="Miranda" Database="" Version="10000">
-  <Project Name="mir_core" Path="../../../../var/www/miranda-ng/src/mir_core/mir_core.project" Active="Yes"/>
+  <VirtualDirectory Name="Core">
+    <Project Name="mir_core" Path="../../../../var/www/miranda-ng/src/mir_core/mir_core.project" Active="No"/>
+    <Project Name="mir_app" Path="../../../../var/www/miranda-ng/src/mir_app/mir_app.project" Active="Yes"/>
+  </VirtualDirectory>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Debug" Selected="no">
       <Environment/>
       <Project Name="mir_core" ConfigName="Debug"/>
+      <Project Name="mir_app" ConfigName="Debug"/>
     </WorkspaceConfiguration>
     <WorkspaceConfiguration Name="Release" Selected="yes">
       <Environment/>
       <Project Name="mir_core" ConfigName="Release"/>
+      <Project Name="mir_app" ConfigName="Release"/>
     </WorkspaceConfiguration>
   </BuildMatrix>
 </CodeLite_Workspace>
diff --git a/include/m_avatars.h b/include/m_avatars.h
index 6d83b924c4..e224c058e3 100644
--- a/include/m_avatars.h
+++ b/include/m_avatars.h
@@ -72,15 +72,15 @@ unless AF_FETCHIFPROTONOTVISIBLE is set.
 

 struct AVATARCACHEENTRY

 {

-	MCONTACT hContact;               // contacts handle, 0, if it is a protocol avatar

-	HBITMAP hbmPic;                  // bitmap handle of the picutre itself

-	DWORD dwFlags;                   // see above for flag values

-	LONG bmHeight, bmWidth;          // bitmap dimensions

-	DWORD t_lastAccess;              // last access time (currently unused, but plugins should still

+	MCONTACT hContact;              // contacts handle, 0, if it is a protocol avatar

+	HBITMAP hbmPic;                 // bitmap handle of the picutre itself

+	uint32_t dwFlags;               // see above for flag values

+	int bmHeight, bmWidth;          // bitmap dimensions

+	uint32_t t_lastAccess;          // last access time (currently unused, but plugins should still

                                     // use it whenever they access the avatar. may be used in the future

-	                                 // to implement cache expiration

-	LPVOID lpDIBSection;             // unused field

-	wchar_t szFilename[MAX_PATH];    // filename of the avatar (absolute path)

+	                                // to implement cache expiration

+	void *lpDIBSection;             // unused field

+	wchar_t szFilename[MAX_PATH];   // filename of the avatar (absolute path)

 };

 

 #define AVDRQ_FALLBACKPROTO            0x0001        // use the protocol picture as fallback (currently not used)

@@ -103,12 +103,12 @@ struct AVATARDRAWREQUEST
 	MCONTACT hContact;               // the contact for which the avatar should be drawn. set it to 0 to draw a protocol picture

 	HDC      hTargetDC;              // target device context

 	RECT     rcDraw;                 // target rectangle. The avatar will be centered within the rectangle and scaled to fit.

-	DWORD    dwFlags;                // flags (see above for valid bitflags)

-	DWORD    dwReserved;             // for future use

-	DWORD    dwInternal;             // don't use it

+	uint32_t dwFlags;                // flags (see above for valid bitflags)

+	uint32_t dwReserved;             // for future use

+	uint32_t dwInternal;             // don't use it

 	COLORREF clrBorder;              // color for the border  (used with AVDRQ_DRAWBORDER)

-	UCHAR    radius;                 // radius (used with AVDRQ_ROUNDEDCORNER)

-	UCHAR    alpha;                  // alpha value for semi-transparent avatars (valid values form 1 to 255, if it is set to 0

+	uint8_t  radius;                 // radius (used with AVDRQ_ROUNDEDCORNER)

+	uint8_t  alpha;                  // alpha value for semi-transparent avatars (valid values form 1 to 255, if it is set to 0

 	                                 // the avatar won't be transparent.

 	char    *szProto;                // only used when AVDRQ_PROTOPICT or AVDRQ_OWNPIC is set

 };

diff --git a/include/m_clistint.h b/include/m_clistint.h
index 103a27f4a4..9bd291d839 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -25,8 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef M_CLISTINT_H__

 #define M_CLISTINT_H__ 1

 

-#include <CommCtrl.h>

-

 #ifndef M_CLIST_H__

 #include <m_clist.h>

 #endif 

@@ -307,7 +305,7 @@ struct CLIST_INTERFACE
 {

 	HWND hwndContactList, hwndContactTree, hwndStatus;

 	HMENU hMenuMain;

-	HMODULE hInst;

+	HINSTANCE hInst;

 

 	// clc.h

 	LRESULT        (CALLBACK *pfnContactListControlWndProc)(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

@@ -377,7 +375,7 @@ struct CLIST_INTERFACE
 				      

 	void           (*pfnCluiProtocolStatusChanged)(int status, const char *szProto);

 	void           (*pfnLoadCluiGlobalOpts)(void);

-	BOOL           (*pfnInvalidateRect)(HWND hwnd, CONST RECT* lpRect, BOOL bErase);

+	BOOL           (*pfnInvalidateRect)(HWND hwnd, const RECT* lpRect, BOOL bErase);

 	void           (*pfnOnCreateClc)(void);

 

 	/* contact.c */

diff --git a/include/m_core.h b/include/m_core.h
index f74603f510..780c39ddd5 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	#include <sal.h>
 #endif
 
+#include <stdarg.h>
 #include <stdint.h>
 #include <stdlib.h>
 
diff --git a/include/m_crypto.h b/include/m_crypto.h
index d13a6b053e..b16bf2c35c 100644
--- a/include/m_crypto.h
+++ b/include/m_crypto.h
@@ -61,7 +61,7 @@ struct MICryptoEngine
 // lParam = (CRYPTO_PROVIDER*)

 // returns HANDLE on success or NULL on failure

 

-typedef MICryptoEngine* (__cdecl *pfnCryptoProviderFactory)(void);

+typedef MICryptoEngine* (MIR_CDECL *pfnCryptoProviderFactory)(void);

 

 #define CPF_UNICODE 1

 

diff --git a/include/m_fontservice.h b/include/m_fontservice.h
index 61ac81df28..d95642d3b5 100644
--- a/include/m_fontservice.h
+++ b/include/m_fontservice.h
@@ -112,8 +112,8 @@ EXTERN_C MIR_APP_DLL(int) Font_RegisterW(FontIDW *pFont, HPLUGIN);
 // global default font is gotten using SPI_GETICONTITLELOGFONT, color COLOR_WINDOWTEXT, size 8.

 // returns the font's colour

 

-EXTERN_C MIR_APP_DLL(COLORREF) Font_Get(const char *szGroup, const char *szName, LOGFONTA *pFont);

-EXTERN_C MIR_APP_DLL(COLORREF) Font_GetW(const wchar_t *wszGroup, const wchar_t *wszName, LOGFONTW *pFont);

+EXTERN_C MIR_APP_DLL(COLORREF) Font_Get(const char *szGroup, const char *szName, struct LOGFONTA *pFont);

+EXTERN_C MIR_APP_DLL(COLORREF) Font_GetW(const wchar_t *wszGroup, const wchar_t *wszName, struct LOGFONTW *pFont);

 

 __forceinline COLORREF Font_Get(FontID &p, LOGFONTA *pFont)

 {	return Font_Get(p.group, p.name, pFont);

diff --git a/include/m_hotkeys.h b/include/m_hotkeys.h
index df11425339..6c6eea4c7a 100644
--- a/include/m_hotkeys.h
+++ b/include/m_hotkeys.h
@@ -64,7 +64,7 @@ EXTERN_C MIR_APP_DLL(int) Hotkey_Unregister(const char *pszName);
 // Checks if "manual" hotkey was activated and returns its id.

 // Returns lParam associated with activated hotkey

 

-EXTERN_C MIR_APP_DLL(int) Hotkey_Check(MSG *pEvent, const char *pszSection);

+EXTERN_C MIR_APP_DLL(int) Hotkey_Check(struct MSG *pEvent, const char *pszSection);

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // Subclasss/unsubclass edit box to act as hotkey control

diff --git a/include/m_options.h b/include/m_options.h
index 3092585d43..9c4783fa66 100644
--- a/include/m_options.h
+++ b/include/m_options.h
@@ -63,11 +63,14 @@ struct OPTIONSDIALOGPAGE
 {

 	int position; // a position number, lower numbers are topmost

 	MAllStrings szTitle, szGroup, szTab; // [TRANSLATED-BY-CORE]

-	DLGPROC pfnDlgProc;

 	char *pszTemplate;

-	HPLUGIN pPlugin;

 	DWORD flags;

 

+	#ifdef _WINDOWS

+		DLGPROC pfnDlgProc;

+		HPLUGIN pPlugin;

+	#endif

+

 	union {

 		LPARAM dwInitParam; // a value to pass to lParam of WM_INITDIALOG message

 		class CDlgBase *pDialog;

diff --git a/include/m_popup.h b/include/m_popup.h
index 6a0bf86fa3..fa279b9e63 100644
--- a/include/m_popup.h
+++ b/include/m_popup.h
@@ -90,9 +90,11 @@ struct POPUPDATA2
 	int iSeconds;

 	DWORD dwTimestamp;

 

-	// plugin bindings

-	WNDPROC PluginWindowProc;

-	void *PluginData;

+	#ifdef _WINDOWS

+		// plugin bindings

+		WNDPROC PluginWindowProc;

+		void *PluginData;

+	#endif

 

 	// popup actions

 	int actionCount;

@@ -125,8 +127,10 @@ struct POPUPDATA
 	char lpzText[MAX_SECONDLINE];

 	COLORREF colorBack;

 	COLORREF colorText;

-	WNDPROC PluginWindowProc;

-	void *PluginData;

+	#ifdef _WINDOWS

+		WNDPROC PluginWindowProc;

+		void *PluginData;

+	#endif

 	int iSeconds;       // Custom delay time in seconds. -1 means "forever", 0 means "default time".

 };

 

@@ -142,8 +146,10 @@ struct POPUPDATAW
 	wchar_t lpwzText[MAX_SECONDLINE];

 	COLORREF colorBack;

 	COLORREF colorText;

-	WNDPROC PluginWindowProc;

-	void *PluginData;

+	#ifdef _WINDOWS

+		WNDPROC PluginWindowProc;

+		void *PluginData;

+	#endif

 	int iSeconds;      // Custom delay time in seconds. -1 means "forever", 0 means "default time".

 	HANDLE hNotification;

 	int actionCount;

@@ -218,12 +224,14 @@ struct POPUPACTIONID
 	LPARAM lParam;

 };

 

+#ifdef _WINDOWS

 #define UM_POPUPMODIFYACTIONICON  (WM_USER + 0x0205)

 __forceinline int PUModifyActionIcon(HWND hWndPopup, WPARAM wParam, LPARAM lParam, HICON hIcon)

 {

 	POPUPACTIONID actionId = { wParam, lParam };

 	return (int)SendMessage(hWndPopup, UM_POPUPMODIFYACTIONICON, (WPARAM)&actionId, (LPARAM)hIcon);

 }

+#endif

 

 // UM_POPUPSHOW

 // Show popup at position

@@ -286,7 +294,9 @@ typedef struct
 	char *lpzLAction;

 	char *lpzRAction;

 	char *pszReserved1;		// reserved for future use

-	DLGPROC pfnReserved2;	// reserved for future use

+	#ifdef _WINDOWS

+		DLGPROC pfnReserved2;	// reserved for future use

+	#endif

 } POPUPNOTIFICATION, *LPPOPUPNOTIFICATION;

 

 EXTERN_C MIR_APP_DLL(HANDLE) PURegisterNotification(LPPOPUPNOTIFICATION notification);

@@ -320,6 +330,8 @@ Modify Popup Action Icon
 wParam = 0

 lParam = (LPARAM)(HANDLE)hEventUnhooked

 */

+

+#ifdef _WINDOWS

 #define UM_POPUPUNHOOKCOMPLETE           (WM_USER + 0x0206)

 

 __forceinline int PUUnhookEventAsync(HWND hwndPopup, HANDLE hEvent)

@@ -332,6 +344,7 @@ __forceinline int PUUnhookEventAsync(HWND hwndPopup, HANDLE hEvent)
 	PostMessage(hwndPopup, UM_POPUPUNHOOKCOMPLETE, 0, (LPARAM)hEvent);

 	return 0;

 }

+#endif

 

 #ifdef __cplusplus

 /* Popup/RegisterVfx

@@ -404,7 +417,9 @@ struct POPUPCLASS
 	char *pszName;

 	MAllStrings pszDescription;

 	HICON hIcon;

-	WNDPROC PluginWindowProc;

+	#ifdef _WINDOWS

+		WNDPROC PluginWindowProc;

+	#endif

 	LPARAM lParam; //APF_RETURN_HWND, APF_CUSTOM_POPUP  ... as above

 };

 

diff --git a/include/m_srmm_int.h b/include/m_srmm_int.h
index 62d0b2d689..7dc1d9cb62 100644
--- a/include/m_srmm_int.h
+++ b/include/m_srmm_int.h
@@ -136,7 +136,7 @@ public:
 	virtual INT_PTR Notify(WPARAM, LPARAM) { return 0; }
 };
 
-typedef CSrmmLogWindow *(__cdecl *pfnSrmmLogCreator)(CMsgDialog &pDlg);
+typedef CSrmmLogWindow *(MIR_CDECL *pfnSrmmLogCreator)(CMsgDialog &pDlg);
 
 EXTERN_C MIR_APP_DLL(HANDLE) RegisterSrmmLog(const char *pszShortName, const wchar_t *pwszScreenName, pfnSrmmLogCreator fnBuilder);
 EXTERN_C MIR_APP_DLL(void) UnregisterSrmmLog(HANDLE);
@@ -197,8 +197,10 @@ protected:
 
 	bool AllowTyping() const;
 	int  NotifyEvent(int code);
+	#ifdef _WINDOWS
 	bool ProcessFileDrop(HDROP hDrop, MCONTACT hContact);
 	bool PasteFilesAsURL(HDROP hDrop);
+	#endif
 	bool ProcessHotkeys(int key, bool bShift, bool bCtrl, bool bAlt);
 	void RefreshButtonStatus(void);
 	void RunUserMenu(HWND hwndOwner, struct USERINFO *ui, const POINT &pt);
@@ -277,7 +279,7 @@ class CMsgDialog : public CSrmmBaseDialog {};
 /////////////////////////////////////////////////////////////////////////////////////////
 // receives LOGSTREAMDATA* as the first parameter
 
-EXTERN_C MIR_APP_DLL(DWORD) CALLBACK Srmm_LogStreamCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, LONG *pcb);
+EXTERN_C MIR_APP_DLL(DWORD) CALLBACK Srmm_LogStreamCallback(UINT_PTR dwCookie, BYTE *pbBuff, LONG cb, LONG *pcb);
 
 /////////////////////////////////////////////////////////////////////////////////////////
 // sends a message to all SRMM windows
diff --git a/include/m_types.h b/include/m_types.h
index e95b10718a..73aa902cc7 100644
--- a/include/m_types.h
+++ b/include/m_types.h
@@ -46,6 +46,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define SW_HIDE 0
 #define SW_SHOW 5
 #define MAX_PATH 260
+#define LF_FACESIZE 32
 #define _TRUNCATE size_t(-1)
 #define INVALID_HANDLE_VALUE HANDLE(-1)
 
@@ -97,7 +98,10 @@ struct SIZE { int width, height; };
 #define _vsnprintf vsnprintf
 #define _vsnwprintf vswprintf
 
+#define __forceinline inline
+
 #define DECLARE_HANDLE(name) struct _##name { int unused; }; typedef struct _##name *name
+DECLARE_HANDLE(HDC);
 DECLARE_HANDLE(HWND);
 DECLARE_HANDLE(HFONT);
 DECLARE_HANDLE(HICON);
diff --git a/plugins/ExternalAPI/m_skin_eng.h b/plugins/ExternalAPI/m_skin_eng.h
index 968e3b1b4b..931097b86d 100644
--- a/plugins/ExternalAPI/m_skin_eng.h
+++ b/plugins/ExternalAPI/m_skin_eng.h
@@ -134,17 +134,17 @@ struct GLYPHOBJECT
 /* SKINTEXTDESCRIPTOR opbject descriptor structure */

 struct GLYPHTEXT

 {

-	char  *szGlyphTextID;

-	TCHAR *stText;

-	TCHAR *stValueText;

-	DWORD  dwFlags;

-	DWORD  dwColor;                     // Color (InvAA)(RR)(GG)(BB)

-	DWORD  dwShadow;                    //ToDo: Color2/Shaddow

-	int    iLeft, iTop, iRight, iBottom;

-	BYTE   RelativeFlags;

-	char  *szFontID;

-	HFONT  hFont;

-	char  *szObjectName;

+	char    *szGlyphTextID;

+	wchar_t *stText;

+	wchar_t *stValueText;

+	DWORD    dwFlags;

+	DWORD    dwColor;                     // Color (InvAA)(RR)(GG)(BB)

+	DWORD    dwShadow;                    //ToDo: Color2/Shaddow

+	int      iLeft, iTop, iRight, iBottom;

+	BYTE     RelativeFlags;

+	char    *szFontID;

+	HFONT    hFont;

+	char    *szObjectName;

 };

 

 /* SKINTEXTDESCRIPTOR opbject descriptor structure */

@@ -157,6 +157,7 @@ struct SKINFONT
 /* HELPER FUNCTIONS */

 

 //Paint  ObjectID as parent background for frame hwndIn

+#ifdef _WINDOWS

 int __inline SkinDrawWindowBack(HWND hwndIn, HDC hdc, RECT * rcClip, char * objectID)

 {

 	SKINDRAWREQUEST rq;

@@ -176,6 +177,7 @@ int __inline SkinDrawWindowBack(HWND hwndIn, HDC hdc, RECT * rcClip, char * obje
 	///ske_Service_DrawGlyph((WPARAM)&rq,0);    //$$$

 	return CallService(MS_SKIN_DRAWGLYPH,(WPARAM)&rq,0);

 }

+#endif

 

 //Register object with predefined style

 int __inline CreateGlyphedObjectDefStyle(char * ObjID,BYTE defStyle);

@@ -192,7 +194,8 @@ int __inline CreateGlyphedObject(char * ObjID);
 //    prm.szObjectID=ObjID;

 //    return CallService(MS_SKIN_REGISTERDEFOBJECT,(WPARAM)&prm,0);

 //}

-static BOOL __inline ScreenToClientRect(HWND hWnd, LPRECT lpRect)

+

+static BOOL __inline ScreenToClientRect(HWND hWnd, RECT *lpRect)

 {

 	BOOL ret;

 

diff --git a/plugins/ExternalAPI/m_toptoolbar.h b/plugins/ExternalAPI/m_toptoolbar.h
index 75e9f9c73c..9add65772e 100644
--- a/plugins/ExternalAPI/m_toptoolbar.h
+++ b/plugins/ExternalAPI/m_toptoolbar.h
@@ -21,7 +21,7 @@ struct TTBButton
 {

 	union {

 		char *pszService;

-		TCHAR *program;

+		wchar_t *program;

 	};

 	DWORD dwFlags;

 	LPARAM lParamUp;

@@ -130,7 +130,7 @@ returns: always returns 0.
 // hwndBtn   = button window handle

 // userInfo  = lParam passed into TopToolbar_SetCustomProc

 

-typedef void (__cdecl *pfnCustomProc)(HANDLE hTTButton, HWND hwndBtn, LPARAM userInfo);

+typedef void (MIR_CDECL *pfnCustomProc)(HANDLE hTTButton, HWND hwndBtn, LPARAM userInfo);

 

 __forceinline void TopToolbar_SetCustomProc(pfnCustomProc pFunc, LPARAM lParam)

 {	CallService("TopToolBar/SetCustomProc", (WPARAM)pFunc, lParam);

@@ -139,7 +139,7 @@ __forceinline void TopToolbar_SetCustomProc(pfnCustomProc pFunc, LPARAM lParam)
 ///////////////////////////////////////////////////////////////////////////////

 // Toolbar internal structures

 

-typedef void (__cdecl *pfnTTBPainterFunc)(struct TTBCtrl*, HDC);

+typedef void (MIR_CDECL *pfnTTBPainterFunc)(struct TTBCtrl*, HDC);

 

 struct TTBCtrlButton

 {

diff --git a/src/mir_app/src/stdafx.h b/src/mir_app/src/stdafx.h
index 003be62162..3830bbb953 100644
--- a/src/mir_app/src/stdafx.h
+++ b/src/mir_app/src/stdafx.h
@@ -27,15 +27,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define HSSL_DEFINED 1

 typedef struct SslHandle *HSSL;

 

-#include <winsock2.h>

-#include <ws2tcpip.h>

-#include <windows.h>

-#include <windowsx.h>

-#include <ShlObj.h>

-#include <uxtheme.h>

-#include <vssym32.h>

-#include <Shlwapi.h>

-#include <Richedit.h>

+#ifdef _WINDOWS

+	#include <winsock2.h>

+	#include <ws2tcpip.h>

+	#include <windows.h>

+	#include <windowsx.h>

+	#include <ShlObj.h>

+	#include <uxtheme.h>

+	#include <vssym32.h>

+	#include <Shlwapi.h>

+	#include <Richedit.h>

+	

+	#include <io.h>

+	#include <direct.h>

+	#include <process.h>

+#endif

 

 #ifdef _DEBUG

 #include <crtdbg.h>

@@ -47,12 +53,9 @@ typedef struct SslHandle *HSSL;
 #include <math.h>

 #include <time.h>

 #include <stddef.h>

-#include <process.h>

-#include <io.h>

 #include <limits.h>

 #include <string.h>

 #include <locale.h>

-#include <direct.h>

 

 #include <memory>

 

@@ -90,13 +93,12 @@ typedef struct SslHandle *HSSL;
 #include <m_protocols.h>

 #include <m_protoint.h>

 #include <m_skin.h>

-#include <m_skin_eng.h>

 #include <m_srmm_int.h>

 #include <m_timezones.h>

 #include <m_tipper.h>

 #include <m_toptoolbar.h>

 #include <m_userinfo.h>

-#include <m_version.h>

+//#include <m_version.h>

 #include <m_xstatus.h>

 

 #include "miranda.h"

diff --git a/src/mir_core/mir_core.mk b/src/mir_core/mir_core.mk
index f10daa841a..89f651b2c8 100644
--- a/src/mir_core/mir_core.mk
+++ b/src/mir_core/mir_core.mk
@@ -14,7 +14,7 @@ CurrentFileName        :=
 CurrentFilePath        :=
 CurrentFileFullPath    :=
 User                   :=George Hazan
-Date                   :=14/11/21
+Date                   :=19/12/21
 CodeLitePath           :=/home/ghazan/.codelite
 LinkerName             :=g++
 SharedObjectLinkerName :=g++ -shared -fPIC
@@ -60,8 +60,8 @@ AS       := as
 ## User defined environment variables
 ##
 CodeLiteDir:=/usr/share/codelite
-Objects0=../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_Linux_strutil.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utils.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utf.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2_utils.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_Linux_fileutil.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_bitmaps.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_db.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_http.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_binbuffer.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_logger.cpp$(ObjectSuffix) \
-	../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_mstring.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha256.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_md5.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_lists.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_memory.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_stdafx.cxx$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha1.cpp$(ObjectSuffix) 
+Objects0=../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_db.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_http.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_Linux_strutil.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_bitmaps.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_Linux_fileutil.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2_utils.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utils.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utf.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha256.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_mstring.cpp$(ObjectSuffix) \
+	../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha1.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_stdafx.cxx$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_lists.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_memory.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_md5.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_binbuffer.cpp$(ObjectSuffix) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_logger.cpp$(ObjectSuffix) 
 
 
 
@@ -93,6 +93,22 @@ PreBuild:
 ##
 ## Objects
 ##
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_db.cpp$(ObjectSuffix): src/db.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_db.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/db.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_db.cpp$(ObjectSuffix) $(IncludePath)
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_db.cpp$(DependSuffix): src/db.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_db.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_db.cpp$(DependSuffix) -MM src/db.cpp
+
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_db.cpp$(PreprocessSuffix): src/db.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_db.cpp$(PreprocessSuffix) src/db.cpp
+
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_http.cpp$(ObjectSuffix): src/http.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_http.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/http.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_http.cpp$(ObjectSuffix) $(IncludePath)
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_http.cpp$(DependSuffix): src/http.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_http.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_http.cpp$(DependSuffix) -MM src/http.cpp
+
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_http.cpp$(PreprocessSuffix): src/http.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_http.cpp$(PreprocessSuffix) src/http.cpp
+
 ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_Linux_strutil.cpp$(ObjectSuffix): src/Linux/strutil.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_Linux_strutil.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/Linux/strutil.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_strutil.cpp$(ObjectSuffix) $(IncludePath)
 ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_Linux_strutil.cpp$(DependSuffix): src/Linux/strutil.cpp
@@ -101,29 +117,13 @@ PreBuild:
 ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_Linux_strutil.cpp$(PreprocessSuffix): src/Linux/strutil.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_Linux_strutil.cpp$(PreprocessSuffix) src/Linux/strutil.cpp
 
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utils.cpp$(ObjectSuffix): src/utils.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utils.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/utils.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_utils.cpp$(ObjectSuffix) $(IncludePath)
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utils.cpp$(DependSuffix): src/utils.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utils.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utils.cpp$(DependSuffix) -MM src/utils.cpp
-
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utils.cpp$(PreprocessSuffix): src/utils.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utils.cpp$(PreprocessSuffix) src/utils.cpp
-
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utf.cpp$(ObjectSuffix): src/utf.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utf.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/utf.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_utf.cpp$(ObjectSuffix) $(IncludePath)
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utf.cpp$(DependSuffix): src/utf.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utf.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utf.cpp$(DependSuffix) -MM src/utf.cpp
-
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utf.cpp$(PreprocessSuffix): src/utf.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utf.cpp$(PreprocessSuffix) src/utf.cpp
-
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2_utils.cpp$(ObjectSuffix): src/tinyxml2_utils.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2_utils.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/tinyxml2_utils.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_tinyxml2_utils.cpp$(ObjectSuffix) $(IncludePath)
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2_utils.cpp$(DependSuffix): src/tinyxml2_utils.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2_utils.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2_utils.cpp$(DependSuffix) -MM src/tinyxml2_utils.cpp
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_bitmaps.cpp$(ObjectSuffix): src/bitmaps.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_bitmaps.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/bitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_bitmaps.cpp$(ObjectSuffix) $(IncludePath)
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_bitmaps.cpp$(DependSuffix): src/bitmaps.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_bitmaps.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_bitmaps.cpp$(DependSuffix) -MM src/bitmaps.cpp
 
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2_utils.cpp$(PreprocessSuffix): src/tinyxml2_utils.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2_utils.cpp$(PreprocessSuffix) src/tinyxml2_utils.cpp
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_bitmaps.cpp$(PreprocessSuffix): src/bitmaps.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_bitmaps.cpp$(PreprocessSuffix) src/bitmaps.cpp
 
 ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_Linux_fileutil.cpp$(ObjectSuffix): src/Linux/fileutil.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_Linux_fileutil.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/Linux/fileutil.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_fileutil.cpp$(ObjectSuffix) $(IncludePath)
@@ -133,45 +133,37 @@ PreBuild:
 ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_Linux_fileutil.cpp$(PreprocessSuffix): src/Linux/fileutil.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_Linux_fileutil.cpp$(PreprocessSuffix) src/Linux/fileutil.cpp
 
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_bitmaps.cpp$(ObjectSuffix): src/bitmaps.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_bitmaps.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/bitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_bitmaps.cpp$(ObjectSuffix) $(IncludePath)
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_bitmaps.cpp$(DependSuffix): src/bitmaps.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_bitmaps.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_bitmaps.cpp$(DependSuffix) -MM src/bitmaps.cpp
-
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_bitmaps.cpp$(PreprocessSuffix): src/bitmaps.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_bitmaps.cpp$(PreprocessSuffix) src/bitmaps.cpp
-
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_db.cpp$(ObjectSuffix): src/db.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_db.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/db.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_db.cpp$(ObjectSuffix) $(IncludePath)
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_db.cpp$(DependSuffix): src/db.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_db.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_db.cpp$(DependSuffix) -MM src/db.cpp
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2_utils.cpp$(ObjectSuffix): src/tinyxml2_utils.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2_utils.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/tinyxml2_utils.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_tinyxml2_utils.cpp$(ObjectSuffix) $(IncludePath)
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2_utils.cpp$(DependSuffix): src/tinyxml2_utils.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2_utils.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2_utils.cpp$(DependSuffix) -MM src/tinyxml2_utils.cpp
 
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_db.cpp$(PreprocessSuffix): src/db.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_db.cpp$(PreprocessSuffix) src/db.cpp
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2_utils.cpp$(PreprocessSuffix): src/tinyxml2_utils.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2_utils.cpp$(PreprocessSuffix) src/tinyxml2_utils.cpp
 
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_http.cpp$(ObjectSuffix): src/http.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_http.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/http.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_http.cpp$(ObjectSuffix) $(IncludePath)
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_http.cpp$(DependSuffix): src/http.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_http.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_http.cpp$(DependSuffix) -MM src/http.cpp
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utils.cpp$(ObjectSuffix): src/utils.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utils.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/utils.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_utils.cpp$(ObjectSuffix) $(IncludePath)
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utils.cpp$(DependSuffix): src/utils.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utils.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utils.cpp$(DependSuffix) -MM src/utils.cpp
 
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_http.cpp$(PreprocessSuffix): src/http.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_http.cpp$(PreprocessSuffix) src/http.cpp
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utils.cpp$(PreprocessSuffix): src/utils.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utils.cpp$(PreprocessSuffix) src/utils.cpp
 
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_binbuffer.cpp$(ObjectSuffix): src/binbuffer.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_binbuffer.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/binbuffer.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_binbuffer.cpp$(ObjectSuffix) $(IncludePath)
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_binbuffer.cpp$(DependSuffix): src/binbuffer.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_binbuffer.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_binbuffer.cpp$(DependSuffix) -MM src/binbuffer.cpp
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utf.cpp$(ObjectSuffix): src/utf.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utf.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/utf.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_utf.cpp$(ObjectSuffix) $(IncludePath)
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utf.cpp$(DependSuffix): src/utf.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utf.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utf.cpp$(DependSuffix) -MM src/utf.cpp
 
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_binbuffer.cpp$(PreprocessSuffix): src/binbuffer.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_binbuffer.cpp$(PreprocessSuffix) src/binbuffer.cpp
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utf.cpp$(PreprocessSuffix): src/utf.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_utf.cpp$(PreprocessSuffix) src/utf.cpp
 
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_logger.cpp$(ObjectSuffix): src/logger.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_logger.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/logger.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_logger.cpp$(ObjectSuffix) $(IncludePath)
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_logger.cpp$(DependSuffix): src/logger.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_logger.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_logger.cpp$(DependSuffix) -MM src/logger.cpp
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha256.cpp$(ObjectSuffix): src/sha256.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha256.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/sha256.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_sha256.cpp$(ObjectSuffix) $(IncludePath)
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha256.cpp$(DependSuffix): src/sha256.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha256.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha256.cpp$(DependSuffix) -MM src/sha256.cpp
 
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_logger.cpp$(PreprocessSuffix): src/logger.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_logger.cpp$(PreprocessSuffix) src/logger.cpp
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha256.cpp$(PreprocessSuffix): src/sha256.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha256.cpp$(PreprocessSuffix) src/sha256.cpp
 
 ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_mstring.cpp$(ObjectSuffix): src/mstring.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_mstring.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/mstring.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_mstring.cpp$(ObjectSuffix) $(IncludePath)
@@ -181,29 +173,21 @@ PreBuild:
 ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_mstring.cpp$(PreprocessSuffix): src/mstring.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_mstring.cpp$(PreprocessSuffix) src/mstring.cpp
 
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha256.cpp$(ObjectSuffix): src/sha256.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha256.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/sha256.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_sha256.cpp$(ObjectSuffix) $(IncludePath)
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha256.cpp$(DependSuffix): src/sha256.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha256.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha256.cpp$(DependSuffix) -MM src/sha256.cpp
-
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha256.cpp$(PreprocessSuffix): src/sha256.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha256.cpp$(PreprocessSuffix) src/sha256.cpp
-
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_md5.cpp$(ObjectSuffix): src/md5.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_md5.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/md5.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_md5.cpp$(ObjectSuffix) $(IncludePath)
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_md5.cpp$(DependSuffix): src/md5.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_md5.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_md5.cpp$(DependSuffix) -MM src/md5.cpp
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha1.cpp$(ObjectSuffix): src/sha1.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha1.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/sha1.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_sha1.cpp$(ObjectSuffix) $(IncludePath)
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha1.cpp$(DependSuffix): src/sha1.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha1.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha1.cpp$(DependSuffix) -MM src/sha1.cpp
 
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_md5.cpp$(PreprocessSuffix): src/md5.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_md5.cpp$(PreprocessSuffix) src/md5.cpp
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha1.cpp$(PreprocessSuffix): src/sha1.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha1.cpp$(PreprocessSuffix) src/sha1.cpp
 
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2.cpp$(ObjectSuffix): src/tinyxml2.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/tinyxml2.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_tinyxml2.cpp$(ObjectSuffix) $(IncludePath)
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2.cpp$(DependSuffix): src/tinyxml2.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2.cpp$(DependSuffix) -MM src/tinyxml2.cpp
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_stdafx.cxx$(ObjectSuffix): src/stdafx.cxx ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_stdafx.cxx$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/stdafx.cxx" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_stdafx.cxx$(ObjectSuffix) $(IncludePath)
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_stdafx.cxx$(DependSuffix): src/stdafx.cxx
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_stdafx.cxx$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_stdafx.cxx$(DependSuffix) -MM src/stdafx.cxx
 
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2.cpp$(PreprocessSuffix): src/tinyxml2.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2.cpp$(PreprocessSuffix) src/tinyxml2.cpp
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_stdafx.cxx$(PreprocessSuffix): src/stdafx.cxx
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_stdafx.cxx$(PreprocessSuffix) src/stdafx.cxx
 
 ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_lists.cpp$(ObjectSuffix): src/lists.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_lists.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/lists.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_lists.cpp$(ObjectSuffix) $(IncludePath)
@@ -213,6 +197,14 @@ PreBuild:
 ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_lists.cpp$(PreprocessSuffix): src/lists.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_lists.cpp$(PreprocessSuffix) src/lists.cpp
 
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2.cpp$(ObjectSuffix): src/tinyxml2.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/tinyxml2.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_tinyxml2.cpp$(ObjectSuffix) $(IncludePath)
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2.cpp$(DependSuffix): src/tinyxml2.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2.cpp$(DependSuffix) -MM src/tinyxml2.cpp
+
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2.cpp$(PreprocessSuffix): src/tinyxml2.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_tinyxml2.cpp$(PreprocessSuffix) src/tinyxml2.cpp
+
 ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_memory.cpp$(ObjectSuffix): src/memory.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_memory.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/memory.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_memory.cpp$(ObjectSuffix) $(IncludePath)
 ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_memory.cpp$(DependSuffix): src/memory.cpp
@@ -221,21 +213,29 @@ PreBuild:
 ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_memory.cpp$(PreprocessSuffix): src/memory.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_memory.cpp$(PreprocessSuffix) src/memory.cpp
 
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_stdafx.cxx$(ObjectSuffix): src/stdafx.cxx ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_stdafx.cxx$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/stdafx.cxx" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_stdafx.cxx$(ObjectSuffix) $(IncludePath)
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_stdafx.cxx$(DependSuffix): src/stdafx.cxx
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_stdafx.cxx$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_stdafx.cxx$(DependSuffix) -MM src/stdafx.cxx
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_md5.cpp$(ObjectSuffix): src/md5.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_md5.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/md5.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_md5.cpp$(ObjectSuffix) $(IncludePath)
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_md5.cpp$(DependSuffix): src/md5.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_md5.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_md5.cpp$(DependSuffix) -MM src/md5.cpp
 
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_stdafx.cxx$(PreprocessSuffix): src/stdafx.cxx
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_stdafx.cxx$(PreprocessSuffix) src/stdafx.cxx
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_md5.cpp$(PreprocessSuffix): src/md5.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_md5.cpp$(PreprocessSuffix) src/md5.cpp
 
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha1.cpp$(ObjectSuffix): src/sha1.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha1.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/sha1.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_sha1.cpp$(ObjectSuffix) $(IncludePath)
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha1.cpp$(DependSuffix): src/sha1.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha1.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha1.cpp$(DependSuffix) -MM src/sha1.cpp
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_binbuffer.cpp$(ObjectSuffix): src/binbuffer.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_binbuffer.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/binbuffer.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_binbuffer.cpp$(ObjectSuffix) $(IncludePath)
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_binbuffer.cpp$(DependSuffix): src/binbuffer.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_binbuffer.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_binbuffer.cpp$(DependSuffix) -MM src/binbuffer.cpp
 
-../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha1.cpp$(PreprocessSuffix): src/sha1.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_sha1.cpp$(PreprocessSuffix) src/sha1.cpp
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_binbuffer.cpp$(PreprocessSuffix): src/binbuffer.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_binbuffer.cpp$(PreprocessSuffix) src/binbuffer.cpp
+
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_logger.cpp$(ObjectSuffix): src/logger.cpp ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_logger.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_core/src/logger.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_logger.cpp$(ObjectSuffix) $(IncludePath)
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_logger.cpp$(DependSuffix): src/logger.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_logger.cpp$(ObjectSuffix) -MF../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_logger.cpp$(DependSuffix) -MM src/logger.cpp
+
+../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_logger.cpp$(PreprocessSuffix): src/logger.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core/src_logger.cpp$(PreprocessSuffix) src/logger.cpp
 
 
 -include ../../../../../home/ghazan/miranda-ng/codelite/build-$(ConfigurationName)/__/__/__/__/var/www/miranda-ng/src/mir_core//*$(DependSuffix)