diff --git a/uppsrc2/Crypto/BscF.cpp b/archive/uppsrc/Crypto/BscF.cpp
similarity index 95%
rename from uppsrc2/Crypto/BscF.cpp
rename to archive/uppsrc/Crypto/BscF.cpp
index af3e26f80..d6b6e5441 100644
--- a/uppsrc2/Crypto/BscF.cpp
+++ b/archive/uppsrc/Crypto/BscF.cpp
@@ -1,158 +1,158 @@
-#include "Crypto.h"
-
-NAMESPACE_UPP
-
-template <int N>
-class Birc {
-	byte  r[N];
-	int   origin;
-public:
-	byte& operator[](int i)       { return r[(origin + i) % N]; }
-	void  Restart()               { origin = 0; }
-	void  Move()                  { origin = (origin + 1) % N; }
-
-	Birc()                        { origin = 0; }
-};
-
-struct BscF {
-	static byte T1[256];
-	static const int Krok;
-
-	Birc<81> R81, Q81;
-	byte IV[10], Wk[10];   /*  MAC, Klic na zpr.  */
-
-	void MAC_init();
-	void R81_init();
-	void MAC_step();
-	byte R81_step();
-	void R81_start();
-	void MACDummy();
-	void MACGen(const char *s, const char *lim);
-	void Start();
-};
-
-const int BscF::Krok = 101;
-
-byte BscF::T1[256] = {
-	32, 124, 29, 247, 230, 199, 244, 5, 86, 19, 125, 149, 108, 74, 237, 176,
-	165, 82, 240, 236, 144, 154, 107, 131, 147, 66, 118, 116, 126, 250, 127, 23,
-	232, 223, 243, 45, 83, 67, 216, 202, 33, 145, 62, 114, 61, 34, 205, 109,
-	14, 6, 193, 238, 55, 196, 163, 182, 140, 8, 115, 222, 217, 191, 112, 73,
-	142, 75, 214, 1, 59, 46, 239, 72, 164, 68, 180, 119, 209, 84, 152, 159,
-	184, 36, 47, 99, 235, 212, 42, 38, 123, 26, 17, 97, 155, 22, 190, 175,
-	64, 25, 94, 166, 183, 69, 234, 65, 195, 197, 77, 173, 20, 104, 63, 201,
-	249, 15, 134, 122, 57, 204, 139, 0, 210, 174, 3, 2, 80, 135, 106, 213,
-	56, 221, 172, 12, 162, 103, 188, 128, 9, 138, 137, 133, 54, 169, 100, 132,
-	60, 28, 113, 141, 44, 255, 181, 111, 10, 117, 254, 160, 90, 218, 186, 30,
-	48, 246, 79, 187, 37, 35, 53, 179, 129, 157, 146, 203, 177, 71, 27, 189,
-	252, 229, 143, 130, 11, 78, 226, 105, 88, 101, 251, 24, 170, 7, 76, 41,
-	198, 245, 208, 31, 21, 242, 89, 98, 225, 81, 219, 58, 96, 91, 215, 110,
-	227, 93, 39, 220, 52, 211, 253, 85, 151, 70, 228, 233, 171, 148, 206, 121,
-	248, 156, 241, 102, 207, 161, 192, 185, 120, 153, 4, 40, 136, 194, 50, 95,
-	87, 168, 178, 13, 18, 200, 49, 167, 150, 92, 16, 51, 231, 224, 43, 158
-};
-
-void BscF::MAC_init() {
-	for(int i = 0; i < 81; i++)
-		Q81[i] = T1[i];
-}
-
-
-void BscF::R81_init() {
-	for(int i = 80; i >= 0; i--)
-		R81[i] = T1[i];
-}
-
-void BscF::MAC_step() {
-	byte zvq81, neq81;
-	neq81 = T1[Q81[80]];
-	zvq81 = Q81[0];
-	Q81.Move();
-	Q81[80] = zvq81 ^ neq81;
-	Q81[54] = Q81[54] ^ zvq81;
-	Q81[49] = Q81[49] ^ zvq81;
-	Q81[16] = Q81[16] ^ zvq81;
-}
-
-byte BscF::R81_step() {
-	byte zvr81, ner81;
-	ner81 = T1[R81[80]];
-	zvr81 = R81[0];
-	R81.Move();
-	R81[80] = zvr81 ^ ner81;
-	R81[79] = R81[79] ^ zvr81;
-	R81[48] = R81[48] ^ zvr81;
-	R81[16] = R81[16] ^ zvr81;
-	return ner81;
-}
-
-void BscF::R81_start() {
-	int i;
-	for(i = 0; i < 81; i++) {
-		R81_step();
-		R81[80] = R81[80] ^ Wk[i % 10];
-	}
-	for(i = 0; i < Krok; i++)
-		R81_step();
-}
-
-void BscF::MACDummy() {
-	for(int k = 0; k < Krok; k++)
-		MAC_step();
-}
-
-void BscF::MACGen(const char *s, const char *lim) {
-	int i;
-	MAC_init();
-	while(s < lim) {
-		MAC_step();
-		Q81[80] = Q81[80] ^ *s++;
-	}
-	MACDummy();
-	for(i = 0; i < 10; i++)
-		IV[i] = Q81[80 - i];
-}
-
-void BscF::Start() {
-	R81_init();
-	R81_start();
-}
-
-String EncodeBscF(const String& src) {
-	String result;
-	BscF f;
-	const char *lim = src.End();
-	f.MACGen(src, lim);
-	memcpy(f.Wk, f.IV, 10);
-	f.Start();
-	result.Cat((const char *)f.IV, 10);
-	for(const char *s = src; s < lim; s++)
-		result.Cat(*s ^ f.R81_step());
-	for(int i = 0; i < 10; i++)
-		result.Cat(f.IV[i] ^ f.R81_step());
-	return result;
-}
-
-String DecodeBscF(const String& src) {
-	if(src.GetLength() <= 20)
-		return String::GetVoid();
-	BscF f;
-	String result;
-	const char *s = ~src + 10;
-	const char *lim = src.End() - 10;
-	f.MAC_init();
-	memcpy(f.Wk, src, 10);
-	f.Start();
-	while(s < lim) {
-		byte b = *s++ ^ f.R81_step();
-		result.Cat(b);
-		f.MAC_step();
-		f.Q81[80] ^= b;
-	}
-	f.MACDummy();
-	for(int i = 0; i < 10; i++)
-		if((byte)*s++ != (f.R81_step() ^ f.Q81[80 - i])) return String::GetVoid();
-	return result;
-}
-
-END_UPP_NAMESPACE
+#include "Crypto.h"
+
+NAMESPACE_UPP
+
+template <int N>
+class Birc {
+	byte  r[N];
+	int   origin;
+public:
+	byte& operator[](int i)       { return r[(origin + i) % N]; }
+	void  Restart()               { origin = 0; }
+	void  Move()                  { origin = (origin + 1) % N; }
+
+	Birc()                        { origin = 0; }
+};
+
+struct BscF {
+	static byte T1[256];
+	static const int Krok;
+
+	Birc<81> R81, Q81;
+	byte IV[10], Wk[10];   /*  MAC, Klic na zpr.  */
+
+	void MAC_init();
+	void R81_init();
+	void MAC_step();
+	byte R81_step();
+	void R81_start();
+	void MACDummy();
+	void MACGen(const char *s, const char *lim);
+	void Start();
+};
+
+const int BscF::Krok = 101;
+
+byte BscF::T1[256] = {
+	32, 124, 29, 247, 230, 199, 244, 5, 86, 19, 125, 149, 108, 74, 237, 176,
+	165, 82, 240, 236, 144, 154, 107, 131, 147, 66, 118, 116, 126, 250, 127, 23,
+	232, 223, 243, 45, 83, 67, 216, 202, 33, 145, 62, 114, 61, 34, 205, 109,
+	14, 6, 193, 238, 55, 196, 163, 182, 140, 8, 115, 222, 217, 191, 112, 73,
+	142, 75, 214, 1, 59, 46, 239, 72, 164, 68, 180, 119, 209, 84, 152, 159,
+	184, 36, 47, 99, 235, 212, 42, 38, 123, 26, 17, 97, 155, 22, 190, 175,
+	64, 25, 94, 166, 183, 69, 234, 65, 195, 197, 77, 173, 20, 104, 63, 201,
+	249, 15, 134, 122, 57, 204, 139, 0, 210, 174, 3, 2, 80, 135, 106, 213,
+	56, 221, 172, 12, 162, 103, 188, 128, 9, 138, 137, 133, 54, 169, 100, 132,
+	60, 28, 113, 141, 44, 255, 181, 111, 10, 117, 254, 160, 90, 218, 186, 30,
+	48, 246, 79, 187, 37, 35, 53, 179, 129, 157, 146, 203, 177, 71, 27, 189,
+	252, 229, 143, 130, 11, 78, 226, 105, 88, 101, 251, 24, 170, 7, 76, 41,
+	198, 245, 208, 31, 21, 242, 89, 98, 225, 81, 219, 58, 96, 91, 215, 110,
+	227, 93, 39, 220, 52, 211, 253, 85, 151, 70, 228, 233, 171, 148, 206, 121,
+	248, 156, 241, 102, 207, 161, 192, 185, 120, 153, 4, 40, 136, 194, 50, 95,
+	87, 168, 178, 13, 18, 200, 49, 167, 150, 92, 16, 51, 231, 224, 43, 158
+};
+
+void BscF::MAC_init() {
+	for(int i = 0; i < 81; i++)
+		Q81[i] = T1[i];
+}
+
+
+void BscF::R81_init() {
+	for(int i = 80; i >= 0; i--)
+		R81[i] = T1[i];
+}
+
+void BscF::MAC_step() {
+	byte zvq81, neq81;
+	neq81 = T1[Q81[80]];
+	zvq81 = Q81[0];
+	Q81.Move();
+	Q81[80] = zvq81 ^ neq81;
+	Q81[54] = Q81[54] ^ zvq81;
+	Q81[49] = Q81[49] ^ zvq81;
+	Q81[16] = Q81[16] ^ zvq81;
+}
+
+byte BscF::R81_step() {
+	byte zvr81, ner81;
+	ner81 = T1[R81[80]];
+	zvr81 = R81[0];
+	R81.Move();
+	R81[80] = zvr81 ^ ner81;
+	R81[79] = R81[79] ^ zvr81;
+	R81[48] = R81[48] ^ zvr81;
+	R81[16] = R81[16] ^ zvr81;
+	return ner81;
+}
+
+void BscF::R81_start() {
+	int i;
+	for(i = 0; i < 81; i++) {
+		R81_step();
+		R81[80] = R81[80] ^ Wk[i % 10];
+	}
+	for(i = 0; i < Krok; i++)
+		R81_step();
+}
+
+void BscF::MACDummy() {
+	for(int k = 0; k < Krok; k++)
+		MAC_step();
+}
+
+void BscF::MACGen(const char *s, const char *lim) {
+	int i;
+	MAC_init();
+	while(s < lim) {
+		MAC_step();
+		Q81[80] = Q81[80] ^ *s++;
+	}
+	MACDummy();
+	for(i = 0; i < 10; i++)
+		IV[i] = Q81[80 - i];
+}
+
+void BscF::Start() {
+	R81_init();
+	R81_start();
+}
+
+String EncodeBscF(const String& src) {
+	String result;
+	BscF f;
+	const char *lim = src.End();
+	f.MACGen(src, lim);
+	memcpy(f.Wk, f.IV, 10);
+	f.Start();
+	result.Cat((const char *)f.IV, 10);
+	for(const char *s = src; s < lim; s++)
+		result.Cat(*s ^ f.R81_step());
+	for(int i = 0; i < 10; i++)
+		result.Cat(f.IV[i] ^ f.R81_step());
+	return result;
+}
+
+String DecodeBscF(const String& src) {
+	if(src.GetLength() <= 20)
+		return String::GetVoid();
+	BscF f;
+	String result;
+	const char *s = ~src + 10;
+	const char *lim = src.End() - 10;
+	f.MAC_init();
+	memcpy(f.Wk, src, 10);
+	f.Start();
+	while(s < lim) {
+		byte b = *s++ ^ f.R81_step();
+		result.Cat(b);
+		f.MAC_step();
+		f.Q81[80] ^= b;
+	}
+	f.MACDummy();
+	for(int i = 0; i < 10; i++)
+		if((byte)*s++ != (f.R81_step() ^ f.Q81[80 - i])) return String::GetVoid();
+	return result;
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc2/Crypto/Copying b/archive/uppsrc/Crypto/Copying
similarity index 100%
rename from uppsrc2/Crypto/Copying
rename to archive/uppsrc/Crypto/Copying
diff --git a/uppsrc2/Crypto/Crypto.dsp b/archive/uppsrc/Crypto/Crypto.dsp
similarity index 96%
rename from uppsrc2/Crypto/Crypto.dsp
rename to archive/uppsrc/Crypto/Crypto.dsp
index e682293eb..911a47a2c 100644
--- a/uppsrc2/Crypto/Crypto.dsp
+++ b/archive/uppsrc/Crypto/Crypto.dsp
@@ -1,104 +1,104 @@
-# Microsoft Developer Studio Project File - Name="Crypto" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=Crypto - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "Crypto.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "Crypto.mak" CFG="Crypto - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Crypto - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "Crypto - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Crypto - Win32 Release"
-
-# PROP BASE Use_MFC 2
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 1
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x405 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "Crypto - Win32 Debug"
-
-# PROP BASE Use_MFC 2
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 1
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x405 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "Crypto - Win32 Release"
-# Name "Crypto - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\BscF.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Sha1.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\INCLUDE\Crypto.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="Crypto" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=Crypto - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "Crypto.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "Crypto.mak" CFG="Crypto - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Crypto - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "Crypto - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Crypto - Win32 Release"
+
+# PROP BASE Use_MFC 2
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 1
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "_AFXDLL"
+# ADD RSC /l 0x405 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "Crypto - Win32 Debug"
+
+# PROP BASE Use_MFC 2
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 1
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "_AFXDLL"
+# ADD RSC /l 0x405 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "Crypto - Win32 Release"
+# Name "Crypto - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\BscF.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Sha1.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\INCLUDE\Crypto.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/uppsrc2/Crypto/Crypto.h b/archive/uppsrc/Crypto/Crypto.h
similarity index 95%
rename from uppsrc2/Crypto/Crypto.h
rename to archive/uppsrc/Crypto/Crypto.h
index c3ae188a5..ed09523ed 100644
--- a/uppsrc2/Crypto/Crypto.h
+++ b/archive/uppsrc/Crypto/Crypto.h
@@ -1,35 +1,35 @@
-#ifndef CRYPTO_H
-#define CRYPTO_H
-
-#include <Core/Core.h>
-
-NAMESPACE_UPP
-
-void   SHA1Transform(dword state[5], byte buffer[64]);
-void   SHA1Init(dword state[5]);
-void   SHA1Size(byte buffer[64], dword size);
-String SHA1(const void *s, dword size);
-String SHA1(const String& s);
-
-class Sha1 {
-	dword state[5];
-	byte  buffer[64];
-	int   pos;
-	dword size;
-
-public:
-	void    Put(const void *data, dword length);
-	void    Put(const String& s)                      { Put(s, s.GetLength()); }
-	String  Finish();
-	dword   GetSize()                                 { return size; }
-
-	Sha1();
-	~Sha1();
-};
-
-String EncodeBscF(const String& src);
-String DecodeBscF(const String& src);
-
-END_UPP_NAMESPACE
-
-#endif
+#ifndef CRYPTO_H
+#define CRYPTO_H
+
+#include <Core/Core.h>
+
+NAMESPACE_UPP
+
+void   SHA1Transform(dword state[5], byte buffer[64]);
+void   SHA1Init(dword state[5]);
+void   SHA1Size(byte buffer[64], dword size);
+String SHA1(const void *s, dword size);
+String SHA1(const String& s);
+
+class Sha1 {
+	dword state[5];
+	byte  buffer[64];
+	int   pos;
+	dword size;
+
+public:
+	void    Put(const void *data, dword length);
+	void    Put(const String& s)                      { Put(s, s.GetLength()); }
+	String  Finish();
+	dword   GetSize()                                 { return size; }
+
+	Sha1();
+	~Sha1();
+};
+
+String EncodeBscF(const String& src);
+String DecodeBscF(const String& src);
+
+END_UPP_NAMESPACE
+
+#endif
diff --git a/uppsrc2/Crypto/Crypto.upp b/archive/uppsrc/Crypto/Crypto.upp
similarity index 89%
rename from uppsrc2/Crypto/Crypto.upp
rename to archive/uppsrc/Crypto/Crypto.upp
index fce0f24d7..20bf39e61 100644
--- a/uppsrc2/Crypto/Crypto.upp
+++ b/archive/uppsrc/Crypto/Crypto.upp
@@ -1,10 +1,10 @@
-uses
-	Core;
-
-file
-	Crypto.h,
-	BscF.cpp,
-	Sha1.cpp,
-	Info readonly separator,
-	Copying;
-
+uses
+	Core;
+
+file
+	Crypto.h,
+	BscF.cpp,
+	Sha1.cpp,
+	Info readonly separator,
+	Copying;
+
diff --git a/uppsrc2/Crypto/Sha1.cpp b/archive/uppsrc/Crypto/Sha1.cpp
similarity index 96%
rename from uppsrc2/Crypto/Sha1.cpp
rename to archive/uppsrc/Crypto/Sha1.cpp
index 5931adcd5..b1753ea53 100644
--- a/uppsrc2/Crypto/Sha1.cpp
+++ b/archive/uppsrc/Crypto/Sha1.cpp
@@ -1,176 +1,176 @@
-#include "Crypto.h"
-
-
-NAMESPACE_UPP
-
-/*
-SHA-1 in C
-By Steve Reid <steve@edmweb.com>
-100% Public Domain
-
-Test Vectors (from FIPS PUB 180-1)
-"abc"
-  A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
-"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
-  84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
-A million repetitions of "a"
-  34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
-*/
-
-/* Hash a single 512-bit block. This is the core of the algorithm. */
-/* blk0() and blk() perform the initial expand. */
-/* I got the idea of expanding during the round function from SSLeay */
-
-#ifdef COMPILER_MSC
-#define rol(value, bits) _rotl(value, bits)
-#else
-#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
-#endif
-
-#define blk0(i) (block[i] = (rol(block[i],24)&0xFF00FF00)|(rol(block[i],8)&0x00FF00FF))
-#define blk(i) (block[i&15] = rol(block[(i+13)&15]^block[(i+8)&15] \
-               ^block[(i+2)&15]^block[i&15],1))
-#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
-#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
-#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
-
-void SHA1Transform(dword state[5], byte buffer[64]) {
-	dword a, b, c, d, e;
-    dword *block = (dword *)buffer;
-    a = state[0];
-    b = state[1];
-    c = state[2];
-    d = state[3];
-    e = state[4];
-    /* 4 rounds of 20 operations each. Loop unrolled. */
-    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
-    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
-    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
-    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
-    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
-    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
-    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
-    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
-    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
-    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
-    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
-    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
-    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
-    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
-    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
-    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
-    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
-    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
-    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
-    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
-    state[0] += a;
-    state[1] += b;
-    state[2] += c;
-    state[3] += d;
-    state[4] += e;
-	a = b = c = d = e = 0;
-}
-
-void SHA1Init(dword state[5]) {
-    state[0] = 0x67452301;
-    state[1] = 0xEFCDAB89;
-    state[2] = 0x98BADCFE;
-    state[3] = 0x10325476;
-    state[4] = 0xC3D2E1F0;
-}
-
-void SHA1Size(byte buffer[64], dword size) {
-	buffer[63] = byte(size << 3);
-	buffer[62] = byte(size >> 5);
-	buffer[61] = byte(size >> 13);
-	buffer[60] = byte(size >> 21);
-	buffer[59] = byte(size >> 29);
-	buffer[58] = 0;
-	buffer[57] = 0;
-	buffer[56] = 0;
-}
-
-String SHA1Result(dword state[5]) {
-	String r;
-    for(int i = 0; i < 5; i++) {
-		const byte *h = (const byte *)&state[i];
-		if(i) r.Cat(' ');
-		r.Cat(Format("%02X%02X%02X%02X", h[3], h[2], h[1], h[0]));
-	}
-	return r;
-}
-
-String SHA1(const void *data, dword length) {
-	dword state[5];
-	byte buffer[64];
-	dword pos = 0;
-	SHA1Init(state);
-	const char *s = (const char *) data;
-	dword size = length;
-	while(size >= 64) {
-		memcpy(buffer, s, 64);
-		SHA1Transform(state, buffer);
-		size -= 64;
-		s += 64;
-	}
-	memcpy(buffer, s, size);
-	memset(buffer + size, 0, 64 - size);
-	buffer[size] = 128;
-	if(size > 55) {
-		SHA1Transform(state, buffer);
-		memset(buffer, 0, 64);
-	}
-	SHA1Size(buffer, length);
-	SHA1Transform(state, buffer);
-	String r = SHA1Result(state);
-	size = 0;
-	memset(buffer, 0, sizeof(buffer));
-	memset(state, 0, sizeof(state));
-	return r;
-}
-
-String SHA1(const String& s) {
-	return SHA1(s, s.GetLength());
-}
-
-String Sha1::Finish() {
-	memset(buffer + pos, 0, 64 - pos);
-	buffer[pos] = 128;
-	if(pos > 55) {
-		SHA1Transform(state, buffer);
-		memset(buffer, 0, 64);
-	}
-	SHA1Size(buffer, size);
-	SHA1Transform(state, buffer);
-	return SHA1Result(state);
-}
-
-void Sha1::Put(const void *data, dword length) {
-	const byte *s = (const byte *)data;
-	size += length;
-	while(pos + length >= 64) {
-		int n = 64 - pos;
-		memcpy(buffer + pos, s, n);
-		SHA1Transform(state, buffer);
-		s += n;
-		length -= n;
-		pos = 0;
-	}
-	memcpy(buffer + pos, s, length);
-	pos += length;
-}
-
-Sha1::Sha1() {
-	SHA1Init(state);
-	pos = 0;
-	size = 0;
-}
-
-Sha1::~Sha1() {
-	memset(buffer, 0, sizeof(buffer));
-	memset(state, 0, sizeof(state));
-}
-
-END_UPP_NAMESPACE
+#include "Crypto.h"
+
+
+NAMESPACE_UPP
+
+/*
+SHA-1 in C
+By Steve Reid <steve@edmweb.com>
+100% Public Domain
+
+Test Vectors (from FIPS PUB 180-1)
+"abc"
+  A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
+"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+  84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
+A million repetitions of "a"
+  34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
+*/
+
+/* Hash a single 512-bit block. This is the core of the algorithm. */
+/* blk0() and blk() perform the initial expand. */
+/* I got the idea of expanding during the round function from SSLeay */
+
+#ifdef COMPILER_MSC
+#define rol(value, bits) _rotl(value, bits)
+#else
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+#endif
+
+#define blk0(i) (block[i] = (rol(block[i],24)&0xFF00FF00)|(rol(block[i],8)&0x00FF00FF))
+#define blk(i) (block[i&15] = rol(block[(i+13)&15]^block[(i+8)&15] \
+               ^block[(i+2)&15]^block[i&15],1))
+#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
+#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+
+void SHA1Transform(dword state[5], byte buffer[64]) {
+	dword a, b, c, d, e;
+    dword *block = (dword *)buffer;
+    a = state[0];
+    b = state[1];
+    c = state[2];
+    d = state[3];
+    e = state[4];
+    /* 4 rounds of 20 operations each. Loop unrolled. */
+    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+    state[0] += a;
+    state[1] += b;
+    state[2] += c;
+    state[3] += d;
+    state[4] += e;
+	a = b = c = d = e = 0;
+}
+
+void SHA1Init(dword state[5]) {
+    state[0] = 0x67452301;
+    state[1] = 0xEFCDAB89;
+    state[2] = 0x98BADCFE;
+    state[3] = 0x10325476;
+    state[4] = 0xC3D2E1F0;
+}
+
+void SHA1Size(byte buffer[64], dword size) {
+	buffer[63] = byte(size << 3);
+	buffer[62] = byte(size >> 5);
+	buffer[61] = byte(size >> 13);
+	buffer[60] = byte(size >> 21);
+	buffer[59] = byte(size >> 29);
+	buffer[58] = 0;
+	buffer[57] = 0;
+	buffer[56] = 0;
+}
+
+String SHA1Result(dword state[5]) {
+	String r;
+    for(int i = 0; i < 5; i++) {
+		const byte *h = (const byte *)&state[i];
+		if(i) r.Cat(' ');
+		r.Cat(Format("%02X%02X%02X%02X", h[3], h[2], h[1], h[0]));
+	}
+	return r;
+}
+
+String SHA1(const void *data, dword length) {
+	dword state[5];
+	byte buffer[64];
+	dword pos = 0;
+	SHA1Init(state);
+	const char *s = (const char *) data;
+	dword size = length;
+	while(size >= 64) {
+		memcpy(buffer, s, 64);
+		SHA1Transform(state, buffer);
+		size -= 64;
+		s += 64;
+	}
+	memcpy(buffer, s, size);
+	memset(buffer + size, 0, 64 - size);
+	buffer[size] = 128;
+	if(size > 55) {
+		SHA1Transform(state, buffer);
+		memset(buffer, 0, 64);
+	}
+	SHA1Size(buffer, length);
+	SHA1Transform(state, buffer);
+	String r = SHA1Result(state);
+	size = 0;
+	memset(buffer, 0, sizeof(buffer));
+	memset(state, 0, sizeof(state));
+	return r;
+}
+
+String SHA1(const String& s) {
+	return SHA1(s, s.GetLength());
+}
+
+String Sha1::Finish() {
+	memset(buffer + pos, 0, 64 - pos);
+	buffer[pos] = 128;
+	if(pos > 55) {
+		SHA1Transform(state, buffer);
+		memset(buffer, 0, 64);
+	}
+	SHA1Size(buffer, size);
+	SHA1Transform(state, buffer);
+	return SHA1Result(state);
+}
+
+void Sha1::Put(const void *data, dword length) {
+	const byte *s = (const byte *)data;
+	size += length;
+	while(pos + length >= 64) {
+		int n = 64 - pos;
+		memcpy(buffer + pos, s, n);
+		SHA1Transform(state, buffer);
+		s += n;
+		length -= n;
+		pos = 0;
+	}
+	memcpy(buffer + pos, s, length);
+	pos += length;
+}
+
+Sha1::Sha1() {
+	SHA1Init(state);
+	pos = 0;
+	size = 0;
+}
+
+Sha1::~Sha1() {
+	memset(buffer, 0, sizeof(buffer));
+	memset(state, 0, sizeof(state));
+}
+
+END_UPP_NAMESPACE
diff --git a/uppsrc2/OleDB/Copying b/archive/uppsrc/OleDB/Copying
similarity index 100%
rename from uppsrc2/OleDB/Copying
rename to archive/uppsrc/OleDB/Copying
diff --git a/uppsrc2/OleDB/OleDB.cpp b/archive/uppsrc/OleDB/OleDB.cpp
similarity index 100%
rename from uppsrc2/OleDB/OleDB.cpp
rename to archive/uppsrc/OleDB/OleDB.cpp
diff --git a/uppsrc2/OleDB/OleDB.h b/archive/uppsrc/OleDB/OleDB.h
similarity index 100%
rename from uppsrc2/OleDB/OleDB.h
rename to archive/uppsrc/OleDB/OleDB.h
diff --git a/uppsrc2/OleDB/OleDB.upp b/archive/uppsrc/OleDB/OleDB.upp
similarity index 100%
rename from uppsrc2/OleDB/OleDB.upp
rename to archive/uppsrc/OleDB/OleDB.upp
diff --git a/uppsrc2/OleDB/OleDBSchema.h b/archive/uppsrc/OleDB/OleDBSchema.h
similarity index 100%
rename from uppsrc2/OleDB/OleDBSchema.h
rename to archive/uppsrc/OleDB/OleDBSchema.h
diff --git a/uppsrc2/TServ/Copying b/archive/uppsrc/TServ/Copying
similarity index 100%
rename from uppsrc2/TServ/Copying
rename to archive/uppsrc/TServ/Copying
diff --git a/uppsrc2/TServ/Makefile b/archive/uppsrc/TServ/Makefile
similarity index 96%
rename from uppsrc2/TServ/Makefile
rename to archive/uppsrc/TServ/Makefile
index 1044673e9..46cb3e379 100644
--- a/uppsrc2/TServ/Makefile
+++ b/archive/uppsrc/TServ/Makefile
@@ -1,2616 +1,2616 @@
-UPPDIR1 = /upp/uppsrc/
-
-UPPOUT = /uppout/
-CINC =  -I$(UPPDIR1) -I/usr/include/freetype2
-Macro =  -DflagGCC32 -DflagLINUX
-CC = c++ -c -O1 -ffunction-sections
-CFLAGS = $(CC) -x c
-CPPFLAGS = $(CC) -x c++
-LIBPATH =  -L"/usr/X11R6/lib" -L"/usr/local/src/arptables-v0.0.3-2/"
-AR = ar -sr
-OutDir_Web_TServ = $(UPPOUT)Web/TServ/GCC32-Gcc32-Linux-Main/
-Macro_Web_TServ = $(Macro) -DflagMAIN
-OutDir_Web = $(UPPOUT)Web/GCC32-Gcc32-Linux/
-Macro_Web = $(Macro)
-OutDir_plugin_bz2 = $(UPPOUT)plugin/bz2/GCC32-Gcc32-Linux/
-Macro_plugin_bz2 = $(Macro)
-OutDir_Core = $(UPPOUT)Core/GCC32-Gcc32-Linux/
-Macro_Core = $(Macro)
-OutDir_plugin_z = $(UPPOUT)plugin/z/GCC32-Gcc32-Linux/
-Macro_plugin_z = $(Macro)
-
-OutDir = $(OutDir_Web_TServ)
-OutFile = $(OutDir)TServ
-
-.PHONY: all
-all: install $(OutFile)
-
-.PHONY: install
-install:
-	-mkdir -p $(OutDir)
-	-mkdir -p $(OutDir_Web_TServ)
-	-mkdir -p $(OutDir_Web)
-	-mkdir -p $(OutDir_plugin_bz2)
-	-mkdir -p $(OutDir_Core)
-	-mkdir -p $(OutDir_plugin_z)
-
-$(OutFile):  \
-	$(OutDir_Web_TServ)tserv.o \
-	$(OutDir_Web)Web_init.o \
-	$(OutDir_Web)Web.a \
-	$(OutDir_plugin_bz2)bz2.a \
-	$(OutDir_Core)Core.a \
-	$(OutDir_plugin_z)z.a
-	c++ -static -o $(OutFile) -Wl,-s $(LIBPATH) -Wl,-O,2 $(LINKOPTIONS) \
-		$(OutDir_Web_TServ)tserv.o \
-		-Wl,--start-group  \
-		$(OutDir_Web)Web_init.o \
-			$(OutDir_Web)Web.a \
-			$(OutDir_plugin_bz2)bz2.a \
-			$(OutDir_Core)Core.a \
-			$(OutDir_plugin_z)z.a \
-			-lpthread \
-			-ldl \
-			-lz \
-		-Wl,--end-group
-
-
-$(OutDir_Web_TServ)tserv.o: $(UPPDIR1)Web/TServ/tserv.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h \
-	$(UPPDIR1)plugin/bz2/bz2.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/TServ/version.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web_TServ)  $(UPPDIR1)Web/TServ/tserv.cpp -o $(OutDir_Web_TServ)tserv.o
-
-$(OutDir_Web)Web_init.o: $(UPPDIR1)Web/Web_init.icpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t.h \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h \
-	$(UPPDIR1)Web/Web.t
-	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/Web_init.icpp -o $(OutDir_Web)Web_init.o
-
-$(OutDir_Web)util.o: $(UPPDIR1)Web/util.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/util.cpp -o $(OutDir_Web)util.o
-
-$(OutDir_Web)md5.o: $(UPPDIR1)Web/md5.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/md5.cpp -o $(OutDir_Web)md5.o
-
-$(OutDir_Web)html.o: $(UPPDIR1)Web/html.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/html.cpp -o $(OutDir_Web)html.o
-
-$(OutDir_Web)socket.o: $(UPPDIR1)Web/socket.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/socket.cpp -o $(OutDir_Web)socket.o
-
-$(OutDir_Web)httpsrv.o: $(UPPDIR1)Web/httpsrv.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/httpsrv.cpp -o $(OutDir_Web)httpsrv.o
-
-$(OutDir_Web)httpcli.o: $(UPPDIR1)Web/httpcli.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/httpcli.cpp -o $(OutDir_Web)httpcli.o
-
-$(OutDir_Web)auth.o: $(UPPDIR1)Web/auth.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/auth.cpp -o $(OutDir_Web)auth.o
-
-$(OutDir_Web)smtp.o: $(UPPDIR1)Web/smtp.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/smtp.cpp -o $(OutDir_Web)smtp.o
-
-$(OutDir_Web)sproc.o: $(UPPDIR1)Web/sproc.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/sproc.cpp -o $(OutDir_Web)sproc.o
-
-$(OutDir_Web)Web.a: \
-	$(OutDir_Web)util.o \
-	$(OutDir_Web)md5.o \
-	$(OutDir_Web)html.o \
-	$(OutDir_Web)socket.o \
-	$(OutDir_Web)httpsrv.o \
-	$(OutDir_Web)httpcli.o \
-	$(OutDir_Web)auth.o \
-	$(OutDir_Web)smtp.o \
-	$(OutDir_Web)sproc.o
-	$(AR) $(OutDir_Web)Web.a \
-		$(OutDir_Web)util.o \
-		$(OutDir_Web)md5.o \
-		$(OutDir_Web)html.o \
-		$(OutDir_Web)socket.o \
-		$(OutDir_Web)httpsrv.o \
-		$(OutDir_Web)httpcli.o \
-		$(OutDir_Web)auth.o \
-		$(OutDir_Web)smtp.o \
-		$(OutDir_Web)sproc.o
-
-$(OutDir_plugin_bz2)bz2upp.o: $(UPPDIR1)plugin/bz2/bz2upp.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h \
-	$(UPPDIR1)plugin/bz2/bz2.h \
-	$(UPPDIR1)plugin/bz2/lib/bzlib.h
-	$(CPPFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/bz2upp.cpp -o $(OutDir_plugin_bz2)bz2upp.o
-
-$(OutDir_plugin_bz2)blocksort.o: $(UPPDIR1)plugin/bz2/lib/blocksort.c \
-	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
-	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/blocksort.c -o $(OutDir_plugin_bz2)blocksort.o
-
-$(OutDir_plugin_bz2)bzlib.o: $(UPPDIR1)plugin/bz2/lib/bzlib.c \
-	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
-	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/bzlib.c -o $(OutDir_plugin_bz2)bzlib.o
-
-$(OutDir_plugin_bz2)compress.o: $(UPPDIR1)plugin/bz2/lib/compress.c \
-	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
-	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/compress.c -o $(OutDir_plugin_bz2)compress.o
-
-$(OutDir_plugin_bz2)crctable.o: $(UPPDIR1)plugin/bz2/lib/crctable.c \
-	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
-	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/crctable.c -o $(OutDir_plugin_bz2)crctable.o
-
-$(OutDir_plugin_bz2)decompress.o: $(UPPDIR1)plugin/bz2/lib/decompress.c \
-	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
-	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/decompress.c -o $(OutDir_plugin_bz2)decompress.o
-
-$(OutDir_plugin_bz2)huffman.o: $(UPPDIR1)plugin/bz2/lib/huffman.c \
-	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
-	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/huffman.c -o $(OutDir_plugin_bz2)huffman.o
-
-$(OutDir_plugin_bz2)randtable.o: $(UPPDIR1)plugin/bz2/lib/randtable.c \
-	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
-	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/randtable.c -o $(OutDir_plugin_bz2)randtable.o
-
-$(OutDir_plugin_bz2)bz2.a: \
-	$(OutDir_plugin_bz2)bz2upp.o \
-	$(OutDir_plugin_bz2)blocksort.o \
-	$(OutDir_plugin_bz2)bzlib.o \
-	$(OutDir_plugin_bz2)compress.o \
-	$(OutDir_plugin_bz2)crctable.o \
-	$(OutDir_plugin_bz2)decompress.o \
-	$(OutDir_plugin_bz2)huffman.o \
-	$(OutDir_plugin_bz2)randtable.o
-	$(AR) $(OutDir_plugin_bz2)bz2.a \
-		$(OutDir_plugin_bz2)bz2upp.o \
-		$(OutDir_plugin_bz2)blocksort.o \
-		$(OutDir_plugin_bz2)bzlib.o \
-		$(OutDir_plugin_bz2)compress.o \
-		$(OutDir_plugin_bz2)crctable.o \
-		$(OutDir_plugin_bz2)decompress.o \
-		$(OutDir_plugin_bz2)huffman.o \
-		$(OutDir_plugin_bz2)randtable.o
-
-$(OutDir_Core)Mt.o: $(UPPDIR1)Core/Mt.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Mt.cpp -o $(OutDir_Core)Mt.o
-
-$(OutDir_Core)Thread.o: $(UPPDIR1)Core/Thread.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Thread.cpp -o $(OutDir_Core)Thread.o
-
-$(OutDir_Core)OL_Set.o: $(UPPDIR1)Core/OL_Set.cpp
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/OL_Set.cpp -o $(OutDir_Core)OL_Set.o
-
-$(OutDir_Core)heap.o: $(UPPDIR1)Core/heap.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/heap.cpp -o $(OutDir_Core)heap.o
-
-$(OutDir_Core)heapdbg.o: $(UPPDIR1)Core/heapdbg.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/heapdbg.cpp -o $(OutDir_Core)heapdbg.o
-
-$(OutDir_Core)String.o: $(UPPDIR1)Core/String.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/String.cpp -o $(OutDir_Core)String.o
-
-$(OutDir_Core)StrUtil.o: $(UPPDIR1)Core/StrUtil.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/StrUtil.cpp -o $(OutDir_Core)StrUtil.o
-
-$(OutDir_Core)CharSet.o: $(UPPDIR1)Core/CharSet.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/CharSet.cpp -o $(OutDir_Core)CharSet.o
-
-$(OutDir_Core)Path.o: $(UPPDIR1)Core/Path.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Path.cpp -o $(OutDir_Core)Path.o
-
-$(OutDir_Core)App.o: $(UPPDIR1)Core/App.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/App.cpp -o $(OutDir_Core)App.o
-
-$(OutDir_Core)Stream.o: $(UPPDIR1)Core/Stream.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Stream.cpp -o $(OutDir_Core)Stream.o
-
-$(OutDir_Core)BlockStream.o: $(UPPDIR1)Core/BlockStream.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/BlockStream.cpp -o $(OutDir_Core)BlockStream.o
-
-$(OutDir_Core)Log.o: $(UPPDIR1)Core/Log.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Log.cpp -o $(OutDir_Core)Log.o
-
-$(OutDir_Core)Debug.o: $(UPPDIR1)Core/Debug.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Debug.cpp -o $(OutDir_Core)Debug.o
-
-$(OutDir_Core)Util.o: $(UPPDIR1)Core/Util.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Util.cpp -o $(OutDir_Core)Util.o
-
-$(OutDir_Core)mathutil.o: $(UPPDIR1)Core/mathutil.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/mathutil.cpp -o $(OutDir_Core)mathutil.o
-
-$(OutDir_Core)Vcont.o: $(UPPDIR1)Core/Vcont.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Vcont.cpp -o $(OutDir_Core)Vcont.o
-
-$(OutDir_Core)Hash.o: $(UPPDIR1)Core/Hash.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Hash.cpp -o $(OutDir_Core)Hash.o
-
-$(OutDir_Core)Callback.o: $(UPPDIR1)Core/Callback.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Callback.cpp -o $(OutDir_Core)Callback.o
-
-$(OutDir_Core)Color.o: $(UPPDIR1)Core/Color.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Color.cpp -o $(OutDir_Core)Color.o
-
-$(OutDir_Core)Gtypes.o: $(UPPDIR1)Core/Gtypes.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Gtypes.cpp -o $(OutDir_Core)Gtypes.o
-
-$(OutDir_Core)TimeDate.o: $(UPPDIR1)Core/TimeDate.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/TimeDate.cpp -o $(OutDir_Core)TimeDate.o
-
-$(OutDir_Core)Value.o: $(UPPDIR1)Core/Value.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Value.cpp -o $(OutDir_Core)Value.o
-
-$(OutDir_Core)Convert.o: $(UPPDIR1)Core/Convert.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Convert.cpp -o $(OutDir_Core)Convert.o
-
-$(OutDir_Core)Format.o: $(UPPDIR1)Core/Format.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Format.cpp -o $(OutDir_Core)Format.o
-
-$(OutDir_Core)t.o: $(UPPDIR1)Core/t.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Core.t \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t.h \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/t.cpp -o $(OutDir_Core)t.o
-
-$(OutDir_Core)Lang.o: $(UPPDIR1)Core/Lang.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Lang.cpp -o $(OutDir_Core)Lang.o
-
-$(OutDir_Core)parser.o: $(UPPDIR1)Core/parser.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/parser.cpp -o $(OutDir_Core)parser.o
-
-$(OutDir_Core)XML.o: $(UPPDIR1)Core/XML.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/XML.cpp -o $(OutDir_Core)XML.o
-
-$(OutDir_Core)Xmlize.o: $(UPPDIR1)Core/Xmlize.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Xmlize.cpp -o $(OutDir_Core)Xmlize.o
-
-$(OutDir_Core)Uuid.o: $(UPPDIR1)Core/Uuid.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Uuid.cpp -o $(OutDir_Core)Uuid.o
-
-$(OutDir_Core)Ptr.o: $(UPPDIR1)Core/Ptr.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Ptr.cpp -o $(OutDir_Core)Ptr.o
-
-$(OutDir_Core)z.o: $(UPPDIR1)Core/z.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h \
-	$(UPPDIR1)plugin/z/lib/zconf.h \
-	$(UPPDIR1)plugin/z/lib/zlib.h \
-	$(UPPDIR1)plugin/z/lib/zutil.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/z.cpp -o $(OutDir_Core)z.o
-
-$(OutDir_Core)Topic.o: $(UPPDIR1)Core/Topic.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Topic.cpp -o $(OutDir_Core)Topic.o
-
-$(OutDir_Core)Dli.o: $(UPPDIR1)Core/Dli.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Dli.cpp -o $(OutDir_Core)Dli.o
-
-$(OutDir_Core)Win32Com.o: $(UPPDIR1)Core/Win32Com.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/z.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Win32Com.cpp -o $(OutDir_Core)Win32Com.o
-
-$(OutDir_Core)Core.a: \
-	$(OutDir_Core)Mt.o \
-	$(OutDir_Core)Thread.o \
-	$(OutDir_Core)OL_Set.o \
-	$(OutDir_Core)heap.o \
-	$(OutDir_Core)heapdbg.o \
-	$(OutDir_Core)String.o \
-	$(OutDir_Core)StrUtil.o \
-	$(OutDir_Core)CharSet.o \
-	$(OutDir_Core)Path.o \
-	$(OutDir_Core)App.o \
-	$(OutDir_Core)Stream.o \
-	$(OutDir_Core)BlockStream.o \
-	$(OutDir_Core)Log.o \
-	$(OutDir_Core)Debug.o \
-	$(OutDir_Core)Util.o \
-	$(OutDir_Core)mathutil.o \
-	$(OutDir_Core)Vcont.o \
-	$(OutDir_Core)Hash.o \
-	$(OutDir_Core)Callback.o \
-	$(OutDir_Core)Color.o \
-	$(OutDir_Core)Gtypes.o \
-	$(OutDir_Core)TimeDate.o \
-	$(OutDir_Core)Value.o \
-	$(OutDir_Core)Convert.o \
-	$(OutDir_Core)Format.o \
-	$(OutDir_Core)t.o \
-	$(OutDir_Core)Lang.o \
-	$(OutDir_Core)parser.o \
-	$(OutDir_Core)XML.o \
-	$(OutDir_Core)Xmlize.o \
-	$(OutDir_Core)Uuid.o \
-	$(OutDir_Core)Ptr.o \
-	$(OutDir_Core)z.o \
-	$(OutDir_Core)Topic.o \
-	$(OutDir_Core)Dli.o \
-	$(OutDir_Core)Win32Com.o
-	$(AR) $(OutDir_Core)Core.a \
-		$(OutDir_Core)Mt.o \
-		$(OutDir_Core)Thread.o \
-		$(OutDir_Core)OL_Set.o \
-		$(OutDir_Core)heap.o \
-		$(OutDir_Core)heapdbg.o \
-		$(OutDir_Core)String.o \
-		$(OutDir_Core)StrUtil.o \
-		$(OutDir_Core)CharSet.o \
-		$(OutDir_Core)Path.o \
-		$(OutDir_Core)App.o \
-		$(OutDir_Core)Stream.o \
-		$(OutDir_Core)BlockStream.o \
-		$(OutDir_Core)Log.o \
-		$(OutDir_Core)Debug.o \
-		$(OutDir_Core)Util.o \
-		$(OutDir_Core)mathutil.o \
-		$(OutDir_Core)Vcont.o \
-		$(OutDir_Core)Hash.o \
-		$(OutDir_Core)Callback.o \
-		$(OutDir_Core)Color.o \
-		$(OutDir_Core)Gtypes.o \
-		$(OutDir_Core)TimeDate.o \
-		$(OutDir_Core)Value.o \
-		$(OutDir_Core)Convert.o \
-		$(OutDir_Core)Format.o \
-		$(OutDir_Core)t.o \
-		$(OutDir_Core)Lang.o \
-		$(OutDir_Core)parser.o \
-		$(OutDir_Core)XML.o \
-		$(OutDir_Core)Xmlize.o \
-		$(OutDir_Core)Uuid.o \
-		$(OutDir_Core)Ptr.o \
-		$(OutDir_Core)z.o \
-		$(OutDir_Core)Topic.o \
-		$(OutDir_Core)Dli.o \
-		$(OutDir_Core)Win32Com.o
-
-$(OutDir_plugin_z)adler32.o: $(UPPDIR1)plugin/z/lib/adler32.c \
-	$(UPPDIR1)plugin/z/lib/zconf.h \
-	$(UPPDIR1)plugin/z/lib/zlib.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/adler32.c -o $(OutDir_plugin_z)adler32.o
-
-$(OutDir_plugin_z)compress.o: $(UPPDIR1)plugin/z/lib/compress.c \
-	$(UPPDIR1)plugin/z/lib/zconf.h \
-	$(UPPDIR1)plugin/z/lib/zlib.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/compress.c -o $(OutDir_plugin_z)compress.o
-
-$(OutDir_plugin_z)crc32.o: $(UPPDIR1)plugin/z/lib/crc32.c \
-	$(UPPDIR1)plugin/z/lib/zconf.h \
-	$(UPPDIR1)plugin/z/lib/zlib.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/crc32.c -o $(OutDir_plugin_z)crc32.o
-
-$(OutDir_plugin_z)deflate.o: $(UPPDIR1)plugin/z/lib/deflate.c \
-	$(UPPDIR1)plugin/z/lib/deflate.h \
-	$(UPPDIR1)plugin/z/lib/zconf.h \
-	$(UPPDIR1)plugin/z/lib/zlib.h \
-	$(UPPDIR1)plugin/z/lib/zutil.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/deflate.c -o $(OutDir_plugin_z)deflate.o
-
-$(OutDir_plugin_z)gzio.o: $(UPPDIR1)plugin/z/lib/gzio.c \
-	$(UPPDIR1)plugin/z/lib/zconf.h \
-	$(UPPDIR1)plugin/z/lib/zlib.h \
-	$(UPPDIR1)plugin/z/lib/zutil.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/gzio.c -o $(OutDir_plugin_z)gzio.o
-
-$(OutDir_plugin_z)infblock.o: $(UPPDIR1)plugin/z/lib/infblock.c \
-	$(UPPDIR1)plugin/z/lib/infblock.h \
-	$(UPPDIR1)plugin/z/lib/infcodes.h \
-	$(UPPDIR1)plugin/z/lib/inftrees.h \
-	$(UPPDIR1)plugin/z/lib/infutil.h \
-	$(UPPDIR1)plugin/z/lib/zconf.h \
-	$(UPPDIR1)plugin/z/lib/zlib.h \
-	$(UPPDIR1)plugin/z/lib/zutil.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/infblock.c -o $(OutDir_plugin_z)infblock.o
-
-$(OutDir_plugin_z)infcodes.o: $(UPPDIR1)plugin/z/lib/infcodes.c \
-	$(UPPDIR1)plugin/z/lib/infblock.h \
-	$(UPPDIR1)plugin/z/lib/infcodes.h \
-	$(UPPDIR1)plugin/z/lib/inffast.h \
-	$(UPPDIR1)plugin/z/lib/inftrees.h \
-	$(UPPDIR1)plugin/z/lib/infutil.h \
-	$(UPPDIR1)plugin/z/lib/zconf.h \
-	$(UPPDIR1)plugin/z/lib/zlib.h \
-	$(UPPDIR1)plugin/z/lib/zutil.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/infcodes.c -o $(OutDir_plugin_z)infcodes.o
-
-$(OutDir_plugin_z)inffast.o: $(UPPDIR1)plugin/z/lib/inffast.c \
-	$(UPPDIR1)plugin/z/lib/infblock.h \
-	$(UPPDIR1)plugin/z/lib/infcodes.h \
-	$(UPPDIR1)plugin/z/lib/inffast.h \
-	$(UPPDIR1)plugin/z/lib/inftrees.h \
-	$(UPPDIR1)plugin/z/lib/infutil.h \
-	$(UPPDIR1)plugin/z/lib/zconf.h \
-	$(UPPDIR1)plugin/z/lib/zlib.h \
-	$(UPPDIR1)plugin/z/lib/zutil.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/inffast.c -o $(OutDir_plugin_z)inffast.o
-
-$(OutDir_plugin_z)inflate.o: $(UPPDIR1)plugin/z/lib/inflate.c \
-	$(UPPDIR1)plugin/z/lib/infblock.h \
-	$(UPPDIR1)plugin/z/lib/zconf.h \
-	$(UPPDIR1)plugin/z/lib/zlib.h \
-	$(UPPDIR1)plugin/z/lib/zutil.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/inflate.c -o $(OutDir_plugin_z)inflate.o
-
-$(OutDir_plugin_z)inftrees.o: $(UPPDIR1)plugin/z/lib/inftrees.c \
-	$(UPPDIR1)plugin/z/lib/inffixed.h \
-	$(UPPDIR1)plugin/z/lib/inftrees.h \
-	$(UPPDIR1)plugin/z/lib/zconf.h \
-	$(UPPDIR1)plugin/z/lib/zlib.h \
-	$(UPPDIR1)plugin/z/lib/zutil.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/inftrees.c -o $(OutDir_plugin_z)inftrees.o
-
-$(OutDir_plugin_z)infutil.o: $(UPPDIR1)plugin/z/lib/infutil.c \
-	$(UPPDIR1)plugin/z/lib/infblock.h \
-	$(UPPDIR1)plugin/z/lib/infcodes.h \
-	$(UPPDIR1)plugin/z/lib/inftrees.h \
-	$(UPPDIR1)plugin/z/lib/infutil.h \
-	$(UPPDIR1)plugin/z/lib/zconf.h \
-	$(UPPDIR1)plugin/z/lib/zlib.h \
-	$(UPPDIR1)plugin/z/lib/zutil.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/infutil.c -o $(OutDir_plugin_z)infutil.o
-
-$(OutDir_plugin_z)trees.o: $(UPPDIR1)plugin/z/lib/trees.c \
-	$(UPPDIR1)plugin/z/lib/deflate.h \
-	$(UPPDIR1)plugin/z/lib/trees.h \
-	$(UPPDIR1)plugin/z/lib/zconf.h \
-	$(UPPDIR1)plugin/z/lib/zlib.h \
-	$(UPPDIR1)plugin/z/lib/zutil.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/trees.c -o $(OutDir_plugin_z)trees.o
-
-$(OutDir_plugin_z)uncompr.o: $(UPPDIR1)plugin/z/lib/uncompr.c \
-	$(UPPDIR1)plugin/z/lib/zconf.h \
-	$(UPPDIR1)plugin/z/lib/zlib.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/uncompr.c -o $(OutDir_plugin_z)uncompr.o
-
-$(OutDir_plugin_z)zutil.o: $(UPPDIR1)plugin/z/lib/zutil.c \
-	$(UPPDIR1)plugin/z/lib/zconf.h \
-	$(UPPDIR1)plugin/z/lib/zlib.h \
-	$(UPPDIR1)plugin/z/lib/zutil.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/zutil.c -o $(OutDir_plugin_z)zutil.o
-
-$(OutDir_plugin_z)z.a: \
-	$(OutDir_plugin_z)adler32.o \
-	$(OutDir_plugin_z)compress.o \
-	$(OutDir_plugin_z)crc32.o \
-	$(OutDir_plugin_z)deflate.o \
-	$(OutDir_plugin_z)gzio.o \
-	$(OutDir_plugin_z)infblock.o \
-	$(OutDir_plugin_z)infcodes.o \
-	$(OutDir_plugin_z)inffast.o \
-	$(OutDir_plugin_z)inflate.o \
-	$(OutDir_plugin_z)inftrees.o \
-	$(OutDir_plugin_z)infutil.o \
-	$(OutDir_plugin_z)trees.o \
-	$(OutDir_plugin_z)uncompr.o \
-	$(OutDir_plugin_z)zutil.o
-	$(AR) $(OutDir_plugin_z)z.a \
-		$(OutDir_plugin_z)adler32.o \
-		$(OutDir_plugin_z)compress.o \
-		$(OutDir_plugin_z)crc32.o \
-		$(OutDir_plugin_z)deflate.o \
-		$(OutDir_plugin_z)gzio.o \
-		$(OutDir_plugin_z)infblock.o \
-		$(OutDir_plugin_z)infcodes.o \
-		$(OutDir_plugin_z)inffast.o \
-		$(OutDir_plugin_z)inflate.o \
-		$(OutDir_plugin_z)inftrees.o \
-		$(OutDir_plugin_z)infutil.o \
-		$(OutDir_plugin_z)trees.o \
-		$(OutDir_plugin_z)uncompr.o \
-		$(OutDir_plugin_z)zutil.o
+UPPDIR1 = /upp/uppsrc/
+
+UPPOUT = /uppout/
+CINC =  -I$(UPPDIR1) -I/usr/include/freetype2
+Macro =  -DflagGCC32 -DflagLINUX
+CC = c++ -c -O1 -ffunction-sections
+CFLAGS = $(CC) -x c
+CPPFLAGS = $(CC) -x c++
+LIBPATH =  -L"/usr/X11R6/lib" -L"/usr/local/src/arptables-v0.0.3-2/"
+AR = ar -sr
+OutDir_Web_TServ = $(UPPOUT)Web/TServ/GCC32-Gcc32-Linux-Main/
+Macro_Web_TServ = $(Macro) -DflagMAIN
+OutDir_Web = $(UPPOUT)Web/GCC32-Gcc32-Linux/
+Macro_Web = $(Macro)
+OutDir_plugin_bz2 = $(UPPOUT)plugin/bz2/GCC32-Gcc32-Linux/
+Macro_plugin_bz2 = $(Macro)
+OutDir_Core = $(UPPOUT)Core/GCC32-Gcc32-Linux/
+Macro_Core = $(Macro)
+OutDir_plugin_z = $(UPPOUT)plugin/z/GCC32-Gcc32-Linux/
+Macro_plugin_z = $(Macro)
+
+OutDir = $(OutDir_Web_TServ)
+OutFile = $(OutDir)TServ
+
+.PHONY: all
+all: install $(OutFile)
+
+.PHONY: install
+install:
+	-mkdir -p $(OutDir)
+	-mkdir -p $(OutDir_Web_TServ)
+	-mkdir -p $(OutDir_Web)
+	-mkdir -p $(OutDir_plugin_bz2)
+	-mkdir -p $(OutDir_Core)
+	-mkdir -p $(OutDir_plugin_z)
+
+$(OutFile):  \
+	$(OutDir_Web_TServ)tserv.o \
+	$(OutDir_Web)Web_init.o \
+	$(OutDir_Web)Web.a \
+	$(OutDir_plugin_bz2)bz2.a \
+	$(OutDir_Core)Core.a \
+	$(OutDir_plugin_z)z.a
+	c++ -static -o $(OutFile) -Wl,-s $(LIBPATH) -Wl,-O,2 $(LINKOPTIONS) \
+		$(OutDir_Web_TServ)tserv.o \
+		-Wl,--start-group  \
+		$(OutDir_Web)Web_init.o \
+			$(OutDir_Web)Web.a \
+			$(OutDir_plugin_bz2)bz2.a \
+			$(OutDir_Core)Core.a \
+			$(OutDir_plugin_z)z.a \
+			-lpthread \
+			-ldl \
+			-lz \
+		-Wl,--end-group
+
+
+$(OutDir_Web_TServ)tserv.o: $(UPPDIR1)Web/TServ/tserv.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)plugin/bz2/bz2.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/TServ/version.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web_TServ)  $(UPPDIR1)Web/TServ/tserv.cpp -o $(OutDir_Web_TServ)tserv.o
+
+$(OutDir_Web)Web_init.o: $(UPPDIR1)Web/Web_init.icpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t.h \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h \
+	$(UPPDIR1)Web/Web.t
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/Web_init.icpp -o $(OutDir_Web)Web_init.o
+
+$(OutDir_Web)util.o: $(UPPDIR1)Web/util.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/util.cpp -o $(OutDir_Web)util.o
+
+$(OutDir_Web)md5.o: $(UPPDIR1)Web/md5.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/md5.cpp -o $(OutDir_Web)md5.o
+
+$(OutDir_Web)html.o: $(UPPDIR1)Web/html.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/html.cpp -o $(OutDir_Web)html.o
+
+$(OutDir_Web)socket.o: $(UPPDIR1)Web/socket.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/socket.cpp -o $(OutDir_Web)socket.o
+
+$(OutDir_Web)httpsrv.o: $(UPPDIR1)Web/httpsrv.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/httpsrv.cpp -o $(OutDir_Web)httpsrv.o
+
+$(OutDir_Web)httpcli.o: $(UPPDIR1)Web/httpcli.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/httpcli.cpp -o $(OutDir_Web)httpcli.o
+
+$(OutDir_Web)auth.o: $(UPPDIR1)Web/auth.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/auth.cpp -o $(OutDir_Web)auth.o
+
+$(OutDir_Web)smtp.o: $(UPPDIR1)Web/smtp.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/smtp.cpp -o $(OutDir_Web)smtp.o
+
+$(OutDir_Web)sproc.o: $(UPPDIR1)Web/sproc.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/sproc.cpp -o $(OutDir_Web)sproc.o
+
+$(OutDir_Web)Web.a: \
+	$(OutDir_Web)util.o \
+	$(OutDir_Web)md5.o \
+	$(OutDir_Web)html.o \
+	$(OutDir_Web)socket.o \
+	$(OutDir_Web)httpsrv.o \
+	$(OutDir_Web)httpcli.o \
+	$(OutDir_Web)auth.o \
+	$(OutDir_Web)smtp.o \
+	$(OutDir_Web)sproc.o
+	$(AR) $(OutDir_Web)Web.a \
+		$(OutDir_Web)util.o \
+		$(OutDir_Web)md5.o \
+		$(OutDir_Web)html.o \
+		$(OutDir_Web)socket.o \
+		$(OutDir_Web)httpsrv.o \
+		$(OutDir_Web)httpcli.o \
+		$(OutDir_Web)auth.o \
+		$(OutDir_Web)smtp.o \
+		$(OutDir_Web)sproc.o
+
+$(OutDir_plugin_bz2)bz2upp.o: $(UPPDIR1)plugin/bz2/bz2upp.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)plugin/bz2/bz2.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h
+	$(CPPFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/bz2upp.cpp -o $(OutDir_plugin_bz2)bz2upp.o
+
+$(OutDir_plugin_bz2)blocksort.o: $(UPPDIR1)plugin/bz2/lib/blocksort.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/blocksort.c -o $(OutDir_plugin_bz2)blocksort.o
+
+$(OutDir_plugin_bz2)bzlib.o: $(UPPDIR1)plugin/bz2/lib/bzlib.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/bzlib.c -o $(OutDir_plugin_bz2)bzlib.o
+
+$(OutDir_plugin_bz2)compress.o: $(UPPDIR1)plugin/bz2/lib/compress.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/compress.c -o $(OutDir_plugin_bz2)compress.o
+
+$(OutDir_plugin_bz2)crctable.o: $(UPPDIR1)plugin/bz2/lib/crctable.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/crctable.c -o $(OutDir_plugin_bz2)crctable.o
+
+$(OutDir_plugin_bz2)decompress.o: $(UPPDIR1)plugin/bz2/lib/decompress.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/decompress.c -o $(OutDir_plugin_bz2)decompress.o
+
+$(OutDir_plugin_bz2)huffman.o: $(UPPDIR1)plugin/bz2/lib/huffman.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/huffman.c -o $(OutDir_plugin_bz2)huffman.o
+
+$(OutDir_plugin_bz2)randtable.o: $(UPPDIR1)plugin/bz2/lib/randtable.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/randtable.c -o $(OutDir_plugin_bz2)randtable.o
+
+$(OutDir_plugin_bz2)bz2.a: \
+	$(OutDir_plugin_bz2)bz2upp.o \
+	$(OutDir_plugin_bz2)blocksort.o \
+	$(OutDir_plugin_bz2)bzlib.o \
+	$(OutDir_plugin_bz2)compress.o \
+	$(OutDir_plugin_bz2)crctable.o \
+	$(OutDir_plugin_bz2)decompress.o \
+	$(OutDir_plugin_bz2)huffman.o \
+	$(OutDir_plugin_bz2)randtable.o
+	$(AR) $(OutDir_plugin_bz2)bz2.a \
+		$(OutDir_plugin_bz2)bz2upp.o \
+		$(OutDir_plugin_bz2)blocksort.o \
+		$(OutDir_plugin_bz2)bzlib.o \
+		$(OutDir_plugin_bz2)compress.o \
+		$(OutDir_plugin_bz2)crctable.o \
+		$(OutDir_plugin_bz2)decompress.o \
+		$(OutDir_plugin_bz2)huffman.o \
+		$(OutDir_plugin_bz2)randtable.o
+
+$(OutDir_Core)Mt.o: $(UPPDIR1)Core/Mt.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Mt.cpp -o $(OutDir_Core)Mt.o
+
+$(OutDir_Core)Thread.o: $(UPPDIR1)Core/Thread.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Thread.cpp -o $(OutDir_Core)Thread.o
+
+$(OutDir_Core)OL_Set.o: $(UPPDIR1)Core/OL_Set.cpp
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/OL_Set.cpp -o $(OutDir_Core)OL_Set.o
+
+$(OutDir_Core)heap.o: $(UPPDIR1)Core/heap.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/heap.cpp -o $(OutDir_Core)heap.o
+
+$(OutDir_Core)heapdbg.o: $(UPPDIR1)Core/heapdbg.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/heapdbg.cpp -o $(OutDir_Core)heapdbg.o
+
+$(OutDir_Core)String.o: $(UPPDIR1)Core/String.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/String.cpp -o $(OutDir_Core)String.o
+
+$(OutDir_Core)StrUtil.o: $(UPPDIR1)Core/StrUtil.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/StrUtil.cpp -o $(OutDir_Core)StrUtil.o
+
+$(OutDir_Core)CharSet.o: $(UPPDIR1)Core/CharSet.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/CharSet.cpp -o $(OutDir_Core)CharSet.o
+
+$(OutDir_Core)Path.o: $(UPPDIR1)Core/Path.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Path.cpp -o $(OutDir_Core)Path.o
+
+$(OutDir_Core)App.o: $(UPPDIR1)Core/App.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/App.cpp -o $(OutDir_Core)App.o
+
+$(OutDir_Core)Stream.o: $(UPPDIR1)Core/Stream.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Stream.cpp -o $(OutDir_Core)Stream.o
+
+$(OutDir_Core)BlockStream.o: $(UPPDIR1)Core/BlockStream.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/BlockStream.cpp -o $(OutDir_Core)BlockStream.o
+
+$(OutDir_Core)Log.o: $(UPPDIR1)Core/Log.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Log.cpp -o $(OutDir_Core)Log.o
+
+$(OutDir_Core)Debug.o: $(UPPDIR1)Core/Debug.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Debug.cpp -o $(OutDir_Core)Debug.o
+
+$(OutDir_Core)Util.o: $(UPPDIR1)Core/Util.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Util.cpp -o $(OutDir_Core)Util.o
+
+$(OutDir_Core)mathutil.o: $(UPPDIR1)Core/mathutil.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/mathutil.cpp -o $(OutDir_Core)mathutil.o
+
+$(OutDir_Core)Vcont.o: $(UPPDIR1)Core/Vcont.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Vcont.cpp -o $(OutDir_Core)Vcont.o
+
+$(OutDir_Core)Hash.o: $(UPPDIR1)Core/Hash.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Hash.cpp -o $(OutDir_Core)Hash.o
+
+$(OutDir_Core)Callback.o: $(UPPDIR1)Core/Callback.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Callback.cpp -o $(OutDir_Core)Callback.o
+
+$(OutDir_Core)Color.o: $(UPPDIR1)Core/Color.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Color.cpp -o $(OutDir_Core)Color.o
+
+$(OutDir_Core)Gtypes.o: $(UPPDIR1)Core/Gtypes.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Gtypes.cpp -o $(OutDir_Core)Gtypes.o
+
+$(OutDir_Core)TimeDate.o: $(UPPDIR1)Core/TimeDate.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/TimeDate.cpp -o $(OutDir_Core)TimeDate.o
+
+$(OutDir_Core)Value.o: $(UPPDIR1)Core/Value.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Value.cpp -o $(OutDir_Core)Value.o
+
+$(OutDir_Core)Convert.o: $(UPPDIR1)Core/Convert.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Convert.cpp -o $(OutDir_Core)Convert.o
+
+$(OutDir_Core)Format.o: $(UPPDIR1)Core/Format.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Format.cpp -o $(OutDir_Core)Format.o
+
+$(OutDir_Core)t.o: $(UPPDIR1)Core/t.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Core.t \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t.h \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/t.cpp -o $(OutDir_Core)t.o
+
+$(OutDir_Core)Lang.o: $(UPPDIR1)Core/Lang.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Lang.cpp -o $(OutDir_Core)Lang.o
+
+$(OutDir_Core)parser.o: $(UPPDIR1)Core/parser.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/parser.cpp -o $(OutDir_Core)parser.o
+
+$(OutDir_Core)XML.o: $(UPPDIR1)Core/XML.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/XML.cpp -o $(OutDir_Core)XML.o
+
+$(OutDir_Core)Xmlize.o: $(UPPDIR1)Core/Xmlize.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Xmlize.cpp -o $(OutDir_Core)Xmlize.o
+
+$(OutDir_Core)Uuid.o: $(UPPDIR1)Core/Uuid.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Uuid.cpp -o $(OutDir_Core)Uuid.o
+
+$(OutDir_Core)Ptr.o: $(UPPDIR1)Core/Ptr.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Ptr.cpp -o $(OutDir_Core)Ptr.o
+
+$(OutDir_Core)z.o: $(UPPDIR1)Core/z.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/z.cpp -o $(OutDir_Core)z.o
+
+$(OutDir_Core)Topic.o: $(UPPDIR1)Core/Topic.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Topic.cpp -o $(OutDir_Core)Topic.o
+
+$(OutDir_Core)Dli.o: $(UPPDIR1)Core/Dli.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Dli.cpp -o $(OutDir_Core)Dli.o
+
+$(OutDir_Core)Win32Com.o: $(UPPDIR1)Core/Win32Com.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/z.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Win32Com.cpp -o $(OutDir_Core)Win32Com.o
+
+$(OutDir_Core)Core.a: \
+	$(OutDir_Core)Mt.o \
+	$(OutDir_Core)Thread.o \
+	$(OutDir_Core)OL_Set.o \
+	$(OutDir_Core)heap.o \
+	$(OutDir_Core)heapdbg.o \
+	$(OutDir_Core)String.o \
+	$(OutDir_Core)StrUtil.o \
+	$(OutDir_Core)CharSet.o \
+	$(OutDir_Core)Path.o \
+	$(OutDir_Core)App.o \
+	$(OutDir_Core)Stream.o \
+	$(OutDir_Core)BlockStream.o \
+	$(OutDir_Core)Log.o \
+	$(OutDir_Core)Debug.o \
+	$(OutDir_Core)Util.o \
+	$(OutDir_Core)mathutil.o \
+	$(OutDir_Core)Vcont.o \
+	$(OutDir_Core)Hash.o \
+	$(OutDir_Core)Callback.o \
+	$(OutDir_Core)Color.o \
+	$(OutDir_Core)Gtypes.o \
+	$(OutDir_Core)TimeDate.o \
+	$(OutDir_Core)Value.o \
+	$(OutDir_Core)Convert.o \
+	$(OutDir_Core)Format.o \
+	$(OutDir_Core)t.o \
+	$(OutDir_Core)Lang.o \
+	$(OutDir_Core)parser.o \
+	$(OutDir_Core)XML.o \
+	$(OutDir_Core)Xmlize.o \
+	$(OutDir_Core)Uuid.o \
+	$(OutDir_Core)Ptr.o \
+	$(OutDir_Core)z.o \
+	$(OutDir_Core)Topic.o \
+	$(OutDir_Core)Dli.o \
+	$(OutDir_Core)Win32Com.o
+	$(AR) $(OutDir_Core)Core.a \
+		$(OutDir_Core)Mt.o \
+		$(OutDir_Core)Thread.o \
+		$(OutDir_Core)OL_Set.o \
+		$(OutDir_Core)heap.o \
+		$(OutDir_Core)heapdbg.o \
+		$(OutDir_Core)String.o \
+		$(OutDir_Core)StrUtil.o \
+		$(OutDir_Core)CharSet.o \
+		$(OutDir_Core)Path.o \
+		$(OutDir_Core)App.o \
+		$(OutDir_Core)Stream.o \
+		$(OutDir_Core)BlockStream.o \
+		$(OutDir_Core)Log.o \
+		$(OutDir_Core)Debug.o \
+		$(OutDir_Core)Util.o \
+		$(OutDir_Core)mathutil.o \
+		$(OutDir_Core)Vcont.o \
+		$(OutDir_Core)Hash.o \
+		$(OutDir_Core)Callback.o \
+		$(OutDir_Core)Color.o \
+		$(OutDir_Core)Gtypes.o \
+		$(OutDir_Core)TimeDate.o \
+		$(OutDir_Core)Value.o \
+		$(OutDir_Core)Convert.o \
+		$(OutDir_Core)Format.o \
+		$(OutDir_Core)t.o \
+		$(OutDir_Core)Lang.o \
+		$(OutDir_Core)parser.o \
+		$(OutDir_Core)XML.o \
+		$(OutDir_Core)Xmlize.o \
+		$(OutDir_Core)Uuid.o \
+		$(OutDir_Core)Ptr.o \
+		$(OutDir_Core)z.o \
+		$(OutDir_Core)Topic.o \
+		$(OutDir_Core)Dli.o \
+		$(OutDir_Core)Win32Com.o
+
+$(OutDir_plugin_z)adler32.o: $(UPPDIR1)plugin/z/lib/adler32.c \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/adler32.c -o $(OutDir_plugin_z)adler32.o
+
+$(OutDir_plugin_z)compress.o: $(UPPDIR1)plugin/z/lib/compress.c \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/compress.c -o $(OutDir_plugin_z)compress.o
+
+$(OutDir_plugin_z)crc32.o: $(UPPDIR1)plugin/z/lib/crc32.c \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/crc32.c -o $(OutDir_plugin_z)crc32.o
+
+$(OutDir_plugin_z)deflate.o: $(UPPDIR1)plugin/z/lib/deflate.c \
+	$(UPPDIR1)plugin/z/lib/deflate.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/deflate.c -o $(OutDir_plugin_z)deflate.o
+
+$(OutDir_plugin_z)gzio.o: $(UPPDIR1)plugin/z/lib/gzio.c \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/gzio.c -o $(OutDir_plugin_z)gzio.o
+
+$(OutDir_plugin_z)infblock.o: $(UPPDIR1)plugin/z/lib/infblock.c \
+	$(UPPDIR1)plugin/z/lib/infblock.h \
+	$(UPPDIR1)plugin/z/lib/infcodes.h \
+	$(UPPDIR1)plugin/z/lib/inftrees.h \
+	$(UPPDIR1)plugin/z/lib/infutil.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/infblock.c -o $(OutDir_plugin_z)infblock.o
+
+$(OutDir_plugin_z)infcodes.o: $(UPPDIR1)plugin/z/lib/infcodes.c \
+	$(UPPDIR1)plugin/z/lib/infblock.h \
+	$(UPPDIR1)plugin/z/lib/infcodes.h \
+	$(UPPDIR1)plugin/z/lib/inffast.h \
+	$(UPPDIR1)plugin/z/lib/inftrees.h \
+	$(UPPDIR1)plugin/z/lib/infutil.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/infcodes.c -o $(OutDir_plugin_z)infcodes.o
+
+$(OutDir_plugin_z)inffast.o: $(UPPDIR1)plugin/z/lib/inffast.c \
+	$(UPPDIR1)plugin/z/lib/infblock.h \
+	$(UPPDIR1)plugin/z/lib/infcodes.h \
+	$(UPPDIR1)plugin/z/lib/inffast.h \
+	$(UPPDIR1)plugin/z/lib/inftrees.h \
+	$(UPPDIR1)plugin/z/lib/infutil.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/inffast.c -o $(OutDir_plugin_z)inffast.o
+
+$(OutDir_plugin_z)inflate.o: $(UPPDIR1)plugin/z/lib/inflate.c \
+	$(UPPDIR1)plugin/z/lib/infblock.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/inflate.c -o $(OutDir_plugin_z)inflate.o
+
+$(OutDir_plugin_z)inftrees.o: $(UPPDIR1)plugin/z/lib/inftrees.c \
+	$(UPPDIR1)plugin/z/lib/inffixed.h \
+	$(UPPDIR1)plugin/z/lib/inftrees.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/inftrees.c -o $(OutDir_plugin_z)inftrees.o
+
+$(OutDir_plugin_z)infutil.o: $(UPPDIR1)plugin/z/lib/infutil.c \
+	$(UPPDIR1)plugin/z/lib/infblock.h \
+	$(UPPDIR1)plugin/z/lib/infcodes.h \
+	$(UPPDIR1)plugin/z/lib/inftrees.h \
+	$(UPPDIR1)plugin/z/lib/infutil.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/infutil.c -o $(OutDir_plugin_z)infutil.o
+
+$(OutDir_plugin_z)trees.o: $(UPPDIR1)plugin/z/lib/trees.c \
+	$(UPPDIR1)plugin/z/lib/deflate.h \
+	$(UPPDIR1)plugin/z/lib/trees.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/trees.c -o $(OutDir_plugin_z)trees.o
+
+$(OutDir_plugin_z)uncompr.o: $(UPPDIR1)plugin/z/lib/uncompr.c \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/uncompr.c -o $(OutDir_plugin_z)uncompr.o
+
+$(OutDir_plugin_z)zutil.o: $(UPPDIR1)plugin/z/lib/zutil.c \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/z/lib/zutil.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_z)  $(UPPDIR1)plugin/z/lib/zutil.c -o $(OutDir_plugin_z)zutil.o
+
+$(OutDir_plugin_z)z.a: \
+	$(OutDir_plugin_z)adler32.o \
+	$(OutDir_plugin_z)compress.o \
+	$(OutDir_plugin_z)crc32.o \
+	$(OutDir_plugin_z)deflate.o \
+	$(OutDir_plugin_z)gzio.o \
+	$(OutDir_plugin_z)infblock.o \
+	$(OutDir_plugin_z)infcodes.o \
+	$(OutDir_plugin_z)inffast.o \
+	$(OutDir_plugin_z)inflate.o \
+	$(OutDir_plugin_z)inftrees.o \
+	$(OutDir_plugin_z)infutil.o \
+	$(OutDir_plugin_z)trees.o \
+	$(OutDir_plugin_z)uncompr.o \
+	$(OutDir_plugin_z)zutil.o
+	$(AR) $(OutDir_plugin_z)z.a \
+		$(OutDir_plugin_z)adler32.o \
+		$(OutDir_plugin_z)compress.o \
+		$(OutDir_plugin_z)crc32.o \
+		$(OutDir_plugin_z)deflate.o \
+		$(OutDir_plugin_z)gzio.o \
+		$(OutDir_plugin_z)infblock.o \
+		$(OutDir_plugin_z)infcodes.o \
+		$(OutDir_plugin_z)inffast.o \
+		$(OutDir_plugin_z)inflate.o \
+		$(OutDir_plugin_z)inftrees.o \
+		$(OutDir_plugin_z)infutil.o \
+		$(OutDir_plugin_z)trees.o \
+		$(OutDir_plugin_z)uncompr.o \
+		$(OutDir_plugin_z)zutil.o
diff --git a/uppsrc2/TServ/Makefile.solaris b/archive/uppsrc/TServ/Makefile.solaris
similarity index 96%
rename from uppsrc2/TServ/Makefile.solaris
rename to archive/uppsrc/TServ/Makefile.solaris
index f2ea4fcbd..94902fbe8 100644
--- a/uppsrc2/TServ/Makefile.solaris
+++ b/archive/uppsrc/TServ/Makefile.solaris
@@ -1,2046 +1,2046 @@
-UPPDIR1 = /upp/solar/
-
-UPPOUT = /uppout/
-CINC =  -I$(UPPDIR1)
-Macro =  -DflagGCC -DflagDEBUG -DflagSHARED -DflagDEBUG_FULL -DflagSOLARIS
-CC = c++ -c -D_DEBUG -O0 -ggdb -g2
-CFLAGS = $(CC) -x c
-CPPFLAGS = $(CC) -x c++
-LIBPATH =
-AR = ar -sr
-OutDir_Web_TServ = $(UPPOUT)Web/TServ/SOLARIS-Debug-Debug_full-Gcc-Main-Shared-Solaris/
-Macro_Web_TServ = $(Macro) -DflagMAIN
-OutDir_Web = $(UPPOUT)Web/SOLARIS-Debug-Debug_full-Gcc-Shared-Solaris/
-Macro_Web = $(Macro)
-OutDir_plugin_bz2 = $(UPPOUT)plugin/bz2/SOLARIS-Debug-Debug_full-Gcc-Shared-Solaris/
-Macro_plugin_bz2 = $(Macro)
-OutDir_Core = $(UPPOUT)Core/SOLARIS-Debug-Debug_full-Gcc-Shared-Solaris/
-Macro_Core = $(Macro)
-
-OutDir = $(OutDir_Web_TServ)
-OutFile = /uppout/tserv
-
-.PHONY: all
-all: install $(OutFile)
-
-.PHONY: install
-install:
-	-mkdir -p $(OutDir)
-	-mkdir -p $(OutDir_Web_TServ)
-	-mkdir -p $(OutDir_Web)
-	-mkdir -p $(OutDir_plugin_bz2)
-	-mkdir -p $(OutDir_Core)
-
-$(OutFile):  \
-	$(OutDir_Web_TServ)tserv.o \
-	$(OutDir_Web)Web.a \
-	$(OutDir_plugin_bz2)bz2.a \
-	$(OutDir_Core)Core.a
-	c++ -o $(OutFile) -ggdb $(LIBPATH) -Wl,--gc-sections,-O,2 $(LINKOPTIONS) \
-		$(OutDir_Web_TServ)tserv.o \
-			$(OutDir_Web)Web.a \
-			$(OutDir_plugin_bz2)bz2.a \
-			$(OutDir_Core)Core.a \
-			-lnsl \
-			-lsocket \
-			-lposix4 \
-			-ldl
-$(OutDir_Web_TServ)tserv.o: $(UPPDIR1)Web/TServ/tserv.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)plugin/bz2/bz2.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/TServ/version.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web_TServ)  $(UPPDIR1)Web/TServ/tserv.cpp -o $(OutDir_Web_TServ)tserv.o
-
-$(OutDir_Web)util.o: $(UPPDIR1)Web/util.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/util.cpp -o $(OutDir_Web)util.o
-
-$(OutDir_Web)md5.o: $(UPPDIR1)Web/md5.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/md5.cpp -o $(OutDir_Web)md5.o
-
-$(OutDir_Web)html.o: $(UPPDIR1)Web/html.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/html.cpp -o $(OutDir_Web)html.o
-
-$(OutDir_Web)socket.o: $(UPPDIR1)Web/socket.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/socket.cpp -o $(OutDir_Web)socket.o
-
-$(OutDir_Web)httpsrv.o: $(UPPDIR1)Web/httpsrv.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/httpsrv.cpp -o $(OutDir_Web)httpsrv.o
-
-$(OutDir_Web)httpcli.o: $(UPPDIR1)Web/httpcli.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/httpcli.cpp -o $(OutDir_Web)httpcli.o
-
-$(OutDir_Web)auth.o: $(UPPDIR1)Web/auth.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/auth.cpp -o $(OutDir_Web)auth.o
-
-$(OutDir_Web)smtp.o: $(UPPDIR1)Web/smtp.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/smtp.cpp -o $(OutDir_Web)smtp.o
-
-$(OutDir_Web)sproc.o: $(UPPDIR1)Web/sproc.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)Web/auth.h \
-	$(UPPDIR1)Web/html.h \
-	$(UPPDIR1)Web/httpcli.h \
-	$(UPPDIR1)Web/httpsrv.h \
-	$(UPPDIR1)Web/smtp.h \
-	$(UPPDIR1)Web/socket.h \
-	$(UPPDIR1)Web/sproc.h \
-	$(UPPDIR1)Web/util.h \
-	$(UPPDIR1)Web/Web.h
-	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/sproc.cpp -o $(OutDir_Web)sproc.o
-
-$(OutDir_Web)Web.a: \
-	$(OutDir_Web)util.o \
-	$(OutDir_Web)md5.o \
-	$(OutDir_Web)html.o \
-	$(OutDir_Web)socket.o \
-	$(OutDir_Web)httpsrv.o \
-	$(OutDir_Web)httpcli.o \
-	$(OutDir_Web)auth.o \
-	$(OutDir_Web)smtp.o \
-	$(OutDir_Web)sproc.o
-	$(AR) $(OutDir_Web)Web.a \
-		$(OutDir_Web)util.o \
-		$(OutDir_Web)md5.o \
-		$(OutDir_Web)html.o \
-		$(OutDir_Web)socket.o \
-		$(OutDir_Web)httpsrv.o \
-		$(OutDir_Web)httpcli.o \
-		$(OutDir_Web)auth.o \
-		$(OutDir_Web)smtp.o \
-		$(OutDir_Web)sproc.o
-
-$(OutDir_plugin_bz2)bz2upp.o: $(UPPDIR1)plugin/bz2/bz2upp.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h \
-	$(UPPDIR1)plugin/bz2/bz2.h \
-	$(UPPDIR1)plugin/bz2/lib/bzlib.h
-	$(CPPFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/bz2upp.cpp -o $(OutDir_plugin_bz2)bz2upp.o
-
-$(OutDir_plugin_bz2)blocksort.o: $(UPPDIR1)plugin/bz2/lib/blocksort.c \
-	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
-	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/blocksort.c -o $(OutDir_plugin_bz2)blocksort.o
-
-$(OutDir_plugin_bz2)bzlib.o: $(UPPDIR1)plugin/bz2/lib/bzlib.c \
-	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
-	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/bzlib.c -o $(OutDir_plugin_bz2)bzlib.o
-
-$(OutDir_plugin_bz2)compress.o: $(UPPDIR1)plugin/bz2/lib/compress.c \
-	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
-	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/compress.c -o $(OutDir_plugin_bz2)compress.o
-
-$(OutDir_plugin_bz2)crctable.o: $(UPPDIR1)plugin/bz2/lib/crctable.c \
-	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
-	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/crctable.c -o $(OutDir_plugin_bz2)crctable.o
-
-$(OutDir_plugin_bz2)decompress.o: $(UPPDIR1)plugin/bz2/lib/decompress.c \
-	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
-	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/decompress.c -o $(OutDir_plugin_bz2)decompress.o
-
-$(OutDir_plugin_bz2)huffman.o: $(UPPDIR1)plugin/bz2/lib/huffman.c \
-	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
-	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/huffman.c -o $(OutDir_plugin_bz2)huffman.o
-
-$(OutDir_plugin_bz2)randtable.o: $(UPPDIR1)plugin/bz2/lib/randtable.c \
-	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
-	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
-	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/randtable.c -o $(OutDir_plugin_bz2)randtable.o
-
-$(OutDir_plugin_bz2)bz2.a: \
-	$(OutDir_plugin_bz2)bz2upp.o \
-	$(OutDir_plugin_bz2)blocksort.o \
-	$(OutDir_plugin_bz2)bzlib.o \
-	$(OutDir_plugin_bz2)compress.o \
-	$(OutDir_plugin_bz2)crctable.o \
-	$(OutDir_plugin_bz2)decompress.o \
-	$(OutDir_plugin_bz2)huffman.o \
-	$(OutDir_plugin_bz2)randtable.o
-	$(AR) $(OutDir_plugin_bz2)bz2.a \
-		$(OutDir_plugin_bz2)bz2upp.o \
-		$(OutDir_plugin_bz2)blocksort.o \
-		$(OutDir_plugin_bz2)bzlib.o \
-		$(OutDir_plugin_bz2)compress.o \
-		$(OutDir_plugin_bz2)crctable.o \
-		$(OutDir_plugin_bz2)decompress.o \
-		$(OutDir_plugin_bz2)huffman.o \
-		$(OutDir_plugin_bz2)randtable.o
-
-$(OutDir_Core)Mt.o: $(UPPDIR1)Core/Mt.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Mt.cpp -o $(OutDir_Core)Mt.o
-
-$(OutDir_Core)Thread.o: $(UPPDIR1)Core/Thread.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Thread.cpp -o $(OutDir_Core)Thread.o
-
-$(OutDir_Core)heap.o: $(UPPDIR1)Core/heap.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/heap.cpp -o $(OutDir_Core)heap.o
-
-$(OutDir_Core)heapdbg.o: $(UPPDIR1)Core/heapdbg.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/heapdbg.cpp -o $(OutDir_Core)heapdbg.o
-
-$(OutDir_Core)String.o: $(UPPDIR1)Core/String.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/String.cpp -o $(OutDir_Core)String.o
-
-$(OutDir_Core)StrUtil.o: $(UPPDIR1)Core/StrUtil.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/StrUtil.cpp -o $(OutDir_Core)StrUtil.o
-
-$(OutDir_Core)CharSet.o: $(UPPDIR1)Core/CharSet.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/CharSet.cpp -o $(OutDir_Core)CharSet.o
-
-$(OutDir_Core)Path.o: $(UPPDIR1)Core/Path.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Path.cpp -o $(OutDir_Core)Path.o
-
-$(OutDir_Core)App.o: $(UPPDIR1)Core/App.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/App.cpp -o $(OutDir_Core)App.o
-
-$(OutDir_Core)Stream.o: $(UPPDIR1)Core/Stream.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Stream.cpp -o $(OutDir_Core)Stream.o
-
-$(OutDir_Core)Log.o: $(UPPDIR1)Core/Log.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Log.cpp -o $(OutDir_Core)Log.o
-
-$(OutDir_Core)Debug.o: $(UPPDIR1)Core/Debug.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Debug.cpp -o $(OutDir_Core)Debug.o
-
-$(OutDir_Core)Util.o: $(UPPDIR1)Core/Util.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Util.cpp -o $(OutDir_Core)Util.o
-
-$(OutDir_Core)mathutil.o: $(UPPDIR1)Core/mathutil.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/mathutil.cpp -o $(OutDir_Core)mathutil.o
-
-$(OutDir_Core)Cont.o: $(UPPDIR1)Core/Cont.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Cont.cpp -o $(OutDir_Core)Cont.o
-
-$(OutDir_Core)Callback.o: $(UPPDIR1)Core/Callback.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Callback.cpp -o $(OutDir_Core)Callback.o
-
-$(OutDir_Core)Color.o: $(UPPDIR1)Core/Color.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Color.cpp -o $(OutDir_Core)Color.o
-
-$(OutDir_Core)Gtypes.o: $(UPPDIR1)Core/Gtypes.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Gtypes.cpp -o $(OutDir_Core)Gtypes.o
-
-$(OutDir_Core)TimeDate.o: $(UPPDIR1)Core/TimeDate.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/TimeDate.cpp -o $(OutDir_Core)TimeDate.o
-
-$(OutDir_Core)Value.o: $(UPPDIR1)Core/Value.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Value.cpp -o $(OutDir_Core)Value.o
-
-$(OutDir_Core)Convert.o: $(UPPDIR1)Core/Convert.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Convert.cpp -o $(OutDir_Core)Convert.o
-
-$(OutDir_Core)Format.o: $(UPPDIR1)Core/Format.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Format.cpp -o $(OutDir_Core)Format.o
-
-$(OutDir_Core)t.o: $(UPPDIR1)Core/t.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Core.t \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t.h \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/t.cpp -o $(OutDir_Core)t.o
-
-$(OutDir_Core)Lang.o: $(UPPDIR1)Core/Lang.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Lang.cpp -o $(OutDir_Core)Lang.o
-
-$(OutDir_Core)parser.o: $(UPPDIR1)Core/parser.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/parser.cpp -o $(OutDir_Core)parser.o
-
-$(OutDir_Core)Uuid.o: $(UPPDIR1)Core/Uuid.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Uuid.cpp -o $(OutDir_Core)Uuid.o
-
-$(OutDir_Core)Ptr.o: $(UPPDIR1)Core/Ptr.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Ptr.cpp -o $(OutDir_Core)Ptr.o
-
-$(OutDir_Core)Topic.o: $(UPPDIR1)Core/Topic.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Topic.cpp -o $(OutDir_Core)Topic.o
-
-$(OutDir_Core)Win32Com.o: $(UPPDIR1)Core/Win32Com.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Win32Com.cpp -o $(OutDir_Core)Win32Com.o
-
-$(OutDir_Core)Dli.o: $(UPPDIR1)Core/Dli.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Dli.cpp -o $(OutDir_Core)Dli.o
-
-$(OutDir_Core)Test.o: $(UPPDIR1)Core/Test.cpp \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/Cbgen.h \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Global.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/String.hpp \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/Thread.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Com.h
-	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Test.cpp -o $(OutDir_Core)Test.o
-
-$(OutDir_Core)Core.a: \
-	$(OutDir_Core)Mt.o \
-	$(OutDir_Core)Thread.o \
-	$(OutDir_Core)heap.o \
-	$(OutDir_Core)heapdbg.o \
-	$(OutDir_Core)String.o \
-	$(OutDir_Core)StrUtil.o \
-	$(OutDir_Core)CharSet.o \
-	$(OutDir_Core)Path.o \
-	$(OutDir_Core)App.o \
-	$(OutDir_Core)Stream.o \
-	$(OutDir_Core)Log.o \
-	$(OutDir_Core)Debug.o \
-	$(OutDir_Core)Util.o \
-	$(OutDir_Core)mathutil.o \
-	$(OutDir_Core)Cont.o \
-	$(OutDir_Core)Callback.o \
-	$(OutDir_Core)Color.o \
-	$(OutDir_Core)Gtypes.o \
-	$(OutDir_Core)TimeDate.o \
-	$(OutDir_Core)Value.o \
-	$(OutDir_Core)Convert.o \
-	$(OutDir_Core)Format.o \
-	$(OutDir_Core)t.o \
-	$(OutDir_Core)Lang.o \
-	$(OutDir_Core)parser.o \
-	$(OutDir_Core)Uuid.o \
-	$(OutDir_Core)Ptr.o \
-	$(OutDir_Core)Topic.o \
-	$(OutDir_Core)Win32Com.o \
-	$(OutDir_Core)Dli.o \
-	$(OutDir_Core)Test.o
-	$(AR) $(OutDir_Core)Core.a \
-		$(OutDir_Core)Mt.o \
-		$(OutDir_Core)Thread.o \
-		$(OutDir_Core)heap.o \
-		$(OutDir_Core)heapdbg.o \
-		$(OutDir_Core)String.o \
-		$(OutDir_Core)StrUtil.o \
-		$(OutDir_Core)CharSet.o \
-		$(OutDir_Core)Path.o \
-		$(OutDir_Core)App.o \
-		$(OutDir_Core)Stream.o \
-		$(OutDir_Core)Log.o \
-		$(OutDir_Core)Debug.o \
-		$(OutDir_Core)Util.o \
-		$(OutDir_Core)mathutil.o \
-		$(OutDir_Core)Cont.o \
-		$(OutDir_Core)Callback.o \
-		$(OutDir_Core)Color.o \
-		$(OutDir_Core)Gtypes.o \
-		$(OutDir_Core)TimeDate.o \
-		$(OutDir_Core)Value.o \
-		$(OutDir_Core)Convert.o \
-		$(OutDir_Core)Format.o \
-		$(OutDir_Core)t.o \
-		$(OutDir_Core)Lang.o \
-		$(OutDir_Core)parser.o \
-		$(OutDir_Core)Uuid.o \
-		$(OutDir_Core)Ptr.o \
-		$(OutDir_Core)Topic.o \
-		$(OutDir_Core)Win32Com.o \
-		$(OutDir_Core)Dli.o \
-		$(OutDir_Core)Test.o
+UPPDIR1 = /upp/solar/
+
+UPPOUT = /uppout/
+CINC =  -I$(UPPDIR1)
+Macro =  -DflagGCC -DflagDEBUG -DflagSHARED -DflagDEBUG_FULL -DflagSOLARIS
+CC = c++ -c -D_DEBUG -O0 -ggdb -g2
+CFLAGS = $(CC) -x c
+CPPFLAGS = $(CC) -x c++
+LIBPATH =
+AR = ar -sr
+OutDir_Web_TServ = $(UPPOUT)Web/TServ/SOLARIS-Debug-Debug_full-Gcc-Main-Shared-Solaris/
+Macro_Web_TServ = $(Macro) -DflagMAIN
+OutDir_Web = $(UPPOUT)Web/SOLARIS-Debug-Debug_full-Gcc-Shared-Solaris/
+Macro_Web = $(Macro)
+OutDir_plugin_bz2 = $(UPPOUT)plugin/bz2/SOLARIS-Debug-Debug_full-Gcc-Shared-Solaris/
+Macro_plugin_bz2 = $(Macro)
+OutDir_Core = $(UPPOUT)Core/SOLARIS-Debug-Debug_full-Gcc-Shared-Solaris/
+Macro_Core = $(Macro)
+
+OutDir = $(OutDir_Web_TServ)
+OutFile = /uppout/tserv
+
+.PHONY: all
+all: install $(OutFile)
+
+.PHONY: install
+install:
+	-mkdir -p $(OutDir)
+	-mkdir -p $(OutDir_Web_TServ)
+	-mkdir -p $(OutDir_Web)
+	-mkdir -p $(OutDir_plugin_bz2)
+	-mkdir -p $(OutDir_Core)
+
+$(OutFile):  \
+	$(OutDir_Web_TServ)tserv.o \
+	$(OutDir_Web)Web.a \
+	$(OutDir_plugin_bz2)bz2.a \
+	$(OutDir_Core)Core.a
+	c++ -o $(OutFile) -ggdb $(LIBPATH) -Wl,--gc-sections,-O,2 $(LINKOPTIONS) \
+		$(OutDir_Web_TServ)tserv.o \
+			$(OutDir_Web)Web.a \
+			$(OutDir_plugin_bz2)bz2.a \
+			$(OutDir_Core)Core.a \
+			-lnsl \
+			-lsocket \
+			-lposix4 \
+			-ldl
+$(OutDir_Web_TServ)tserv.o: $(UPPDIR1)Web/TServ/tserv.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)plugin/bz2/bz2.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/TServ/version.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web_TServ)  $(UPPDIR1)Web/TServ/tserv.cpp -o $(OutDir_Web_TServ)tserv.o
+
+$(OutDir_Web)util.o: $(UPPDIR1)Web/util.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/util.cpp -o $(OutDir_Web)util.o
+
+$(OutDir_Web)md5.o: $(UPPDIR1)Web/md5.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/md5.cpp -o $(OutDir_Web)md5.o
+
+$(OutDir_Web)html.o: $(UPPDIR1)Web/html.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/html.cpp -o $(OutDir_Web)html.o
+
+$(OutDir_Web)socket.o: $(UPPDIR1)Web/socket.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/socket.cpp -o $(OutDir_Web)socket.o
+
+$(OutDir_Web)httpsrv.o: $(UPPDIR1)Web/httpsrv.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/httpsrv.cpp -o $(OutDir_Web)httpsrv.o
+
+$(OutDir_Web)httpcli.o: $(UPPDIR1)Web/httpcli.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/httpcli.cpp -o $(OutDir_Web)httpcli.o
+
+$(OutDir_Web)auth.o: $(UPPDIR1)Web/auth.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/auth.cpp -o $(OutDir_Web)auth.o
+
+$(OutDir_Web)smtp.o: $(UPPDIR1)Web/smtp.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/smtp.cpp -o $(OutDir_Web)smtp.o
+
+$(OutDir_Web)sproc.o: $(UPPDIR1)Web/sproc.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)Web/auth.h \
+	$(UPPDIR1)Web/html.h \
+	$(UPPDIR1)Web/httpcli.h \
+	$(UPPDIR1)Web/httpsrv.h \
+	$(UPPDIR1)Web/smtp.h \
+	$(UPPDIR1)Web/socket.h \
+	$(UPPDIR1)Web/sproc.h \
+	$(UPPDIR1)Web/util.h \
+	$(UPPDIR1)Web/Web.h
+	$(CPPFLAGS) $(CINC) $(Macro_Web)  $(UPPDIR1)Web/sproc.cpp -o $(OutDir_Web)sproc.o
+
+$(OutDir_Web)Web.a: \
+	$(OutDir_Web)util.o \
+	$(OutDir_Web)md5.o \
+	$(OutDir_Web)html.o \
+	$(OutDir_Web)socket.o \
+	$(OutDir_Web)httpsrv.o \
+	$(OutDir_Web)httpcli.o \
+	$(OutDir_Web)auth.o \
+	$(OutDir_Web)smtp.o \
+	$(OutDir_Web)sproc.o
+	$(AR) $(OutDir_Web)Web.a \
+		$(OutDir_Web)util.o \
+		$(OutDir_Web)md5.o \
+		$(OutDir_Web)html.o \
+		$(OutDir_Web)socket.o \
+		$(OutDir_Web)httpsrv.o \
+		$(OutDir_Web)httpcli.o \
+		$(OutDir_Web)auth.o \
+		$(OutDir_Web)smtp.o \
+		$(OutDir_Web)sproc.o
+
+$(OutDir_plugin_bz2)bz2upp.o: $(UPPDIR1)plugin/bz2/bz2upp.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h \
+	$(UPPDIR1)plugin/bz2/bz2.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h
+	$(CPPFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/bz2upp.cpp -o $(OutDir_plugin_bz2)bz2upp.o
+
+$(OutDir_plugin_bz2)blocksort.o: $(UPPDIR1)plugin/bz2/lib/blocksort.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/blocksort.c -o $(OutDir_plugin_bz2)blocksort.o
+
+$(OutDir_plugin_bz2)bzlib.o: $(UPPDIR1)plugin/bz2/lib/bzlib.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/bzlib.c -o $(OutDir_plugin_bz2)bzlib.o
+
+$(OutDir_plugin_bz2)compress.o: $(UPPDIR1)plugin/bz2/lib/compress.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/compress.c -o $(OutDir_plugin_bz2)compress.o
+
+$(OutDir_plugin_bz2)crctable.o: $(UPPDIR1)plugin/bz2/lib/crctable.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/crctable.c -o $(OutDir_plugin_bz2)crctable.o
+
+$(OutDir_plugin_bz2)decompress.o: $(UPPDIR1)plugin/bz2/lib/decompress.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/decompress.c -o $(OutDir_plugin_bz2)decompress.o
+
+$(OutDir_plugin_bz2)huffman.o: $(UPPDIR1)plugin/bz2/lib/huffman.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/huffman.c -o $(OutDir_plugin_bz2)huffman.o
+
+$(OutDir_plugin_bz2)randtable.o: $(UPPDIR1)plugin/bz2/lib/randtable.c \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib_private.h
+	$(CFLAGS) $(CINC) $(Macro_plugin_bz2)  $(UPPDIR1)plugin/bz2/lib/randtable.c -o $(OutDir_plugin_bz2)randtable.o
+
+$(OutDir_plugin_bz2)bz2.a: \
+	$(OutDir_plugin_bz2)bz2upp.o \
+	$(OutDir_plugin_bz2)blocksort.o \
+	$(OutDir_plugin_bz2)bzlib.o \
+	$(OutDir_plugin_bz2)compress.o \
+	$(OutDir_plugin_bz2)crctable.o \
+	$(OutDir_plugin_bz2)decompress.o \
+	$(OutDir_plugin_bz2)huffman.o \
+	$(OutDir_plugin_bz2)randtable.o
+	$(AR) $(OutDir_plugin_bz2)bz2.a \
+		$(OutDir_plugin_bz2)bz2upp.o \
+		$(OutDir_plugin_bz2)blocksort.o \
+		$(OutDir_plugin_bz2)bzlib.o \
+		$(OutDir_plugin_bz2)compress.o \
+		$(OutDir_plugin_bz2)crctable.o \
+		$(OutDir_plugin_bz2)decompress.o \
+		$(OutDir_plugin_bz2)huffman.o \
+		$(OutDir_plugin_bz2)randtable.o
+
+$(OutDir_Core)Mt.o: $(UPPDIR1)Core/Mt.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Mt.cpp -o $(OutDir_Core)Mt.o
+
+$(OutDir_Core)Thread.o: $(UPPDIR1)Core/Thread.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Thread.cpp -o $(OutDir_Core)Thread.o
+
+$(OutDir_Core)heap.o: $(UPPDIR1)Core/heap.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/heap.cpp -o $(OutDir_Core)heap.o
+
+$(OutDir_Core)heapdbg.o: $(UPPDIR1)Core/heapdbg.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/heapdbg.cpp -o $(OutDir_Core)heapdbg.o
+
+$(OutDir_Core)String.o: $(UPPDIR1)Core/String.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/String.cpp -o $(OutDir_Core)String.o
+
+$(OutDir_Core)StrUtil.o: $(UPPDIR1)Core/StrUtil.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/StrUtil.cpp -o $(OutDir_Core)StrUtil.o
+
+$(OutDir_Core)CharSet.o: $(UPPDIR1)Core/CharSet.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/CharSet.cpp -o $(OutDir_Core)CharSet.o
+
+$(OutDir_Core)Path.o: $(UPPDIR1)Core/Path.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Path.cpp -o $(OutDir_Core)Path.o
+
+$(OutDir_Core)App.o: $(UPPDIR1)Core/App.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/App.cpp -o $(OutDir_Core)App.o
+
+$(OutDir_Core)Stream.o: $(UPPDIR1)Core/Stream.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Stream.cpp -o $(OutDir_Core)Stream.o
+
+$(OutDir_Core)Log.o: $(UPPDIR1)Core/Log.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Log.cpp -o $(OutDir_Core)Log.o
+
+$(OutDir_Core)Debug.o: $(UPPDIR1)Core/Debug.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Debug.cpp -o $(OutDir_Core)Debug.o
+
+$(OutDir_Core)Util.o: $(UPPDIR1)Core/Util.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Util.cpp -o $(OutDir_Core)Util.o
+
+$(OutDir_Core)mathutil.o: $(UPPDIR1)Core/mathutil.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/mathutil.cpp -o $(OutDir_Core)mathutil.o
+
+$(OutDir_Core)Cont.o: $(UPPDIR1)Core/Cont.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Cont.cpp -o $(OutDir_Core)Cont.o
+
+$(OutDir_Core)Callback.o: $(UPPDIR1)Core/Callback.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Callback.cpp -o $(OutDir_Core)Callback.o
+
+$(OutDir_Core)Color.o: $(UPPDIR1)Core/Color.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Color.cpp -o $(OutDir_Core)Color.o
+
+$(OutDir_Core)Gtypes.o: $(UPPDIR1)Core/Gtypes.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Gtypes.cpp -o $(OutDir_Core)Gtypes.o
+
+$(OutDir_Core)TimeDate.o: $(UPPDIR1)Core/TimeDate.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/TimeDate.cpp -o $(OutDir_Core)TimeDate.o
+
+$(OutDir_Core)Value.o: $(UPPDIR1)Core/Value.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Value.cpp -o $(OutDir_Core)Value.o
+
+$(OutDir_Core)Convert.o: $(UPPDIR1)Core/Convert.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Convert.cpp -o $(OutDir_Core)Convert.o
+
+$(OutDir_Core)Format.o: $(UPPDIR1)Core/Format.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Format.cpp -o $(OutDir_Core)Format.o
+
+$(OutDir_Core)t.o: $(UPPDIR1)Core/t.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Core.t \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t.h \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/t.cpp -o $(OutDir_Core)t.o
+
+$(OutDir_Core)Lang.o: $(UPPDIR1)Core/Lang.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Lang.cpp -o $(OutDir_Core)Lang.o
+
+$(OutDir_Core)parser.o: $(UPPDIR1)Core/parser.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/parser.cpp -o $(OutDir_Core)parser.o
+
+$(OutDir_Core)Uuid.o: $(UPPDIR1)Core/Uuid.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Uuid.cpp -o $(OutDir_Core)Uuid.o
+
+$(OutDir_Core)Ptr.o: $(UPPDIR1)Core/Ptr.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Ptr.cpp -o $(OutDir_Core)Ptr.o
+
+$(OutDir_Core)Topic.o: $(UPPDIR1)Core/Topic.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Topic.cpp -o $(OutDir_Core)Topic.o
+
+$(OutDir_Core)Win32Com.o: $(UPPDIR1)Core/Win32Com.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Win32Com.cpp -o $(OutDir_Core)Win32Com.o
+
+$(OutDir_Core)Dli.o: $(UPPDIR1)Core/Dli.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Dli.cpp -o $(OutDir_Core)Dli.o
+
+$(OutDir_Core)Test.o: $(UPPDIR1)Core/Test.cpp \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/Cbgen.h \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Global.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/String.hpp \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/Thread.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Com.h
+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Test.cpp -o $(OutDir_Core)Test.o
+
+$(OutDir_Core)Core.a: \
+	$(OutDir_Core)Mt.o \
+	$(OutDir_Core)Thread.o \
+	$(OutDir_Core)heap.o \
+	$(OutDir_Core)heapdbg.o \
+	$(OutDir_Core)String.o \
+	$(OutDir_Core)StrUtil.o \
+	$(OutDir_Core)CharSet.o \
+	$(OutDir_Core)Path.o \
+	$(OutDir_Core)App.o \
+	$(OutDir_Core)Stream.o \
+	$(OutDir_Core)Log.o \
+	$(OutDir_Core)Debug.o \
+	$(OutDir_Core)Util.o \
+	$(OutDir_Core)mathutil.o \
+	$(OutDir_Core)Cont.o \
+	$(OutDir_Core)Callback.o \
+	$(OutDir_Core)Color.o \
+	$(OutDir_Core)Gtypes.o \
+	$(OutDir_Core)TimeDate.o \
+	$(OutDir_Core)Value.o \
+	$(OutDir_Core)Convert.o \
+	$(OutDir_Core)Format.o \
+	$(OutDir_Core)t.o \
+	$(OutDir_Core)Lang.o \
+	$(OutDir_Core)parser.o \
+	$(OutDir_Core)Uuid.o \
+	$(OutDir_Core)Ptr.o \
+	$(OutDir_Core)Topic.o \
+	$(OutDir_Core)Win32Com.o \
+	$(OutDir_Core)Dli.o \
+	$(OutDir_Core)Test.o
+	$(AR) $(OutDir_Core)Core.a \
+		$(OutDir_Core)Mt.o \
+		$(OutDir_Core)Thread.o \
+		$(OutDir_Core)heap.o \
+		$(OutDir_Core)heapdbg.o \
+		$(OutDir_Core)String.o \
+		$(OutDir_Core)StrUtil.o \
+		$(OutDir_Core)CharSet.o \
+		$(OutDir_Core)Path.o \
+		$(OutDir_Core)App.o \
+		$(OutDir_Core)Stream.o \
+		$(OutDir_Core)Log.o \
+		$(OutDir_Core)Debug.o \
+		$(OutDir_Core)Util.o \
+		$(OutDir_Core)mathutil.o \
+		$(OutDir_Core)Cont.o \
+		$(OutDir_Core)Callback.o \
+		$(OutDir_Core)Color.o \
+		$(OutDir_Core)Gtypes.o \
+		$(OutDir_Core)TimeDate.o \
+		$(OutDir_Core)Value.o \
+		$(OutDir_Core)Convert.o \
+		$(OutDir_Core)Format.o \
+		$(OutDir_Core)t.o \
+		$(OutDir_Core)Lang.o \
+		$(OutDir_Core)parser.o \
+		$(OutDir_Core)Uuid.o \
+		$(OutDir_Core)Ptr.o \
+		$(OutDir_Core)Topic.o \
+		$(OutDir_Core)Win32Com.o \
+		$(OutDir_Core)Dli.o \
+		$(OutDir_Core)Test.o
diff --git a/uppsrc2/TServ/Makefile.ubuntu b/archive/uppsrc/TServ/Makefile.ubuntu
similarity index 100%
rename from uppsrc2/TServ/Makefile.ubuntu
rename to archive/uppsrc/TServ/Makefile.ubuntu
diff --git a/uppsrc2/TServ/TServ.sh b/archive/uppsrc/TServ/TServ.sh
similarity index 99%
rename from uppsrc2/TServ/TServ.sh
rename to archive/uppsrc/TServ/TServ.sh
index 1754dd1c8..f00c2d490 100644
--- a/uppsrc2/TServ/TServ.sh
+++ b/archive/uppsrc/TServ/TServ.sh
@@ -1,130 +1,130 @@
-# Project modules: Web\TServ Web TCore Core plugin\bz2 plugin
-# Configurations:
-mkdir -p /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST
-echo /src/uppsrc/Web/util.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/util.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/util.o
-echo /src/uppsrc/Web/html.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/html.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/html.o
-echo /src/uppsrc/Web/socket.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/socket.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/socket.o
-echo /src/uppsrc/Web/http.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/http.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/http.o
-echo /src/uppsrc/Web/auth.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/auth.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/auth.o
-echo /src/uppsrc/Web/smtp.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/smtp.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/smtp.o
-echo /src/uppsrc/Web/sproc.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/sproc.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/sproc.o
-/usr/local/bin/ar -sr /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Web.a /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/util.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/html.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/socket.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/http.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/auth.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/smtp.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/sproc.o
-mkdir -p /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST
-echo /src/uppsrc/TCore/util.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/util.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/util.o
-echo /src/uppsrc/TCore/dbf.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/dbf.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/dbf.o
-echo /src/uppsrc/TCore/globcfg.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/globcfg.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/globcfg.o
-echo /src/uppsrc/TCore/atexit.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/atexit.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/atexit.o
-echo /src/uppsrc/TCore/help.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/help.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/help.o
-echo /src/uppsrc/TCore/CalcType.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/CalcType.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CalcType.o
-echo /src/uppsrc/TCore/CalcNode.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/CalcNode.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CalcNode.o
-echo /src/uppsrc/TCore/CalcBasic.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/CalcBasic.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CalcBasic.o
-echo /src/uppsrc/TCore/datafile.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/datafile.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/datafile.o
-echo /src/uppsrc/TCore/database.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/database.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/database.o
-echo /src/uppsrc/TCore/datatest.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/datatest.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/datatest.o
-/usr/local/bin/ar -sr /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/TCore.a /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/util.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/dbf.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/globcfg.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/atexit.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/help.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CalcType.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CalcNode.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CalcBasic.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/datafile.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/database.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/datatest.o
-mkdir -p /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST
-echo /src/uppsrc/Core/Mt.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Mt.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Mt.o
-echo /src/uppsrc/Core/Thread.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Thread.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Thread.o
-echo /src/uppsrc/Core/heap.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/heap.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/heap.o
-echo /src/uppsrc/Core/nheap.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/nheap.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/nheap.o
-echo /src/uppsrc/Core/OString.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/OString.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/OString.o
-echo /src/uppsrc/Core/OWString.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/OWString.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/OWString.o
-echo /src/uppsrc/Core/String.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/String.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/String.o
-echo /src/uppsrc/Core/StrUtil.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/StrUtil.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/StrUtil.o
-echo /src/uppsrc/Core/CharSet.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/CharSet.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CharSet.o
-echo /src/uppsrc/Core/Path.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Path.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Path.o
-echo /src/uppsrc/Core/App.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/App.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/App.o
-echo /src/uppsrc/Core/Stream.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Stream.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Stream.o
-echo /src/uppsrc/Core/Debug.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Debug.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Debug.o
-echo /src/uppsrc/Core/Util.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Util.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Util.o
-echo /src/uppsrc/Core/mathutil.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/mathutil.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/mathutil.o
-echo /src/uppsrc/Core/Cont.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Cont.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Cont.o
-echo /src/uppsrc/Core/Callback.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Callback.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Callback.o
-echo /src/uppsrc/Core/Color.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Color.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Color.o
-echo /src/uppsrc/Core/Gtypes.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Gtypes.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Gtypes.o
-echo /src/uppsrc/Core/TimeDate.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/TimeDate.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/TimeDate.o
-echo /src/uppsrc/Core/Value.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Value.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Value.o
-echo /src/uppsrc/Core/Convert.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Convert.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Convert.o
-echo /src/uppsrc/Core/Format.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Format.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Format.o
-echo /src/uppsrc/Core/Lang.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Lang.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Lang.o
-echo /src/uppsrc/Core/parser.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/parser.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/parser.o
-echo /src/uppsrc/Core/Uuid.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Uuid.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Uuid.o
-echo /src/uppsrc/Core/Ptr.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Ptr.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Ptr.o
-echo /src/uppsrc/Core/Win32Com.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Win32Com.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Win32Com.o
-echo /src/uppsrc/Core/Dli.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Dli.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Dli.o
-echo /src/uppsrc/Core/Test.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Test.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Test.o
-/usr/local/bin/ar -sr /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Core.a /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Mt.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Thread.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/heap.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/nheap.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/OString.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/OWString.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/String.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/StrUtil.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CharSet.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Path.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/App.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Stream.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Debug.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Util.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/mathutil.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Cont.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Callback.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Color.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Gtypes.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/TimeDate.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Value.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Convert.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Format.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Lang.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/parser.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Uuid.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Ptr.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Win32Com.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Dli.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Test.o
-mkdir -p /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST
-echo /src/uppsrc/plugin/bz2/bz2upp.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/bz2upp.cpp -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/bz2upp.o
-echo /src/uppsrc/plugin/bz2/blocksort.c
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/blocksort.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/blocksort.o
-echo /src/uppsrc/plugin/bz2/bzlib.c
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/bzlib.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/bzlib.o
-echo /src/uppsrc/plugin/bz2/compress.c
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/compress.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/compress.o
-echo /src/uppsrc/plugin/bz2/crctable.c
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/crctable.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/crctable.o
-echo /src/uppsrc/plugin/bz2/decompress.c
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/decompress.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/decompress.o
-echo /src/uppsrc/plugin/bz2/huffman.c
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/huffman.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/huffman.o
-echo /src/uppsrc/plugin/bz2/randtable.c
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/randtable.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/randtable.o
-/usr/local/bin/ar -sr /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/bz2.a /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/bz2upp.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/blocksort.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/bzlib.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/compress.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/crctable.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/decompress.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/huffman.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/randtable.o
-mkdir -p /uppout/uppnew/plugin/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST
-echo /src/uppsrc/plugin/dummy.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/dummy.cpp -o /uppout/uppnew/plugin/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/dummy.o
-/usr/local/bin/ar -sr /uppout/uppnew/plugin/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/plugin.a /uppout/uppnew/plugin/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/dummy.o
-mkdir -p /uppout/uppnew/Web/TServ/CONSOLE-GNU3-IA32-LINUX-MAIN-RELEASE-ST
-echo /src/uppsrc/Web/TServ/tserv.cpp
-/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagMAIN -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/TServ/tserv.cpp -o /uppout/uppnew/Web/TServ/CONSOLE-GNU3-IA32-LINUX-MAIN-RELEASE-ST/tserv.o
-/usr/local/bin/g++ -Wl,-s -static  -o /uppout/tserv -Wl,--start-group   /uppout/uppnew/Web/TServ/CONSOLE-GNU3-IA32-LINUX-MAIN-RELEASE-ST/tserv.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Web.a /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/TCore.a /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Core.a -lpthread -ldl -luuid /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/bz2.a /uppout/uppnew/plugin/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/plugin.a -Wl,--end-group
+# Project modules: Web\TServ Web TCore Core plugin\bz2 plugin
+# Configurations:
+mkdir -p /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST
+echo /src/uppsrc/Web/util.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/util.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/util.o
+echo /src/uppsrc/Web/html.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/html.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/html.o
+echo /src/uppsrc/Web/socket.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/socket.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/socket.o
+echo /src/uppsrc/Web/http.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/http.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/http.o
+echo /src/uppsrc/Web/auth.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/auth.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/auth.o
+echo /src/uppsrc/Web/smtp.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/smtp.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/smtp.o
+echo /src/uppsrc/Web/sproc.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/sproc.cpp -o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/sproc.o
+/usr/local/bin/ar -sr /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Web.a /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/util.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/html.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/socket.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/http.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/auth.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/smtp.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/sproc.o
+mkdir -p /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST
+echo /src/uppsrc/TCore/util.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/util.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/util.o
+echo /src/uppsrc/TCore/dbf.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/dbf.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/dbf.o
+echo /src/uppsrc/TCore/globcfg.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/globcfg.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/globcfg.o
+echo /src/uppsrc/TCore/atexit.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/atexit.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/atexit.o
+echo /src/uppsrc/TCore/help.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/help.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/help.o
+echo /src/uppsrc/TCore/CalcType.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/CalcType.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CalcType.o
+echo /src/uppsrc/TCore/CalcNode.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/CalcNode.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CalcNode.o
+echo /src/uppsrc/TCore/CalcBasic.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/CalcBasic.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CalcBasic.o
+echo /src/uppsrc/TCore/datafile.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/datafile.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/datafile.o
+echo /src/uppsrc/TCore/database.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/database.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/database.o
+echo /src/uppsrc/TCore/datatest.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/TCore/datatest.cpp -o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/datatest.o
+/usr/local/bin/ar -sr /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/TCore.a /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/util.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/dbf.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/globcfg.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/atexit.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/help.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CalcType.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CalcNode.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CalcBasic.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/datafile.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/database.o /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/datatest.o
+mkdir -p /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST
+echo /src/uppsrc/Core/Mt.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Mt.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Mt.o
+echo /src/uppsrc/Core/Thread.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Thread.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Thread.o
+echo /src/uppsrc/Core/heap.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/heap.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/heap.o
+echo /src/uppsrc/Core/nheap.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/nheap.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/nheap.o
+echo /src/uppsrc/Core/OString.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/OString.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/OString.o
+echo /src/uppsrc/Core/OWString.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/OWString.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/OWString.o
+echo /src/uppsrc/Core/String.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/String.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/String.o
+echo /src/uppsrc/Core/StrUtil.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/StrUtil.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/StrUtil.o
+echo /src/uppsrc/Core/CharSet.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/CharSet.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CharSet.o
+echo /src/uppsrc/Core/Path.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Path.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Path.o
+echo /src/uppsrc/Core/App.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/App.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/App.o
+echo /src/uppsrc/Core/Stream.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Stream.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Stream.o
+echo /src/uppsrc/Core/Debug.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Debug.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Debug.o
+echo /src/uppsrc/Core/Util.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Util.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Util.o
+echo /src/uppsrc/Core/mathutil.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/mathutil.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/mathutil.o
+echo /src/uppsrc/Core/Cont.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Cont.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Cont.o
+echo /src/uppsrc/Core/Callback.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Callback.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Callback.o
+echo /src/uppsrc/Core/Color.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Color.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Color.o
+echo /src/uppsrc/Core/Gtypes.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Gtypes.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Gtypes.o
+echo /src/uppsrc/Core/TimeDate.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/TimeDate.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/TimeDate.o
+echo /src/uppsrc/Core/Value.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Value.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Value.o
+echo /src/uppsrc/Core/Convert.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Convert.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Convert.o
+echo /src/uppsrc/Core/Format.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Format.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Format.o
+echo /src/uppsrc/Core/Lang.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Lang.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Lang.o
+echo /src/uppsrc/Core/parser.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/parser.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/parser.o
+echo /src/uppsrc/Core/Uuid.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Uuid.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Uuid.o
+echo /src/uppsrc/Core/Ptr.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Ptr.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Ptr.o
+echo /src/uppsrc/Core/Win32Com.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Win32Com.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Win32Com.o
+echo /src/uppsrc/Core/Dli.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Dli.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Dli.o
+echo /src/uppsrc/Core/Test.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Core/Test.cpp -o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Test.o
+/usr/local/bin/ar -sr /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Core.a /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Mt.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Thread.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/heap.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/nheap.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/OString.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/OWString.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/String.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/StrUtil.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/CharSet.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Path.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/App.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Stream.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Debug.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Util.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/mathutil.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Cont.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Callback.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Color.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Gtypes.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/TimeDate.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Value.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Convert.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Format.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Lang.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/parser.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Uuid.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Ptr.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Win32Com.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Dli.o /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Test.o
+mkdir -p /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST
+echo /src/uppsrc/plugin/bz2/bz2upp.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/bz2upp.cpp -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/bz2upp.o
+echo /src/uppsrc/plugin/bz2/blocksort.c
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/blocksort.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/blocksort.o
+echo /src/uppsrc/plugin/bz2/bzlib.c
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/bzlib.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/bzlib.o
+echo /src/uppsrc/plugin/bz2/compress.c
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/compress.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/compress.o
+echo /src/uppsrc/plugin/bz2/crctable.c
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/crctable.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/crctable.o
+echo /src/uppsrc/plugin/bz2/decompress.c
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/decompress.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/decompress.o
+echo /src/uppsrc/plugin/bz2/huffman.c
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/huffman.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/huffman.o
+echo /src/uppsrc/plugin/bz2/randtable.c
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/bz2/randtable.c -o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/randtable.o
+/usr/local/bin/ar -sr /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/bz2.a /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/bz2upp.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/blocksort.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/bzlib.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/compress.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/crctable.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/decompress.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/huffman.o /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/randtable.o
+mkdir -p /uppout/uppnew/plugin/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST
+echo /src/uppsrc/plugin/dummy.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/plugin/dummy.cpp -o /uppout/uppnew/plugin/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/dummy.o
+/usr/local/bin/ar -sr /uppout/uppnew/plugin/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/plugin.a /uppout/uppnew/plugin/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/dummy.o
+mkdir -p /uppout/uppnew/Web/TServ/CONSOLE-GNU3-IA32-LINUX-MAIN-RELEASE-ST
+echo /src/uppsrc/Web/TServ/tserv.cpp
+/usr/local/bin/g++ -c -O2 -ffunction-sections -x c++ -fuse-cxa-atexit -I"/src/uppsrc" -DflagCONSOLE -DflagST -DflagMAIN -DflagLINUX -DflagGNU3 -DflagIA32 -DflagRELEASE   /src/uppsrc/Web/TServ/tserv.cpp -o /uppout/uppnew/Web/TServ/CONSOLE-GNU3-IA32-LINUX-MAIN-RELEASE-ST/tserv.o
+/usr/local/bin/g++ -Wl,-s -static  -o /uppout/tserv -Wl,--start-group   /uppout/uppnew/Web/TServ/CONSOLE-GNU3-IA32-LINUX-MAIN-RELEASE-ST/tserv.o /uppout/uppnew/Web/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Web.a /uppout/uppnew/TCore/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/TCore.a /uppout/uppnew/Core/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/Core.a -lpthread -ldl -luuid /uppout/uppnew/plugin/bz2/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/bz2.a /uppout/uppnew/plugin/CONSOLE-GNU3-IA32-LINUX-RELEASE-ST/plugin.a -Wl,--end-group
diff --git a/uppsrc2/TServ/TServ.upp b/archive/uppsrc/TServ/TServ.upp
similarity index 91%
rename from uppsrc2/TServ/TServ.upp
rename to archive/uppsrc/TServ/TServ.upp
index 5ad6601b5..ecce97e11 100644
--- a/uppsrc2/TServ/TServ.upp
+++ b/archive/uppsrc/TServ/TServ.upp
@@ -1,22 +1,22 @@
-uses
-	Web,
-	plugin\bz2;
-
-target(WIN32) tserv.exe;
-
-target(!WIN32) tserv;
-
-link(GNU3) "-Wl,-R -Wl,/usr/local/lib";
-
-file
-	Makefile,
-	TServ.sh,
-	version.h,
-	tserv.cpp,
-	Info readonly separator,
-	Copying;
-
-mainconfig
-	"" = "",
-	"" = "SHARED";
-
+uses
+	Web,
+	plugin\bz2;
+
+target(WIN32) tserv.exe;
+
+target(!WIN32) tserv;
+
+link(GNU3) "-Wl,-R -Wl,/usr/local/lib";
+
+file
+	Makefile,
+	TServ.sh,
+	version.h,
+	tserv.cpp,
+	Info readonly separator,
+	Copying;
+
+mainconfig
+	"" = "",
+	"" = "SHARED";
+
diff --git a/uppsrc2/TServ/err b/archive/uppsrc/TServ/err
similarity index 98%
rename from uppsrc2/TServ/err
rename to archive/uppsrc/TServ/err
index 392307ff5..351b68747 100644
--- a/uppsrc2/TServ/err
+++ b/archive/uppsrc/TServ/err
@@ -1,869 +1,869 @@
-make: Warning: File `/upp/uppsrc/Web/TServ/tserv.cpp' has modification time 2.9e+03 s in the future
-In file included from /upp/uppsrc/Core/Core.h:206,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/stdlib.h:140: error: syntax error before `(' token
-In file included from /usr/include/sys/types.h:133,
-                 from /usr/include/stdlib.h:433,
-                 from /upp/uppsrc/Core/Core.h:206,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/linux/time.h:10: error: 'time_t' is used as a type, but is not
-   defined as a type.
-/usr/include/linux/time.h:16: error: 'time_t' is used as a type, but is not
-   defined as a type.
-/usr/include/linux/time.h:17: error: 'suseconds_t' is used as a type, but is
-   not defined as a type.
-In file included from /usr/include/sys/select.h:46,
-                 from /usr/include/sys/types.h:216,
-                 from /usr/include/stdlib.h:433,
-                 from /upp/uppsrc/Core/Core.h:206,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/bits/time.h:70: error: redefinition of `struct timeval'
-/usr/include/linux/time.h:15: error: previous definition of `struct timeval'
-In file included from /usr/include/sys/types.h:266,
-                 from /usr/include/stdlib.h:433,
-                 from /upp/uppsrc/Core/Core.h:206,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/bits/pthreadtypes.h:48: error: 'size_t' is used as a type, but is
-   not defined as a type.
-/usr/include/bits/pthreadtypes.h:51: error: 'size_t' is used as a type, but is
-   not defined as a type.
-In file included from /upp/uppsrc/Core/Core.h:206,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/stdlib.h:450: error: type specifier omitted for parameter `size_t'
-/usr/include/stdlib.h:450: error: syntax error before `)' token
-/usr/include/stdlib.h:480: error: type specifier omitted for parameter `size_t'
-/usr/include/stdlib.h:480: error: syntax error before `,' token
-/usr/include/stdlib.h:584: error: `size_t' was not declared in this scope
-/usr/include/stdlib.h:584: error: syntax error before `)' token
-/usr/include/stdlib.h:586: error: `size_t' was not declared in this scope
-/usr/include/stdlib.h:586: error: syntax error before `,' token
-/usr/include/stdlib.h:595: error: type specifier omitted for parameter `size_t'
-/usr/include/stdlib.h:595: error: syntax error before `)' token
-In file included from /usr/include/stdlib.h:606,
-                 from /upp/uppsrc/Core/Core.h:206,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/alloca.h:33: error: `size_t' was not declared in this scope
-/usr/include/alloca.h:33: error: syntax error before `)' token
-In file included from /upp/uppsrc/Core/Core.h:206,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/stdlib.h:611: error: `size_t' was not declared in this scope
-/usr/include/stdlib.h:611: error: syntax error before `)' token
-/usr/include/stdlib.h:616: error: type specifier omitted for parameter `size_t'
-/usr/include/stdlib.h:616: error: syntax error before `,' token
-/usr/include/stdlib.h:768: error: type specifier omitted for parameter `size_t'
-/usr/include/stdlib.h:768: error: syntax error before `,' token
-/usr/include/stdlib.h:773: error: type specifier omitted for parameter `size_t'
-/usr/include/stdlib.h:773: error: syntax error before `,' token
-/usr/include/stdlib.h:846: error: type specifier omitted for parameter `size_t'
-/usr/include/stdlib.h:846: error: syntax error before `)' token
-/usr/include/stdlib.h:849: error: type specifier omitted for parameter `size_t'
-/usr/include/stdlib.h:849: error: syntax error before `)' token
-/usr/include/stdlib.h:853: error: type specifier omitted for parameter `size_t'
-/usr/include/stdlib.h:853: error: syntax error before `)' token
-/usr/include/stdlib.h:857: error: type specifier omitted for parameter `size_t'
-/usr/include/stdlib.h:857: error: syntax error before `)' token
-/usr/include/stdlib.h:866: error: type specifier omitted for parameter `size_t'
-/usr/include/stdlib.h:866: error: syntax error before `)' token
-/usr/include/stdlib.h:870: error: type specifier omitted for parameter `size_t'
-/usr/include/stdlib.h:870: error: syntax error before `)' token
-/usr/include/stdlib.h:877: error: syntax error before `(' token
-/usr/include/stdlib.h:880: error: syntax error before `(' token
-/usr/include/stdlib.h:943: error: type specifier omitted for parameter `size_t'
-/usr/include/stdlib.h:943: error: syntax error before `)' token
-In file included from /usr/include/_G_config.h:44,
-                 from /usr/include/libio.h:32,
-                 from /usr/include/stdio.h:72,
-                 from /upp/uppsrc/Core/Core.h:207,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/gconv.h:72: error: type specifier omitted for parameter `size_t'
-/usr/include/gconv.h:72: error: syntax error before `*' token
-/usr/include/gconv.h:88: error: type specifier omitted for parameter `size_t'
-/usr/include/gconv.h:88: error: syntax error before `*' token
-/usr/include/gconv.h:97: error: type specifier omitted for parameter `size_t'
-/usr/include/gconv.h:97: error: syntax error before `*' token
-/usr/include/gconv.h:174: error: 'size_t' is used as a type, but is not defined
-   as a type.
-In file included from /usr/include/stdio.h:72,
-                 from /upp/uppsrc/Core/Core.h:207,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/libio.h:53:21: stdarg.h: No such file or directory
-In file included from /usr/include/stdio.h:72,
-                 from /upp/uppsrc/Core/Core.h:207,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/libio.h:354: error: type specifier omitted for parameter `size_t'
-/usr/include/libio.h:354: error: syntax error before `)' token
-/usr/include/libio.h:363: error: type specifier omitted for parameter `size_t'
-/usr/include/libio.h:363: error: syntax error before `)' token
-/usr/include/libio.h:475: error: type specifier omitted for parameter `
-   __gnuc_va_list'
-/usr/include/libio.h:477: error: type specifier omitted for parameter `
-   __gnuc_va_list'
-/usr/include/libio.h:479: error: syntax error before `(' token
-In file included from /upp/uppsrc/Core/Core.h:207,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/stdio.h:77: error: syntax error before `;' token
-In file included from /upp/uppsrc/Core/Core.h:207,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/stdio.h:286: error: type specifier omitted for parameter `size_t'
-/usr/include/stdio.h:286: error: syntax error before `,' token
-/usr/include/stdio.h:292: error: type specifier omitted for parameter `size_t'
-/usr/include/stdio.h:292: error: syntax error before `*' token
-/usr/include/stdio.h:304: error: type specifier omitted for parameter `size_t'
-/usr/include/stdio.h:304: error: syntax error before `)' token
-/usr/include/stdio.h:311: error: type specifier omitted for parameter `size_t'
-/usr/include/stdio.h:311: error: syntax error before `)' token
-/usr/include/stdio.h:339: error: type specifier omitted for parameter `
-   __gnuc_va_list'
-/usr/include/stdio.h:339: error: syntax error before `)' token
-/usr/include/stdio.h:344: error: type specifier omitted for parameter `
-   __gnuc_va_list'
-/usr/include/stdio.h:344: error: syntax error before `)' token
-/usr/include/stdio.h:347: error: type specifier omitted for parameter `
-   __gnuc_va_list'
-/usr/include/stdio.h:347: error: syntax error before `)' token
-/usr/include/stdio.h:353: error: type specifier omitted for parameter `size_t'
-/usr/include/stdio.h:353: error: syntax error before `,' token
-/usr/include/stdio.h:357: error: type specifier omitted for parameter `size_t'
-/usr/include/stdio.h:357: error: syntax error before `,' token
-/usr/include/stdio.h:367: error: type specifier omitted for parameter `
-   __gnuc_va_list'
-/usr/include/stdio.h:367: error: syntax error before `)' token
-/usr/include/stdio.h:383: error: type specifier omitted for parameter `
-   __gnuc_va_list'
-/usr/include/stdio.h:383: error: syntax error before `)' token
-/usr/include/stdio.h:414: error: type specifier omitted for parameter `
-   __gnuc_va_list'
-/usr/include/stdio.h:414: error: syntax error before `)' token
-/usr/include/stdio.h:421: error: type specifier omitted for parameter `
-   __gnuc_va_list'
-/usr/include/stdio.h:421: error: syntax error before `)' token
-/usr/include/stdio.h:426: error: type specifier omitted for parameter `
-   __gnuc_va_list'
-/usr/include/stdio.h:426: error: syntax error before `)' token
-/usr/include/stdio.h:562: error: type specifier omitted for parameter `size_t'
-/usr/include/stdio.h:562: error: syntax error before `*' token
-/usr/include/stdio.h:565: error: type specifier omitted for parameter `size_t'
-/usr/include/stdio.h:565: error: syntax error before `*' token
-/usr/include/stdio.h:575: error: type specifier omitted for parameter `size_t'
-/usr/include/stdio.h:575: error: syntax error before `*' token
-/usr/include/stdio.h:605: error: syntax error before `(' token
-/usr/include/stdio.h:611: error: syntax error before `(' token
-/usr/include/stdio.h:633: error: syntax error before `(' token
-/usr/include/stdio.h:635: error: syntax error before `(' token
-In file included from /upp/uppsrc/Core/Core.h:207,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/stdio.h:800: error: type specifier omitted for parameter `
-   __gnuc_va_list'
-/usr/include/stdio.h:800: error: syntax error before `)' token
-In file included from /usr/include/stdio.h:830,
-                 from /upp/uppsrc/Core/Core.h:207,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/bits/stdio.h:34: error: type specifier omitted for parameter `
-   __gnuc_va_list'
-/usr/include/bits/stdio.h:34: error: syntax error before `)' token
-/usr/include/bits/stdio.h: In function `int vprintf(...)':
-/usr/include/bits/stdio.h:36: error: `__fmt' undeclared (first use this
-   function)
-/usr/include/bits/stdio.h:36: error: (Each undeclared identifier is reported
-   only once for each function it appears in.)
-/usr/include/bits/stdio.h:36: error: `__arg' undeclared (first use this
-   function)
-/usr/include/bits/stdio.h: At global scope:
-/usr/include/bits/stdio.h:102: error: type specifier omitted for parameter `
-   size_t'
-/usr/include/bits/stdio.h:102: error: syntax error before `*' token
-/usr/include/bits/stdio.h: In function `__ssize_t getline(...)':
-/usr/include/bits/stdio.h:104: error: `__lineptr' undeclared (first use this
-   function)
-/usr/include/bits/stdio.h:104: error: `__n' undeclared (first use this
-   function)
-/usr/include/bits/stdio.h:104: error: `__stream' undeclared (first use this
-   function)
-In file included from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/upp/uppsrc/Core/Core.h:209:20: stdarg.h: No such file or directory
-In file included from /upp/uppsrc/Core/Core.h:221,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/sys/time.h: At global scope:
-/usr/include/sys/time.h:57: error: redefinition of `struct timezone'
-/usr/include/linux/time.h:20: error: previous definition of `struct timezone'
-/usr/include/sys/time.h:94: error: syntax error before numeric constant
-/usr/include/sys/time.h:108: error: redefinition of `struct itimerval'
-/usr/include/linux/time.h:402: error: previous definition of `struct itimerval'
-In file included from /usr/include/asm-x86_64/vsyscall.h:4,
-                 from /usr/include/asm/vsyscall.h:4,
-                 from /usr/include/asm-x86_64/timex.h:12,
-                 from /usr/include/asm/timex.h:4,
-                 from /usr/include/linux/timex.h:157,
-                 from /usr/include/linux/sched.h:11,
-                 from /usr/include/pthread.h:20,
-                 from /upp/uppsrc/Core/Core.h:225,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/linux/seqlock.h: In function `void write_seqlock(seqlock_t*)':
-/usr/include/linux/seqlock.h:52: error: `spin_lock' undeclared (first use this
-   function)
-/usr/include/linux/seqlock.h:54: error: `smp_wmb' undeclared (first use this
-   function)
-/usr/include/linux/seqlock.h: In function `void write_sequnlock(seqlock_t*)':
-/usr/include/linux/seqlock.h:61: error: `spin_unlock' undeclared (first use
-   this function)
-/usr/include/linux/seqlock.h: In function `int write_tryseqlock(seqlock_t*)':
-/usr/include/linux/seqlock.h:66: error: `spin_trylock' undeclared (first use
-   this function)
-/usr/include/linux/seqlock.h: In function `unsigned int read_seqbegin(const
-   seqlock_t*)':
-/usr/include/linux/seqlock.h:79: error: `smp_rmb' undeclared (first use this
-   function)
-In file included from /usr/include/asm/system.h:4,
-                 from /usr/include/linux/jiffies.h:8,
-                 from /usr/include/linux/sched.h:12,
-                 from /usr/include/pthread.h:20,
-                 from /upp/uppsrc/Core/Core.h:225,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/asm-x86_64/system.h: At global scope:
-/usr/include/asm-x86_64/system.h:243: error: syntax error before `new'
-/usr/include/asm-x86_64/system.h: In function `long unsigned int __cmpxchg(...)
-   ':
-/usr/include/asm-x86_64/system.h:246: error: `size' undeclared (first use this
-   function)
-/usr/include/asm-x86_64/system.h:248: error: syntax error before string
-   constant
-/usr/include/asm-x86_64/system.h:254: error: syntax error before string
-   constant
-/usr/include/asm-x86_64/system.h:260: error: syntax error before string
-   constant
-/usr/include/asm-x86_64/system.h:266: error: syntax error before string
-   constant
-/usr/include/asm-x86_64/system.h:272: error: `old' undeclared (first use this
-   function)
-In file included from /usr/include/linux/sched.h:12,
-                 from /usr/include/pthread.h:20,
-                 from /upp/uppsrc/Core/Core.h:225,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/linux/jiffies.h: At global scope:
-/usr/include/linux/jiffies.h:16: error: syntax error before `;' token
-/usr/include/linux/jiffies.h:20: error: syntax error before `)' token
-In file included from /usr/include/linux/sched.h:13,
-                 from /usr/include/pthread.h:20,
-                 from /upp/uppsrc/Core/Core.h:225,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/linux/rbtree.h:129: error: syntax error before `new'
-In file included from /usr/include/linux/thread_info.h:20,
-                 from /usr/include/linux/sched.h:14,
-                 from /usr/include/pthread.h:20,
-                 from /upp/uppsrc/Core/Core.h:225,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/linux/bitops.h: In function `int get_bitmask_order(unsigned int)':
-/usr/include/linux/bitops.h:78: error: `fls' undeclared (first use this
-   function)
-In file included from /usr/include/linux/cpumask.h:78,
-                 from /usr/include/linux/sched.h:15,
-                 from /usr/include/pthread.h:20,
-                 from /upp/uppsrc/Core/Core.h:225,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/linux/bitmap.h: In function `void bitmap_zero(long unsigned int*,
-   int)':
-/usr/include/linux/bitmap.h:113: error: `BITS_PER_LONG' undeclared (first use
-   this function)
-/usr/include/linux/bitmap.h:116: error: `BITS_TO_LONGS' undeclared (first use
-   this function)
-/usr/include/linux/bitmap.h:117: error: `memset' undeclared (first use this
-   function)
-/usr/include/linux/bitmap.h: In function `void bitmap_fill(long unsigned int*,
-   int)':
-/usr/include/linux/bitmap.h:123: error: `size_t' undeclared (first use this
-   function)
-/usr/include/linux/bitmap.h:123: error: syntax error before `=' token
-/usr/include/linux/bitmap.h:124: error: `nlongs' undeclared (first use this
-   function)
-/usr/include/linux/bitmap.h:126: error: `memset' undeclared (first use this
-   function)
-/usr/include/linux/bitmap.h: In function `void bitmap_copy(long unsigned int*,
-   const long unsigned int*, int)':
-/usr/include/linux/bitmap.h:137: error: `BITS_TO_LONGS' undeclared (first use
-   this function)
-/usr/include/linux/bitmap.h:138: error: `memcpy' undeclared (first use this
-   function)
-In file included from /usr/include/linux/sched.h:15,
-                 from /usr/include/pthread.h:20,
-                 from /upp/uppsrc/Core/Core.h:225,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/linux/cpumask.h: At global scope:
-/usr/include/linux/cpumask.h:81: error: `bits' was not declared in this scope
-/usr/include/linux/cpumask.h:81: error: invalid data member initialization
-/usr/include/linux/cpumask.h:81: error: (use `=' to initialize static data
-   members)
-/usr/include/linux/cpumask.h: In function `void __cpu_set(int, volatile
-   cpumask_t*)':
-/usr/include/linux/cpumask.h:87: error: 'volatile struct cpumask_t' has no
-   member named 'bits'
-/usr/include/linux/cpumask.h: In function `void __cpu_clear(int, volatile
-   cpumask_t*)':
-/usr/include/linux/cpumask.h:93: error: 'volatile struct cpumask_t' has no
-   member named 'bits'
-/usr/include/linux/cpumask.h: In function `void __cpus_setall(cpumask_t*, int)
-   ':
-/usr/include/linux/cpumask.h:99: error: 'struct cpumask_t' has no member named
-   'bits'
-/usr/include/linux/cpumask.h: In function `void __cpus_clear(cpumask_t*, int)':
-/usr/include/linux/cpumask.h:105: error: 'struct cpumask_t' has no member named
-   'bits'
-/usr/include/linux/cpumask.h: In function `int __cpu_test_and_set(int,
-   cpumask_t*)':
-/usr/include/linux/cpumask.h:114: error: 'struct cpumask_t' has no member named
-   'bits'
-/usr/include/linux/cpumask.h: In function `void __cpus_and(cpumask_t*, const
-   cpumask_t*, const cpumask_t*, int)':
-/usr/include/linux/cpumask.h:121: error: 'struct cpumask_t' has no member named
-   'bits'
-/usr/include/linux/cpumask.h:121: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h:121: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h: In function `void __cpus_or(cpumask_t*, const
-   cpumask_t*, const cpumask_t*, int)':
-/usr/include/linux/cpumask.h:128: error: 'struct cpumask_t' has no member named
-   'bits'
-/usr/include/linux/cpumask.h:128: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h:128: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h: In function `void __cpus_xor(cpumask_t*, const
-   cpumask_t*, const cpumask_t*, int)':
-/usr/include/linux/cpumask.h:135: error: 'struct cpumask_t' has no member named
-   'bits'
-/usr/include/linux/cpumask.h:135: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h:135: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h: In function `void __cpus_andnot(cpumask_t*, const
-   cpumask_t*, const cpumask_t*, int)':
-/usr/include/linux/cpumask.h:143: error: 'struct cpumask_t' has no member named
-   'bits'
-/usr/include/linux/cpumask.h:143: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h:143: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h: In function `void __cpus_complement(cpumask_t*,
-   const cpumask_t*, int)':
-/usr/include/linux/cpumask.h:150: error: 'struct cpumask_t' has no member named
-   'bits'
-/usr/include/linux/cpumask.h:150: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h: In function `int __cpus_equal(const cpumask_t*,
-   const cpumask_t*, int)':
-/usr/include/linux/cpumask.h:157: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h:157: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h: In function `int __cpus_intersects(const
-   cpumask_t*, const cpumask_t*, int)':
-/usr/include/linux/cpumask.h:164: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h:164: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h: In function `int __cpus_subset(const cpumask_t*,
-   const cpumask_t*, int)':
-/usr/include/linux/cpumask.h:171: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h:171: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h: In function `int __cpus_empty(const cpumask_t*,
-   int)':
-/usr/include/linux/cpumask.h:177: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h: In function `int __cpus_full(const cpumask_t*,
-   int)':
-/usr/include/linux/cpumask.h:183: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h: In function `int __cpus_weight(const cpumask_t*,
-   int)':
-/usr/include/linux/cpumask.h:189: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h: In function `void __cpus_shift_right(cpumask_t*,
-   const cpumask_t*, int, int)':
-/usr/include/linux/cpumask.h:197: error: 'struct cpumask_t' has no member named
-   'bits'
-/usr/include/linux/cpumask.h:197: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h: In function `void __cpus_shift_left(cpumask_t*,
-   const cpumask_t*, int, int)':
-/usr/include/linux/cpumask.h:205: error: 'struct cpumask_t' has no member named
-   'bits'
-/usr/include/linux/cpumask.h:205: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h: In function `int __first_cpu(const cpumask_t*,
-   int)':
-/usr/include/linux/cpumask.h:211: error: syntax error before `,' token
-/usr/include/linux/cpumask.h: In function `int __next_cpu(int, const
-   cpumask_t*, int)':
-/usr/include/linux/cpumask.h:217: error: syntax error before `,' token
-/usr/include/linux/cpumask.h: In function `int __cpumask_scnprintf(char*, int,
-   const cpumask_t*, int)':
-/usr/include/linux/cpumask.h:268: error: 'const struct cpumask_t' has no member
-   named 'bits'
-/usr/include/linux/cpumask.h: In function `int __cpumask_parse(const char*,
-   int, cpumask_t*, int)':
-/usr/include/linux/cpumask.h:276: error: 'struct cpumask_t' has no member named
-   'bits'
-In file included from /usr/include/asm/mmu.h:4,
-                 from /usr/include/linux/sched.h:21,
-                 from /usr/include/pthread.h:20,
-                 from /upp/uppsrc/Core/Core.h:225,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/asm-x86_64/mmu.h: At global scope:
-/usr/include/asm-x86_64/mmu.h:15: error: 'rwlock_t' is used as a type, but is
-   not defined as a type.
-/usr/include/asm-x86_64/mmu.h:17: error: field `sem' has incomplete type
-In file included from /usr/include/linux/signal.h:4,
-                 from /usr/include/linux/sched.h:25,
-                 from /usr/include/pthread.h:20,
-                 from /upp/uppsrc/Core/Core.h:225,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/linux/list.h:715:2: warning: #warning "don't include kernel headers in userspace"
-In file included from /usr/include/asm/signal.h:4,
-                 from /usr/include/linux/signal.h:6,
-                 from /usr/include/linux/sched.h:25,
-                 from /usr/include/pthread.h:20,
-                 from /upp/uppsrc/Core/Core.h:225,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/asm-x86_64/signal.h:35: error: conflicting types for `typedef long
-   unsigned int sigset_t'
-/usr/include/sys/select.h:38: error: previous declaration as `typedef struct
-   __sigset_t sigset_t'
-/usr/include/asm-x86_64/signal.h:163: error: 'size_t' is used as a type, but is
-   not defined as a type.
-In file included from /usr/include/asm-x86_64/siginfo.h:8,
-                 from /usr/include/asm/siginfo.h:4,
-                 from /usr/include/linux/signal.h:7,
-                 from /usr/include/linux/sched.h:25,
-                 from /usr/include/pthread.h:20,
-                 from /upp/uppsrc/Core/Core.h:225,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/asm-generic/siginfo.h:57: error: 'timer_t' is used as a type, but
-   is not defined as a type.
-/usr/include/asm-generic/siginfo.h:76: error: 'clock_t' is used as a type, but
-   is not defined as a type.
-/usr/include/asm-generic/siginfo.h:77: error: 'clock_t' is used as a type, but
-   is not defined as a type.
-In file included from /usr/include/linux/sched.h:27,
-                 from /usr/include/pthread.h:20,
-                 from /upp/uppsrc/Core/Core.h:225,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/linux/fs_struct.h:9: error: 'rwlock_t' is used as a type, but is
-   not defined as a type.
-In file included from /usr/include/linux/sched.h:29,
-                 from /usr/include/pthread.h:20,
-                 from /upp/uppsrc/Core/Core.h:225,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/linux/completion.h:15: error: syntax error before `;' token
-/usr/include/linux/completion.h: In function `void init_completion(completion*)
-   ':
-/usr/include/linux/completion.h:27: error: invalid use of `union wait'
-/usr/include/linux/completion.h:27: error: `init_waitqueue_head' undeclared
-   (first use this function)
-In file included from /usr/include/linux/sched.h:30,
-                 from /usr/include/pthread.h:20,
-                 from /upp/uppsrc/Core/Core.h:225,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/linux/pid.h: At global scope:
-/usr/include/linux/pid.h:17: error: field `pid_chain' has incomplete type
-/usr/include/linux/pid.h:19: error: field `pid_list' has incomplete type
-In file included from /usr/include/pthread.h:20,
-                 from /upp/uppsrc/Core/Core.h:225,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/linux/sched.h:92: error: type specifier omitted for parameter `
-   process_counts'
-In file included from /usr/include/linux/sched.h:101,
-                 from /usr/include/pthread.h:20,
-                 from /upp/uppsrc/Core/Core.h:225,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/linux/timer.h:11: error: field `entry' has incomplete type
-/usr/include/linux/timer.h: In function `void init_timer(timer_list*)':
-/usr/include/linux/timer.h:45: error: `spin_lock_init' undeclared (first use
-   this function)
-In file included from /usr/include/asm/pda.h:4,
-                 from /usr/include/asm-x86_64/current.h:7,
-                 from /usr/include/asm/current.h:4,
-                 from /usr/include/asm-x86_64/processor.h:18,
-                 from /usr/include/asm/processor.h:4,
-                 from /usr/include/linux/sched.h:103,
-                 from /usr/include/pthread.h:20,
-                 from /upp/uppsrc/Core/Core.h:225,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/asm-x86_64/pda.h: At global scope:
-/usr/include/asm-x86_64/pda.h:26: error: `CONFIG_X86_L1_CACHE_SHIFT' was not
-   declared in this scope
-/usr/include/asm-x86_64/pda.h:26: error: requested alignment is not a constant
-In file included from /usr/include/asm/processor.h:4,
-                 from /usr/include/linux/sched.h:103,
-                 from /usr/include/pthread.h:20,
-                 from /upp/uppsrc/Core/Core.h:225,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/asm-x86_64/processor.h:190: error: 'u16' is used as a type, but is
-   not defined as a type.
-/usr/include/asm-x86_64/processor.h:191: error: 'u16' is used as a type, but is
-   not defined as a type.
-/usr/include/asm-x86_64/processor.h:192: error: 'u16' is used as a type, but is
-   not defined as a type.
-/usr/include/asm-x86_64/processor.h:193: error: 'u16' is used as a type, but is
-   not defined as a type.
-/usr/include/asm-x86_64/processor.h:194: error: 'u64' is used as a type, but is
-   not defined as a type.
-/usr/include/asm-x86_64/processor.h:195: error: 'u64' is used as a type, but is
-   not defined as a type.
-/usr/include/asm-x86_64/processor.h:196: error: 'u32' is used as a type, but is
-   not defined as a type.
-/usr/include/asm-x86_64/processor.h:197: error: 'u32' is used as a type, but is
-   not defined as a type.
-/usr/include/asm-x86_64/processor.h:198: error: syntax error before `[' token
-/usr/include/asm-x86_64/processor.h:199: error: syntax error before `[' token
-/usr/include/asm-x86_64/processor.h:200: error: syntax error before `[' token
-/usr/include/asm-x86_64/processor.h:208: error: 'u32' is used as a type, but is
-   not defined as a type.
-/usr/include/asm-x86_64/processor.h:209: error: 'u64' is used as a type, but is
-   not defined as a type.
-/usr/include/asm-x86_64/processor.h:210: error: 'u64' is used as a type, but is
-   not defined as a type.
-/usr/include/asm-x86_64/processor.h:211: error: 'u64' is used as a type, but is
-   not defined as a type.
-/usr/include/asm-x86_64/processor.h:212: error: 'u64' is used as a type, but is
-   not defined as a type.
-/usr/include/asm-x86_64/processor.h:213: error: syntax error before `[' token
-/usr/include/asm-x86_64/processor.h:214: error: 'u32' is used as a type, but is
-   not defined as a type.
-/usr/include/asm-x86_64/processor.h:215: error: 'u32' is used as a type, but is
-   not defined as a type.
-/usr/include/asm-x86_64/processor.h:216: error: 'u16' is used as a type, but is
-   not defined as a type.
-/usr/include/asm-x86_64/processor.h:217: error: 'u16' is used as a type, but is
-   not defined as a type.
-/usr/include/asm-x86_64/processor.h:228: error: `CONFIG_X86_L1_CACHE_SHIFT' was
-   not declared in this scope
-/usr/include/asm-x86_64/processor.h:228: error: requested alignment is not a
-   constant
-/usr/include/asm-x86_64/processor.h:259: error: syntax error before `[' token
-/usr/include/asm-x86_64/processor.h: In function `void prefetchw(void*)':
-/usr/include/asm-x86_64/processor.h:401: error: `"r"' cannot be used as a
-   function
-/usr/include/asm-x86_64/processor.h:401: error: `alternative_input' undeclared
-   (first use this function)
-In file included from /upp/uppsrc/Core/Core.h:225,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/pthread.h: At global scope:
-/usr/include/pthread.h:247: error: type specifier omitted for parameter `size_t
-   '
-/usr/include/pthread.h:247: error: syntax error before `)' token
-/usr/include/pthread.h:251: error: type specifier omitted for parameter `size_t
-   '
-/usr/include/pthread.h:251: error: syntax error before `*' token
-/usr/include/pthread.h:272: error: type specifier omitted for parameter `size_t
-   '
-/usr/include/pthread.h:272: error: syntax error before `)' token
-/usr/include/pthread.h:277: error: type specifier omitted for parameter `size_t
-   '
-/usr/include/pthread.h:277: error: syntax error before `*' token
-/usr/include/pthread.h:284: error: type specifier omitted for parameter `size_t
-   '
-/usr/include/pthread.h:284: error: syntax error before `)' token
-/usr/include/pthread.h:288: error: type specifier omitted for parameter `size_t
-   '
-/usr/include/pthread.h:288: error: syntax error before `*' token
-In file included from /usr/include/c++/3.3.5/cstring:49,
-                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:65,
-                 from /usr/include/c++/3.3.5/algorithm:66,
-                 from /upp/uppsrc/Core/Core.h:299,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/c++/3.3.5/cstddef:52: error: `ptrdiff_t' not declared
-In file included from /usr/include/c++/3.3.5/bits/stl_algobase.h:65,
-                 from /usr/include/c++/3.3.5/algorithm:66,
-                 from /upp/uppsrc/Core/Core.h:299,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/c++/3.3.5/cstring:80: error: `memmove' not declared
-/usr/include/c++/3.3.5/cstring:81: error: `strcpy' not declared
-/usr/include/c++/3.3.5/cstring:82: error: `strncpy' not declared
-/usr/include/c++/3.3.5/cstring:83: error: `strcat' not declared
-/usr/include/c++/3.3.5/cstring:84: error: `strncat' not declared
-/usr/include/c++/3.3.5/cstring:85: error: `memcmp' not declared
-/usr/include/c++/3.3.5/cstring:86: error: `strcmp' not declared
-/usr/include/c++/3.3.5/cstring:87: error: `strcoll' not declared
-/usr/include/c++/3.3.5/cstring:88: error: `strncmp' not declared
-/usr/include/c++/3.3.5/cstring:89: error: `strxfrm' not declared
-/usr/include/c++/3.3.5/cstring:90: error: `strcspn' not declared
-/usr/include/c++/3.3.5/cstring:91: error: `strspn' not declared
-/usr/include/c++/3.3.5/cstring:92: error: `strtok' not declared
-/usr/include/c++/3.3.5/cstring:94: error: `strerror' not declared
-/usr/include/c++/3.3.5/cstring:95: error: `strlen' not declared
-/usr/include/c++/3.3.5/cstring:97: error: `memchr' not declared
-/usr/include/c++/3.3.5/cstring:100: error: type specifier omitted for parameter
-   `size_t'
-/usr/include/c++/3.3.5/cstring:100: error: syntax error before `)' token
-/usr/include/c++/3.3.5/cstring: In function `void* std::memchr(...)':
-/usr/include/c++/3.3.5/cstring:101: error: `__p' undeclared (first use this
-   function)
-/usr/include/c++/3.3.5/cstring:101: error: `__c' undeclared (first use this
-   function)
-/usr/include/c++/3.3.5/cstring: At global scope:
-/usr/include/c++/3.3.5/cstring:103: error: `strchr' not declared
-/usr/include/c++/3.3.5/cstring:109: error: `strpbrk' not declared
-/usr/include/c++/3.3.5/cstring:115: error: `strrchr' not declared
-/usr/include/c++/3.3.5/cstring:121: error: `strstr' not declared
-In file included from /usr/include/c++/3.3.5/bits/stl_algobase.h:67,
-                 from /usr/include/c++/3.3.5/algorithm:66,
-                 from /upp/uppsrc/Core/Core.h:299,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/c++/3.3.5/cstdlib:105: error: `mbstowcs' not declared
-/usr/include/c++/3.3.5/cstdlib:115: error: `wcstombs' not declared
-In file included from /usr/include/c++/3.3.5/bits/stl_algobase.h:69,
-                 from /usr/include/c++/3.3.5/algorithm:66,
-                 from /upp/uppsrc/Core/Core.h:299,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/c++/3.3.5/new:82: error: `size_t' undeclared in namespace `std'
-/usr/include/c++/3.3.5/new:82: error: declaration of `operator new' as
-   non-function
-/usr/include/c++/3.3.5/new:82: error: invalid declarator
-/usr/include/c++/3.3.5/new:83: error: `size_t' undeclared in namespace `std'
-/usr/include/c++/3.3.5/new:83: error: declaration of `operator new []' as
-   non-function
-/usr/include/c++/3.3.5/new:83: error: invalid declarator
-/usr/include/c++/3.3.5/new:86: error: `size_t' undeclared in namespace `std'
-/usr/include/c++/3.3.5/new:86: error: syntax error before `::' token
-/usr/include/c++/3.3.5/new:86: error: `operator new' takes type `size_t' (`long
-   unsigned int') as first parameter
-/usr/include/c++/3.3.5/new:87: error: `size_t' undeclared in namespace `std'
-/usr/include/c++/3.3.5/new:87: error: syntax error before `::' token
-/usr/include/c++/3.3.5/new:87: error: `operator new' takes type `size_t' (`long
-   unsigned int') as first parameter
-/usr/include/c++/3.3.5/new:92: error: `size_t' undeclared in namespace `std'
-/usr/include/c++/3.3.5/new:92: error: syntax error before `*' token
-/usr/include/c++/3.3.5/new:92: error: `operator new' takes type `size_t' (`long
-   unsigned int') as first parameter
-/usr/include/c++/3.3.5/new: In function `void* operator new(long unsigned int,
-   ...)':
-/usr/include/c++/3.3.5/new:92: error: `__p' undeclared (first use this
-   function)
-/usr/include/c++/3.3.5/new: At global scope:
-/usr/include/c++/3.3.5/new:93: error: `size_t' undeclared in namespace `std'
-/usr/include/c++/3.3.5/new:93: error: syntax error before `*' token
-/usr/include/c++/3.3.5/new:93: error: `operator new' takes type `size_t' (`long
-   unsigned int') as first parameter
-In file included from /usr/include/c++/3.3.5/x86_64-suse-linux/bits/c++locale.h:43,
-                 from /usr/include/c++/3.3.5/iosfwd:46,
-                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
-                 from /usr/include/c++/3.3.5/algorithm:66,
-                 from /upp/uppsrc/Core/Core.h:299,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/iconv.h:43: error: syntax error before `(' token
-In file included from /usr/include/c++/3.3.5/iosfwd:47,
-                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
-                 from /usr/include/c++/3.3.5/algorithm:66,
-                 from /upp/uppsrc/Core/Core.h:299,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/c++/3.3.5/cctype:68: error: `isalnum' not declared
-/usr/include/c++/3.3.5/cctype:69: error: `isalpha' not declared
-/usr/include/c++/3.3.5/cctype:70: error: `iscntrl' not declared
-/usr/include/c++/3.3.5/cctype:71: error: `isdigit' not declared
-/usr/include/c++/3.3.5/cctype:72: error: `isgraph' not declared
-/usr/include/c++/3.3.5/cctype:73: error: `islower' not declared
-/usr/include/c++/3.3.5/cctype:74: error: `isprint' not declared
-/usr/include/c++/3.3.5/cctype:75: error: `ispunct' not declared
-/usr/include/c++/3.3.5/cctype:76: error: `isspace' not declared
-/usr/include/c++/3.3.5/cctype:77: error: `isupper' not declared
-/usr/include/c++/3.3.5/cctype:78: error: `isxdigit' not declared
-/usr/include/c++/3.3.5/cctype:79: error: `tolower' not declared
-/usr/include/c++/3.3.5/cctype:80: error: `toupper' not declared
-In file included from /usr/include/c++/3.3.5/x86_64-suse-linux/bits/c++io.h:35,
-                 from /usr/include/c++/3.3.5/bits/fpos.h:44,
-                 from /usr/include/c++/3.3.5/iosfwd:49,
-                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
-                 from /usr/include/c++/3.3.5/algorithm:66,
-                 from /upp/uppsrc/Core/Core.h:299,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/c++/3.3.5/cstdio:114: error: `fread' not declared
-/usr/include/c++/3.3.5/cstdio:120: error: `fwrite' not declared
-In file included from /usr/include/c++/3.3.5/bits/fpos.h:44,
-                 from /usr/include/c++/3.3.5/iosfwd:49,
-                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
-                 from /usr/include/c++/3.3.5/algorithm:66,
-                 from /upp/uppsrc/Core/Core.h:299,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/c++/3.3.5/x86_64-suse-linux/bits/c++io.h:43: error: syntax error
-   before `;' token
-/usr/include/c++/3.3.5/x86_64-suse-linux/bits/c++io.h:45: error: syntax error
-   before `;' token
-In file included from /usr/include/c++/3.3.5/cwchar:51,
-                 from /usr/include/c++/3.3.5/bits/fpos.h:45,
-                 from /usr/include/c++/3.3.5/iosfwd:49,
-                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
-                 from /usr/include/c++/3.3.5/algorithm:66,
-                 from /upp/uppsrc/Core/Core.h:299,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/c++/3.3.5/ctime:66: error: `clock_t' not declared
-/usr/include/c++/3.3.5/ctime:67: error: `time_t' not declared
-/usr/include/c++/3.3.5/ctime:68: error: `tm' not declared
-/usr/include/c++/3.3.5/ctime:70: error: `clock' not declared
-/usr/include/c++/3.3.5/ctime:71: error: `difftime' not declared
-/usr/include/c++/3.3.5/ctime:72: error: `mktime' not declared
-/usr/include/c++/3.3.5/ctime:73: error: `time' not declared
-/usr/include/c++/3.3.5/ctime:74: error: `asctime' not declared
-/usr/include/c++/3.3.5/ctime:75: error: `ctime' not declared
-/usr/include/c++/3.3.5/ctime:76: error: `gmtime' not declared
-/usr/include/c++/3.3.5/ctime:77: error: `localtime' not declared
-/usr/include/c++/3.3.5/ctime:78: error: `strftime' not declared
-In file included from /usr/include/c++/3.3.5/cwchar:54,
-                 from /usr/include/c++/3.3.5/bits/fpos.h:45,
-                 from /usr/include/c++/3.3.5/iosfwd:49,
-                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
-                 from /usr/include/c++/3.3.5/algorithm:66,
-                 from /upp/uppsrc/Core/Core.h:299,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/wchar.h:40:21: stdarg.h: No such file or directory
-In file included from /usr/include/c++/3.3.5/cwchar:54,
-                 from /usr/include/c++/3.3.5/bits/fpos.h:45,
-                 from /usr/include/c++/3.3.5/iosfwd:49,
-                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
-                 from /usr/include/c++/3.3.5/algorithm:66,
-                 from /upp/uppsrc/Core/Core.h:299,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/wchar.h:137: error: type specifier omitted for parameter `size_t'
-/usr/include/wchar.h:137: error: syntax error before `)' token
-/usr/include/wchar.h:145: error: type specifier omitted for parameter `size_t'
-/usr/include/wchar.h:145: error: syntax error before `)' token
-/usr/include/wchar.h:152: error: type specifier omitted for parameter `size_t'
-/usr/include/wchar.h:152: error: syntax error before `)' token
-/usr/include/wchar.h:162: error: type specifier omitted for parameter `size_t'
-/usr/include/wchar.h:162: error: syntax error before `)' token
-/usr/include/wchar.h:172: error: type specifier omitted for parameter `size_t'
-/usr/include/wchar.h:172: error: syntax error before `,' token
-/usr/include/wchar.h:182: error: syntax error before `(' token
-/usr/include/wchar.h:198: error: syntax error before `(' token
-/usr/include/wchar.h:224: error: syntax error before `(' token
-/usr/include/wchar.h:228: error: syntax error before `(' token
-/usr/include/wchar.h:243: error: syntax error before `(' token
-/usr/include/wchar.h:254: error: syntax error before `(' token
-/usr/include/wchar.h:261: error: type specifier omitted for parameter `size_t'
-/usr/include/wchar.h:261: error: syntax error before `)' token
-/usr/include/wchar.h:266: error: type specifier omitted for parameter `size_t'
-/usr/include/wchar.h:266: error: syntax error before `)' token
-/usr/include/wchar.h:271: error: type specifier omitted for parameter `size_t'
-/usr/include/wchar.h:271: error: syntax error before `)' token
-/usr/include/wchar.h:275: error: type specifier omitted for parameter `size_t'
-/usr/include/wchar.h:275: error: syntax error before `)' token
-/usr/include/wchar.h:279: error: type specifier omitted for parameter `size_t'
-/usr/include/wchar.h:279: error: syntax error before `)' token
-/usr/include/wchar.h:286: error: type specifier omitted for parameter `size_t'
-/usr/include/wchar.h:286: error: syntax error before `)' token
-/usr/include/wchar.h:306: error: syntax error before `(' token
-/usr/include/wchar.h:311: error: syntax error before `(' token
-/usr/include/wchar.h:315: error: syntax error before `(' token
-/usr/include/wchar.h:317: error: syntax error before `(' token
-/usr/include/wchar.h:324: error: syntax error before `(' token
-/usr/include/wchar.h:333: error: syntax error before `(' token
-/usr/include/wchar.h:339: error: syntax error before `(' token
-/usr/include/wchar.h:348: error: syntax error before `(' token
-/usr/include/wchar.h:354: error: syntax error before `(' token
-/usr/include/wchar.h:368: error: type specifier omitted for parameter `size_t'
-/usr/include/wchar.h:368: error: syntax error before `)' token
-/usr/include/wchar.h:575: error: type specifier omitted for parameter `size_t'
-/usr/include/wchar.h:575: error: syntax error before `)' token
-/usr/include/wchar.h:602: error: type specifier omitted for parameter `size_t'
-/usr/include/wchar.h:602: error: syntax error before `,' token
-/usr/include/wchar.h:612: error: type specifier omitted for parameter `
-   __gnuc_va_list'
-/usr/include/wchar.h:612: error: syntax error before `)' token
-/usr/include/wchar.h:619: error: type specifier omitted for parameter `
-   __gnuc_va_list'
-/usr/include/wchar.h:619: error: syntax error before `)' token
-/usr/include/wchar.h:623: error: type specifier omitted for parameter `size_t'
-/usr/include/wchar.h:623: error: syntax error before `,' token
-/usr/include/wchar.h:659: error: type specifier omitted for parameter `
-   __gnuc_va_list'
-/usr/include/wchar.h:659: error: syntax error before `)' token
-/usr/include/wchar.h:666: error: type specifier omitted for parameter `
-   __gnuc_va_list'
-/usr/include/wchar.h:666: error: syntax error before `)' token
-/usr/include/wchar.h:671: error: type specifier omitted for parameter `
-   __gnuc_va_list'
-/usr/include/wchar.h:671: error: syntax error before `)' token
-/usr/include/wchar.h:793: error: syntax error before `(' token
-/usr/include/wchar.h:803: error: syntax error before `(' token
-In file included from /usr/include/c++/3.3.5/bits/fpos.h:45,
-                 from /usr/include/c++/3.3.5/iosfwd:49,
-                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
-                 from /usr/include/c++/3.3.5/algorithm:66,
-                 from /upp/uppsrc/Core/Core.h:299,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/c++/3.3.5/cwchar:147: error: `mbrlen' not declared
-/usr/include/c++/3.3.5/cwchar:148: error: `mbrtowc' not declared
-/usr/include/c++/3.3.5/cwchar:150: error: `mbsrtowcs' not declared
-/usr/include/c++/3.3.5/cwchar:162: error: `wcrtomb' not declared
-/usr/include/c++/3.3.5/cwchar:167: error: `wcscspn' not declared
-/usr/include/c++/3.3.5/cwchar:168: error: `wcsftime' not declared
-/usr/include/c++/3.3.5/cwchar:169: error: `wcslen' not declared
-/usr/include/c++/3.3.5/cwchar:173: error: `wcsrtombs' not declared
-/usr/include/c++/3.3.5/cwchar:174: error: `wcsspn' not declared
-/usr/include/c++/3.3.5/cwchar:180: error: `wcsxfrm' not declared
-/usr/include/c++/3.3.5/cwchar:216: error: type specifier omitted for parameter
-   `size_t'
-/usr/include/c++/3.3.5/cwchar:216: error: syntax error before `)' token
-/usr/include/c++/3.3.5/cwchar: In function `wchar_t* std::wmemchr(...)':
-/usr/include/c++/3.3.5/cwchar:217: error: `wchar_t* std::wmemchr(...)'
-   conflicts with previous using declaration `wchar_t* wmemchr(...)'
-In file included from /usr/include/c++/3.3.5/bits/stl_algobase.h:73,
-                 from /usr/include/c++/3.3.5/algorithm:66,
-                 from /upp/uppsrc/Core/Core.h:299,
-                 from /upp/uppsrc/Web/Web.h:4,
-                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
-/usr/include/c++/3.3.5/bits/stl_iterator_base_types.h: At global scope:
-/usr/include/c++/3.3.5/bits/stl_iterator_base_types.h:102: error: syntax error
-   before `,' token
-/usr/include/c++/3.3.5/bits/stl_iterator_base_types.h:109: error: template
-   declaration of `typedef _Tp std::value_type'
-/usr/include/c++/3.3.5/bits/stl_iterator_base_types.h:109: confused by earlier errors, bailing out
-make: *** [/uppout/Web/TServ/GCC33-Gcc-Linux-Main/tserv.o] Error 1
+make: Warning: File `/upp/uppsrc/Web/TServ/tserv.cpp' has modification time 2.9e+03 s in the future
+In file included from /upp/uppsrc/Core/Core.h:206,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/stdlib.h:140: error: syntax error before `(' token
+In file included from /usr/include/sys/types.h:133,
+                 from /usr/include/stdlib.h:433,
+                 from /upp/uppsrc/Core/Core.h:206,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/time.h:10: error: 'time_t' is used as a type, but is not
+   defined as a type.
+/usr/include/linux/time.h:16: error: 'time_t' is used as a type, but is not
+   defined as a type.
+/usr/include/linux/time.h:17: error: 'suseconds_t' is used as a type, but is
+   not defined as a type.
+In file included from /usr/include/sys/select.h:46,
+                 from /usr/include/sys/types.h:216,
+                 from /usr/include/stdlib.h:433,
+                 from /upp/uppsrc/Core/Core.h:206,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/bits/time.h:70: error: redefinition of `struct timeval'
+/usr/include/linux/time.h:15: error: previous definition of `struct timeval'
+In file included from /usr/include/sys/types.h:266,
+                 from /usr/include/stdlib.h:433,
+                 from /upp/uppsrc/Core/Core.h:206,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/bits/pthreadtypes.h:48: error: 'size_t' is used as a type, but is
+   not defined as a type.
+/usr/include/bits/pthreadtypes.h:51: error: 'size_t' is used as a type, but is
+   not defined as a type.
+In file included from /upp/uppsrc/Core/Core.h:206,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/stdlib.h:450: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:450: error: syntax error before `)' token
+/usr/include/stdlib.h:480: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:480: error: syntax error before `,' token
+/usr/include/stdlib.h:584: error: `size_t' was not declared in this scope
+/usr/include/stdlib.h:584: error: syntax error before `)' token
+/usr/include/stdlib.h:586: error: `size_t' was not declared in this scope
+/usr/include/stdlib.h:586: error: syntax error before `,' token
+/usr/include/stdlib.h:595: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:595: error: syntax error before `)' token
+In file included from /usr/include/stdlib.h:606,
+                 from /upp/uppsrc/Core/Core.h:206,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/alloca.h:33: error: `size_t' was not declared in this scope
+/usr/include/alloca.h:33: error: syntax error before `)' token
+In file included from /upp/uppsrc/Core/Core.h:206,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/stdlib.h:611: error: `size_t' was not declared in this scope
+/usr/include/stdlib.h:611: error: syntax error before `)' token
+/usr/include/stdlib.h:616: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:616: error: syntax error before `,' token
+/usr/include/stdlib.h:768: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:768: error: syntax error before `,' token
+/usr/include/stdlib.h:773: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:773: error: syntax error before `,' token
+/usr/include/stdlib.h:846: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:846: error: syntax error before `)' token
+/usr/include/stdlib.h:849: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:849: error: syntax error before `)' token
+/usr/include/stdlib.h:853: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:853: error: syntax error before `)' token
+/usr/include/stdlib.h:857: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:857: error: syntax error before `)' token
+/usr/include/stdlib.h:866: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:866: error: syntax error before `)' token
+/usr/include/stdlib.h:870: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:870: error: syntax error before `)' token
+/usr/include/stdlib.h:877: error: syntax error before `(' token
+/usr/include/stdlib.h:880: error: syntax error before `(' token
+/usr/include/stdlib.h:943: error: type specifier omitted for parameter `size_t'
+/usr/include/stdlib.h:943: error: syntax error before `)' token
+In file included from /usr/include/_G_config.h:44,
+                 from /usr/include/libio.h:32,
+                 from /usr/include/stdio.h:72,
+                 from /upp/uppsrc/Core/Core.h:207,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/gconv.h:72: error: type specifier omitted for parameter `size_t'
+/usr/include/gconv.h:72: error: syntax error before `*' token
+/usr/include/gconv.h:88: error: type specifier omitted for parameter `size_t'
+/usr/include/gconv.h:88: error: syntax error before `*' token
+/usr/include/gconv.h:97: error: type specifier omitted for parameter `size_t'
+/usr/include/gconv.h:97: error: syntax error before `*' token
+/usr/include/gconv.h:174: error: 'size_t' is used as a type, but is not defined
+   as a type.
+In file included from /usr/include/stdio.h:72,
+                 from /upp/uppsrc/Core/Core.h:207,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/libio.h:53:21: stdarg.h: No such file or directory
+In file included from /usr/include/stdio.h:72,
+                 from /upp/uppsrc/Core/Core.h:207,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/libio.h:354: error: type specifier omitted for parameter `size_t'
+/usr/include/libio.h:354: error: syntax error before `)' token
+/usr/include/libio.h:363: error: type specifier omitted for parameter `size_t'
+/usr/include/libio.h:363: error: syntax error before `)' token
+/usr/include/libio.h:475: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/libio.h:477: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/libio.h:479: error: syntax error before `(' token
+In file included from /upp/uppsrc/Core/Core.h:207,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/stdio.h:77: error: syntax error before `;' token
+In file included from /upp/uppsrc/Core/Core.h:207,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/stdio.h:286: error: type specifier omitted for parameter `size_t'
+/usr/include/stdio.h:286: error: syntax error before `,' token
+/usr/include/stdio.h:292: error: type specifier omitted for parameter `size_t'
+/usr/include/stdio.h:292: error: syntax error before `*' token
+/usr/include/stdio.h:304: error: type specifier omitted for parameter `size_t'
+/usr/include/stdio.h:304: error: syntax error before `)' token
+/usr/include/stdio.h:311: error: type specifier omitted for parameter `size_t'
+/usr/include/stdio.h:311: error: syntax error before `)' token
+/usr/include/stdio.h:339: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/stdio.h:339: error: syntax error before `)' token
+/usr/include/stdio.h:344: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/stdio.h:344: error: syntax error before `)' token
+/usr/include/stdio.h:347: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/stdio.h:347: error: syntax error before `)' token
+/usr/include/stdio.h:353: error: type specifier omitted for parameter `size_t'
+/usr/include/stdio.h:353: error: syntax error before `,' token
+/usr/include/stdio.h:357: error: type specifier omitted for parameter `size_t'
+/usr/include/stdio.h:357: error: syntax error before `,' token
+/usr/include/stdio.h:367: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/stdio.h:367: error: syntax error before `)' token
+/usr/include/stdio.h:383: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/stdio.h:383: error: syntax error before `)' token
+/usr/include/stdio.h:414: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/stdio.h:414: error: syntax error before `)' token
+/usr/include/stdio.h:421: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/stdio.h:421: error: syntax error before `)' token
+/usr/include/stdio.h:426: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/stdio.h:426: error: syntax error before `)' token
+/usr/include/stdio.h:562: error: type specifier omitted for parameter `size_t'
+/usr/include/stdio.h:562: error: syntax error before `*' token
+/usr/include/stdio.h:565: error: type specifier omitted for parameter `size_t'
+/usr/include/stdio.h:565: error: syntax error before `*' token
+/usr/include/stdio.h:575: error: type specifier omitted for parameter `size_t'
+/usr/include/stdio.h:575: error: syntax error before `*' token
+/usr/include/stdio.h:605: error: syntax error before `(' token
+/usr/include/stdio.h:611: error: syntax error before `(' token
+/usr/include/stdio.h:633: error: syntax error before `(' token
+/usr/include/stdio.h:635: error: syntax error before `(' token
+In file included from /upp/uppsrc/Core/Core.h:207,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/stdio.h:800: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/stdio.h:800: error: syntax error before `)' token
+In file included from /usr/include/stdio.h:830,
+                 from /upp/uppsrc/Core/Core.h:207,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/bits/stdio.h:34: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/bits/stdio.h:34: error: syntax error before `)' token
+/usr/include/bits/stdio.h: In function `int vprintf(...)':
+/usr/include/bits/stdio.h:36: error: `__fmt' undeclared (first use this
+   function)
+/usr/include/bits/stdio.h:36: error: (Each undeclared identifier is reported
+   only once for each function it appears in.)
+/usr/include/bits/stdio.h:36: error: `__arg' undeclared (first use this
+   function)
+/usr/include/bits/stdio.h: At global scope:
+/usr/include/bits/stdio.h:102: error: type specifier omitted for parameter `
+   size_t'
+/usr/include/bits/stdio.h:102: error: syntax error before `*' token
+/usr/include/bits/stdio.h: In function `__ssize_t getline(...)':
+/usr/include/bits/stdio.h:104: error: `__lineptr' undeclared (first use this
+   function)
+/usr/include/bits/stdio.h:104: error: `__n' undeclared (first use this
+   function)
+/usr/include/bits/stdio.h:104: error: `__stream' undeclared (first use this
+   function)
+In file included from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/upp/uppsrc/Core/Core.h:209:20: stdarg.h: No such file or directory
+In file included from /upp/uppsrc/Core/Core.h:221,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/sys/time.h: At global scope:
+/usr/include/sys/time.h:57: error: redefinition of `struct timezone'
+/usr/include/linux/time.h:20: error: previous definition of `struct timezone'
+/usr/include/sys/time.h:94: error: syntax error before numeric constant
+/usr/include/sys/time.h:108: error: redefinition of `struct itimerval'
+/usr/include/linux/time.h:402: error: previous definition of `struct itimerval'
+In file included from /usr/include/asm-x86_64/vsyscall.h:4,
+                 from /usr/include/asm/vsyscall.h:4,
+                 from /usr/include/asm-x86_64/timex.h:12,
+                 from /usr/include/asm/timex.h:4,
+                 from /usr/include/linux/timex.h:157,
+                 from /usr/include/linux/sched.h:11,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/seqlock.h: In function `void write_seqlock(seqlock_t*)':
+/usr/include/linux/seqlock.h:52: error: `spin_lock' undeclared (first use this
+   function)
+/usr/include/linux/seqlock.h:54: error: `smp_wmb' undeclared (first use this
+   function)
+/usr/include/linux/seqlock.h: In function `void write_sequnlock(seqlock_t*)':
+/usr/include/linux/seqlock.h:61: error: `spin_unlock' undeclared (first use
+   this function)
+/usr/include/linux/seqlock.h: In function `int write_tryseqlock(seqlock_t*)':
+/usr/include/linux/seqlock.h:66: error: `spin_trylock' undeclared (first use
+   this function)
+/usr/include/linux/seqlock.h: In function `unsigned int read_seqbegin(const
+   seqlock_t*)':
+/usr/include/linux/seqlock.h:79: error: `smp_rmb' undeclared (first use this
+   function)
+In file included from /usr/include/asm/system.h:4,
+                 from /usr/include/linux/jiffies.h:8,
+                 from /usr/include/linux/sched.h:12,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/asm-x86_64/system.h: At global scope:
+/usr/include/asm-x86_64/system.h:243: error: syntax error before `new'
+/usr/include/asm-x86_64/system.h: In function `long unsigned int __cmpxchg(...)
+   ':
+/usr/include/asm-x86_64/system.h:246: error: `size' undeclared (first use this
+   function)
+/usr/include/asm-x86_64/system.h:248: error: syntax error before string
+   constant
+/usr/include/asm-x86_64/system.h:254: error: syntax error before string
+   constant
+/usr/include/asm-x86_64/system.h:260: error: syntax error before string
+   constant
+/usr/include/asm-x86_64/system.h:266: error: syntax error before string
+   constant
+/usr/include/asm-x86_64/system.h:272: error: `old' undeclared (first use this
+   function)
+In file included from /usr/include/linux/sched.h:12,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/jiffies.h: At global scope:
+/usr/include/linux/jiffies.h:16: error: syntax error before `;' token
+/usr/include/linux/jiffies.h:20: error: syntax error before `)' token
+In file included from /usr/include/linux/sched.h:13,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/rbtree.h:129: error: syntax error before `new'
+In file included from /usr/include/linux/thread_info.h:20,
+                 from /usr/include/linux/sched.h:14,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/bitops.h: In function `int get_bitmask_order(unsigned int)':
+/usr/include/linux/bitops.h:78: error: `fls' undeclared (first use this
+   function)
+In file included from /usr/include/linux/cpumask.h:78,
+                 from /usr/include/linux/sched.h:15,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/bitmap.h: In function `void bitmap_zero(long unsigned int*,
+   int)':
+/usr/include/linux/bitmap.h:113: error: `BITS_PER_LONG' undeclared (first use
+   this function)
+/usr/include/linux/bitmap.h:116: error: `BITS_TO_LONGS' undeclared (first use
+   this function)
+/usr/include/linux/bitmap.h:117: error: `memset' undeclared (first use this
+   function)
+/usr/include/linux/bitmap.h: In function `void bitmap_fill(long unsigned int*,
+   int)':
+/usr/include/linux/bitmap.h:123: error: `size_t' undeclared (first use this
+   function)
+/usr/include/linux/bitmap.h:123: error: syntax error before `=' token
+/usr/include/linux/bitmap.h:124: error: `nlongs' undeclared (first use this
+   function)
+/usr/include/linux/bitmap.h:126: error: `memset' undeclared (first use this
+   function)
+/usr/include/linux/bitmap.h: In function `void bitmap_copy(long unsigned int*,
+   const long unsigned int*, int)':
+/usr/include/linux/bitmap.h:137: error: `BITS_TO_LONGS' undeclared (first use
+   this function)
+/usr/include/linux/bitmap.h:138: error: `memcpy' undeclared (first use this
+   function)
+In file included from /usr/include/linux/sched.h:15,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/cpumask.h: At global scope:
+/usr/include/linux/cpumask.h:81: error: `bits' was not declared in this scope
+/usr/include/linux/cpumask.h:81: error: invalid data member initialization
+/usr/include/linux/cpumask.h:81: error: (use `=' to initialize static data
+   members)
+/usr/include/linux/cpumask.h: In function `void __cpu_set(int, volatile
+   cpumask_t*)':
+/usr/include/linux/cpumask.h:87: error: 'volatile struct cpumask_t' has no
+   member named 'bits'
+/usr/include/linux/cpumask.h: In function `void __cpu_clear(int, volatile
+   cpumask_t*)':
+/usr/include/linux/cpumask.h:93: error: 'volatile struct cpumask_t' has no
+   member named 'bits'
+/usr/include/linux/cpumask.h: In function `void __cpus_setall(cpumask_t*, int)
+   ':
+/usr/include/linux/cpumask.h:99: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h: In function `void __cpus_clear(cpumask_t*, int)':
+/usr/include/linux/cpumask.h:105: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h: In function `int __cpu_test_and_set(int,
+   cpumask_t*)':
+/usr/include/linux/cpumask.h:114: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h: In function `void __cpus_and(cpumask_t*, const
+   cpumask_t*, const cpumask_t*, int)':
+/usr/include/linux/cpumask.h:121: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h:121: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h:121: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `void __cpus_or(cpumask_t*, const
+   cpumask_t*, const cpumask_t*, int)':
+/usr/include/linux/cpumask.h:128: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h:128: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h:128: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `void __cpus_xor(cpumask_t*, const
+   cpumask_t*, const cpumask_t*, int)':
+/usr/include/linux/cpumask.h:135: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h:135: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h:135: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `void __cpus_andnot(cpumask_t*, const
+   cpumask_t*, const cpumask_t*, int)':
+/usr/include/linux/cpumask.h:143: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h:143: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h:143: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `void __cpus_complement(cpumask_t*,
+   const cpumask_t*, int)':
+/usr/include/linux/cpumask.h:150: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h:150: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `int __cpus_equal(const cpumask_t*,
+   const cpumask_t*, int)':
+/usr/include/linux/cpumask.h:157: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h:157: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `int __cpus_intersects(const
+   cpumask_t*, const cpumask_t*, int)':
+/usr/include/linux/cpumask.h:164: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h:164: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `int __cpus_subset(const cpumask_t*,
+   const cpumask_t*, int)':
+/usr/include/linux/cpumask.h:171: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h:171: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `int __cpus_empty(const cpumask_t*,
+   int)':
+/usr/include/linux/cpumask.h:177: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `int __cpus_full(const cpumask_t*,
+   int)':
+/usr/include/linux/cpumask.h:183: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `int __cpus_weight(const cpumask_t*,
+   int)':
+/usr/include/linux/cpumask.h:189: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `void __cpus_shift_right(cpumask_t*,
+   const cpumask_t*, int, int)':
+/usr/include/linux/cpumask.h:197: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h:197: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `void __cpus_shift_left(cpumask_t*,
+   const cpumask_t*, int, int)':
+/usr/include/linux/cpumask.h:205: error: 'struct cpumask_t' has no member named
+   'bits'
+/usr/include/linux/cpumask.h:205: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `int __first_cpu(const cpumask_t*,
+   int)':
+/usr/include/linux/cpumask.h:211: error: syntax error before `,' token
+/usr/include/linux/cpumask.h: In function `int __next_cpu(int, const
+   cpumask_t*, int)':
+/usr/include/linux/cpumask.h:217: error: syntax error before `,' token
+/usr/include/linux/cpumask.h: In function `int __cpumask_scnprintf(char*, int,
+   const cpumask_t*, int)':
+/usr/include/linux/cpumask.h:268: error: 'const struct cpumask_t' has no member
+   named 'bits'
+/usr/include/linux/cpumask.h: In function `int __cpumask_parse(const char*,
+   int, cpumask_t*, int)':
+/usr/include/linux/cpumask.h:276: error: 'struct cpumask_t' has no member named
+   'bits'
+In file included from /usr/include/asm/mmu.h:4,
+                 from /usr/include/linux/sched.h:21,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/asm-x86_64/mmu.h: At global scope:
+/usr/include/asm-x86_64/mmu.h:15: error: 'rwlock_t' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/mmu.h:17: error: field `sem' has incomplete type
+In file included from /usr/include/linux/signal.h:4,
+                 from /usr/include/linux/sched.h:25,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/list.h:715:2: warning: #warning "don't include kernel headers in userspace"
+In file included from /usr/include/asm/signal.h:4,
+                 from /usr/include/linux/signal.h:6,
+                 from /usr/include/linux/sched.h:25,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/asm-x86_64/signal.h:35: error: conflicting types for `typedef long
+   unsigned int sigset_t'
+/usr/include/sys/select.h:38: error: previous declaration as `typedef struct
+   __sigset_t sigset_t'
+/usr/include/asm-x86_64/signal.h:163: error: 'size_t' is used as a type, but is
+   not defined as a type.
+In file included from /usr/include/asm-x86_64/siginfo.h:8,
+                 from /usr/include/asm/siginfo.h:4,
+                 from /usr/include/linux/signal.h:7,
+                 from /usr/include/linux/sched.h:25,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/asm-generic/siginfo.h:57: error: 'timer_t' is used as a type, but
+   is not defined as a type.
+/usr/include/asm-generic/siginfo.h:76: error: 'clock_t' is used as a type, but
+   is not defined as a type.
+/usr/include/asm-generic/siginfo.h:77: error: 'clock_t' is used as a type, but
+   is not defined as a type.
+In file included from /usr/include/linux/sched.h:27,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/fs_struct.h:9: error: 'rwlock_t' is used as a type, but is
+   not defined as a type.
+In file included from /usr/include/linux/sched.h:29,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/completion.h:15: error: syntax error before `;' token
+/usr/include/linux/completion.h: In function `void init_completion(completion*)
+   ':
+/usr/include/linux/completion.h:27: error: invalid use of `union wait'
+/usr/include/linux/completion.h:27: error: `init_waitqueue_head' undeclared
+   (first use this function)
+In file included from /usr/include/linux/sched.h:30,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/pid.h: At global scope:
+/usr/include/linux/pid.h:17: error: field `pid_chain' has incomplete type
+/usr/include/linux/pid.h:19: error: field `pid_list' has incomplete type
+In file included from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/sched.h:92: error: type specifier omitted for parameter `
+   process_counts'
+In file included from /usr/include/linux/sched.h:101,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/linux/timer.h:11: error: field `entry' has incomplete type
+/usr/include/linux/timer.h: In function `void init_timer(timer_list*)':
+/usr/include/linux/timer.h:45: error: `spin_lock_init' undeclared (first use
+   this function)
+In file included from /usr/include/asm/pda.h:4,
+                 from /usr/include/asm-x86_64/current.h:7,
+                 from /usr/include/asm/current.h:4,
+                 from /usr/include/asm-x86_64/processor.h:18,
+                 from /usr/include/asm/processor.h:4,
+                 from /usr/include/linux/sched.h:103,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/asm-x86_64/pda.h: At global scope:
+/usr/include/asm-x86_64/pda.h:26: error: `CONFIG_X86_L1_CACHE_SHIFT' was not
+   declared in this scope
+/usr/include/asm-x86_64/pda.h:26: error: requested alignment is not a constant
+In file included from /usr/include/asm/processor.h:4,
+                 from /usr/include/linux/sched.h:103,
+                 from /usr/include/pthread.h:20,
+                 from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/asm-x86_64/processor.h:190: error: 'u16' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:191: error: 'u16' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:192: error: 'u16' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:193: error: 'u16' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:194: error: 'u64' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:195: error: 'u64' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:196: error: 'u32' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:197: error: 'u32' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:198: error: syntax error before `[' token
+/usr/include/asm-x86_64/processor.h:199: error: syntax error before `[' token
+/usr/include/asm-x86_64/processor.h:200: error: syntax error before `[' token
+/usr/include/asm-x86_64/processor.h:208: error: 'u32' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:209: error: 'u64' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:210: error: 'u64' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:211: error: 'u64' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:212: error: 'u64' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:213: error: syntax error before `[' token
+/usr/include/asm-x86_64/processor.h:214: error: 'u32' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:215: error: 'u32' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:216: error: 'u16' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:217: error: 'u16' is used as a type, but is
+   not defined as a type.
+/usr/include/asm-x86_64/processor.h:228: error: `CONFIG_X86_L1_CACHE_SHIFT' was
+   not declared in this scope
+/usr/include/asm-x86_64/processor.h:228: error: requested alignment is not a
+   constant
+/usr/include/asm-x86_64/processor.h:259: error: syntax error before `[' token
+/usr/include/asm-x86_64/processor.h: In function `void prefetchw(void*)':
+/usr/include/asm-x86_64/processor.h:401: error: `"r"' cannot be used as a
+   function
+/usr/include/asm-x86_64/processor.h:401: error: `alternative_input' undeclared
+   (first use this function)
+In file included from /upp/uppsrc/Core/Core.h:225,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/pthread.h: At global scope:
+/usr/include/pthread.h:247: error: type specifier omitted for parameter `size_t
+   '
+/usr/include/pthread.h:247: error: syntax error before `)' token
+/usr/include/pthread.h:251: error: type specifier omitted for parameter `size_t
+   '
+/usr/include/pthread.h:251: error: syntax error before `*' token
+/usr/include/pthread.h:272: error: type specifier omitted for parameter `size_t
+   '
+/usr/include/pthread.h:272: error: syntax error before `)' token
+/usr/include/pthread.h:277: error: type specifier omitted for parameter `size_t
+   '
+/usr/include/pthread.h:277: error: syntax error before `*' token
+/usr/include/pthread.h:284: error: type specifier omitted for parameter `size_t
+   '
+/usr/include/pthread.h:284: error: syntax error before `)' token
+/usr/include/pthread.h:288: error: type specifier omitted for parameter `size_t
+   '
+/usr/include/pthread.h:288: error: syntax error before `*' token
+In file included from /usr/include/c++/3.3.5/cstring:49,
+                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:65,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/cstddef:52: error: `ptrdiff_t' not declared
+In file included from /usr/include/c++/3.3.5/bits/stl_algobase.h:65,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/cstring:80: error: `memmove' not declared
+/usr/include/c++/3.3.5/cstring:81: error: `strcpy' not declared
+/usr/include/c++/3.3.5/cstring:82: error: `strncpy' not declared
+/usr/include/c++/3.3.5/cstring:83: error: `strcat' not declared
+/usr/include/c++/3.3.5/cstring:84: error: `strncat' not declared
+/usr/include/c++/3.3.5/cstring:85: error: `memcmp' not declared
+/usr/include/c++/3.3.5/cstring:86: error: `strcmp' not declared
+/usr/include/c++/3.3.5/cstring:87: error: `strcoll' not declared
+/usr/include/c++/3.3.5/cstring:88: error: `strncmp' not declared
+/usr/include/c++/3.3.5/cstring:89: error: `strxfrm' not declared
+/usr/include/c++/3.3.5/cstring:90: error: `strcspn' not declared
+/usr/include/c++/3.3.5/cstring:91: error: `strspn' not declared
+/usr/include/c++/3.3.5/cstring:92: error: `strtok' not declared
+/usr/include/c++/3.3.5/cstring:94: error: `strerror' not declared
+/usr/include/c++/3.3.5/cstring:95: error: `strlen' not declared
+/usr/include/c++/3.3.5/cstring:97: error: `memchr' not declared
+/usr/include/c++/3.3.5/cstring:100: error: type specifier omitted for parameter
+   `size_t'
+/usr/include/c++/3.3.5/cstring:100: error: syntax error before `)' token
+/usr/include/c++/3.3.5/cstring: In function `void* std::memchr(...)':
+/usr/include/c++/3.3.5/cstring:101: error: `__p' undeclared (first use this
+   function)
+/usr/include/c++/3.3.5/cstring:101: error: `__c' undeclared (first use this
+   function)
+/usr/include/c++/3.3.5/cstring: At global scope:
+/usr/include/c++/3.3.5/cstring:103: error: `strchr' not declared
+/usr/include/c++/3.3.5/cstring:109: error: `strpbrk' not declared
+/usr/include/c++/3.3.5/cstring:115: error: `strrchr' not declared
+/usr/include/c++/3.3.5/cstring:121: error: `strstr' not declared
+In file included from /usr/include/c++/3.3.5/bits/stl_algobase.h:67,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/cstdlib:105: error: `mbstowcs' not declared
+/usr/include/c++/3.3.5/cstdlib:115: error: `wcstombs' not declared
+In file included from /usr/include/c++/3.3.5/bits/stl_algobase.h:69,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/new:82: error: `size_t' undeclared in namespace `std'
+/usr/include/c++/3.3.5/new:82: error: declaration of `operator new' as
+   non-function
+/usr/include/c++/3.3.5/new:82: error: invalid declarator
+/usr/include/c++/3.3.5/new:83: error: `size_t' undeclared in namespace `std'
+/usr/include/c++/3.3.5/new:83: error: declaration of `operator new []' as
+   non-function
+/usr/include/c++/3.3.5/new:83: error: invalid declarator
+/usr/include/c++/3.3.5/new:86: error: `size_t' undeclared in namespace `std'
+/usr/include/c++/3.3.5/new:86: error: syntax error before `::' token
+/usr/include/c++/3.3.5/new:86: error: `operator new' takes type `size_t' (`long
+   unsigned int') as first parameter
+/usr/include/c++/3.3.5/new:87: error: `size_t' undeclared in namespace `std'
+/usr/include/c++/3.3.5/new:87: error: syntax error before `::' token
+/usr/include/c++/3.3.5/new:87: error: `operator new' takes type `size_t' (`long
+   unsigned int') as first parameter
+/usr/include/c++/3.3.5/new:92: error: `size_t' undeclared in namespace `std'
+/usr/include/c++/3.3.5/new:92: error: syntax error before `*' token
+/usr/include/c++/3.3.5/new:92: error: `operator new' takes type `size_t' (`long
+   unsigned int') as first parameter
+/usr/include/c++/3.3.5/new: In function `void* operator new(long unsigned int,
+   ...)':
+/usr/include/c++/3.3.5/new:92: error: `__p' undeclared (first use this
+   function)
+/usr/include/c++/3.3.5/new: At global scope:
+/usr/include/c++/3.3.5/new:93: error: `size_t' undeclared in namespace `std'
+/usr/include/c++/3.3.5/new:93: error: syntax error before `*' token
+/usr/include/c++/3.3.5/new:93: error: `operator new' takes type `size_t' (`long
+   unsigned int') as first parameter
+In file included from /usr/include/c++/3.3.5/x86_64-suse-linux/bits/c++locale.h:43,
+                 from /usr/include/c++/3.3.5/iosfwd:46,
+                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/iconv.h:43: error: syntax error before `(' token
+In file included from /usr/include/c++/3.3.5/iosfwd:47,
+                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/cctype:68: error: `isalnum' not declared
+/usr/include/c++/3.3.5/cctype:69: error: `isalpha' not declared
+/usr/include/c++/3.3.5/cctype:70: error: `iscntrl' not declared
+/usr/include/c++/3.3.5/cctype:71: error: `isdigit' not declared
+/usr/include/c++/3.3.5/cctype:72: error: `isgraph' not declared
+/usr/include/c++/3.3.5/cctype:73: error: `islower' not declared
+/usr/include/c++/3.3.5/cctype:74: error: `isprint' not declared
+/usr/include/c++/3.3.5/cctype:75: error: `ispunct' not declared
+/usr/include/c++/3.3.5/cctype:76: error: `isspace' not declared
+/usr/include/c++/3.3.5/cctype:77: error: `isupper' not declared
+/usr/include/c++/3.3.5/cctype:78: error: `isxdigit' not declared
+/usr/include/c++/3.3.5/cctype:79: error: `tolower' not declared
+/usr/include/c++/3.3.5/cctype:80: error: `toupper' not declared
+In file included from /usr/include/c++/3.3.5/x86_64-suse-linux/bits/c++io.h:35,
+                 from /usr/include/c++/3.3.5/bits/fpos.h:44,
+                 from /usr/include/c++/3.3.5/iosfwd:49,
+                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/cstdio:114: error: `fread' not declared
+/usr/include/c++/3.3.5/cstdio:120: error: `fwrite' not declared
+In file included from /usr/include/c++/3.3.5/bits/fpos.h:44,
+                 from /usr/include/c++/3.3.5/iosfwd:49,
+                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/x86_64-suse-linux/bits/c++io.h:43: error: syntax error
+   before `;' token
+/usr/include/c++/3.3.5/x86_64-suse-linux/bits/c++io.h:45: error: syntax error
+   before `;' token
+In file included from /usr/include/c++/3.3.5/cwchar:51,
+                 from /usr/include/c++/3.3.5/bits/fpos.h:45,
+                 from /usr/include/c++/3.3.5/iosfwd:49,
+                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/ctime:66: error: `clock_t' not declared
+/usr/include/c++/3.3.5/ctime:67: error: `time_t' not declared
+/usr/include/c++/3.3.5/ctime:68: error: `tm' not declared
+/usr/include/c++/3.3.5/ctime:70: error: `clock' not declared
+/usr/include/c++/3.3.5/ctime:71: error: `difftime' not declared
+/usr/include/c++/3.3.5/ctime:72: error: `mktime' not declared
+/usr/include/c++/3.3.5/ctime:73: error: `time' not declared
+/usr/include/c++/3.3.5/ctime:74: error: `asctime' not declared
+/usr/include/c++/3.3.5/ctime:75: error: `ctime' not declared
+/usr/include/c++/3.3.5/ctime:76: error: `gmtime' not declared
+/usr/include/c++/3.3.5/ctime:77: error: `localtime' not declared
+/usr/include/c++/3.3.5/ctime:78: error: `strftime' not declared
+In file included from /usr/include/c++/3.3.5/cwchar:54,
+                 from /usr/include/c++/3.3.5/bits/fpos.h:45,
+                 from /usr/include/c++/3.3.5/iosfwd:49,
+                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/wchar.h:40:21: stdarg.h: No such file or directory
+In file included from /usr/include/c++/3.3.5/cwchar:54,
+                 from /usr/include/c++/3.3.5/bits/fpos.h:45,
+                 from /usr/include/c++/3.3.5/iosfwd:49,
+                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/wchar.h:137: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:137: error: syntax error before `)' token
+/usr/include/wchar.h:145: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:145: error: syntax error before `)' token
+/usr/include/wchar.h:152: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:152: error: syntax error before `)' token
+/usr/include/wchar.h:162: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:162: error: syntax error before `)' token
+/usr/include/wchar.h:172: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:172: error: syntax error before `,' token
+/usr/include/wchar.h:182: error: syntax error before `(' token
+/usr/include/wchar.h:198: error: syntax error before `(' token
+/usr/include/wchar.h:224: error: syntax error before `(' token
+/usr/include/wchar.h:228: error: syntax error before `(' token
+/usr/include/wchar.h:243: error: syntax error before `(' token
+/usr/include/wchar.h:254: error: syntax error before `(' token
+/usr/include/wchar.h:261: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:261: error: syntax error before `)' token
+/usr/include/wchar.h:266: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:266: error: syntax error before `)' token
+/usr/include/wchar.h:271: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:271: error: syntax error before `)' token
+/usr/include/wchar.h:275: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:275: error: syntax error before `)' token
+/usr/include/wchar.h:279: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:279: error: syntax error before `)' token
+/usr/include/wchar.h:286: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:286: error: syntax error before `)' token
+/usr/include/wchar.h:306: error: syntax error before `(' token
+/usr/include/wchar.h:311: error: syntax error before `(' token
+/usr/include/wchar.h:315: error: syntax error before `(' token
+/usr/include/wchar.h:317: error: syntax error before `(' token
+/usr/include/wchar.h:324: error: syntax error before `(' token
+/usr/include/wchar.h:333: error: syntax error before `(' token
+/usr/include/wchar.h:339: error: syntax error before `(' token
+/usr/include/wchar.h:348: error: syntax error before `(' token
+/usr/include/wchar.h:354: error: syntax error before `(' token
+/usr/include/wchar.h:368: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:368: error: syntax error before `)' token
+/usr/include/wchar.h:575: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:575: error: syntax error before `)' token
+/usr/include/wchar.h:602: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:602: error: syntax error before `,' token
+/usr/include/wchar.h:612: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/wchar.h:612: error: syntax error before `)' token
+/usr/include/wchar.h:619: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/wchar.h:619: error: syntax error before `)' token
+/usr/include/wchar.h:623: error: type specifier omitted for parameter `size_t'
+/usr/include/wchar.h:623: error: syntax error before `,' token
+/usr/include/wchar.h:659: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/wchar.h:659: error: syntax error before `)' token
+/usr/include/wchar.h:666: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/wchar.h:666: error: syntax error before `)' token
+/usr/include/wchar.h:671: error: type specifier omitted for parameter `
+   __gnuc_va_list'
+/usr/include/wchar.h:671: error: syntax error before `)' token
+/usr/include/wchar.h:793: error: syntax error before `(' token
+/usr/include/wchar.h:803: error: syntax error before `(' token
+In file included from /usr/include/c++/3.3.5/bits/fpos.h:45,
+                 from /usr/include/c++/3.3.5/iosfwd:49,
+                 from /usr/include/c++/3.3.5/bits/stl_algobase.h:70,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/cwchar:147: error: `mbrlen' not declared
+/usr/include/c++/3.3.5/cwchar:148: error: `mbrtowc' not declared
+/usr/include/c++/3.3.5/cwchar:150: error: `mbsrtowcs' not declared
+/usr/include/c++/3.3.5/cwchar:162: error: `wcrtomb' not declared
+/usr/include/c++/3.3.5/cwchar:167: error: `wcscspn' not declared
+/usr/include/c++/3.3.5/cwchar:168: error: `wcsftime' not declared
+/usr/include/c++/3.3.5/cwchar:169: error: `wcslen' not declared
+/usr/include/c++/3.3.5/cwchar:173: error: `wcsrtombs' not declared
+/usr/include/c++/3.3.5/cwchar:174: error: `wcsspn' not declared
+/usr/include/c++/3.3.5/cwchar:180: error: `wcsxfrm' not declared
+/usr/include/c++/3.3.5/cwchar:216: error: type specifier omitted for parameter
+   `size_t'
+/usr/include/c++/3.3.5/cwchar:216: error: syntax error before `)' token
+/usr/include/c++/3.3.5/cwchar: In function `wchar_t* std::wmemchr(...)':
+/usr/include/c++/3.3.5/cwchar:217: error: `wchar_t* std::wmemchr(...)'
+   conflicts with previous using declaration `wchar_t* wmemchr(...)'
+In file included from /usr/include/c++/3.3.5/bits/stl_algobase.h:73,
+                 from /usr/include/c++/3.3.5/algorithm:66,
+                 from /upp/uppsrc/Core/Core.h:299,
+                 from /upp/uppsrc/Web/Web.h:4,
+                 from /upp/uppsrc/Web/TServ/tserv.cpp:1:
+/usr/include/c++/3.3.5/bits/stl_iterator_base_types.h: At global scope:
+/usr/include/c++/3.3.5/bits/stl_iterator_base_types.h:102: error: syntax error
+   before `,' token
+/usr/include/c++/3.3.5/bits/stl_iterator_base_types.h:109: error: template
+   declaration of `typedef _Tp std::value_type'
+/usr/include/c++/3.3.5/bits/stl_iterator_base_types.h:109: confused by earlier errors, bailing out
+make: *** [/uppout/Web/TServ/GCC33-Gcc-Linux-Main/tserv.o] Error 1
diff --git a/uppsrc2/TServ/tserv.cpp b/archive/uppsrc/TServ/tserv.cpp
similarity index 95%
rename from uppsrc2/TServ/tserv.cpp
rename to archive/uppsrc/TServ/tserv.cpp
index b74c654e0..ff614e8b3 100644
--- a/uppsrc2/TServ/tserv.cpp
+++ b/archive/uppsrc/TServ/tserv.cpp
@@ -1,843 +1,843 @@
-#include <Web/Web.h>
-#include "version.h"
-#include <plugin/bz2/bz2.h>
-#ifdef PLATFORM_POSIX
-#include <signal.h>
-#endif//PLATFORM_POSIX
-
-using namespace Upp;
-
-enum { DEFAULT_PORT = 2346 };
-
-#ifdef _DEBUG
-#define DO_SVRLOG 1
-#else
-#define DO_SVRLOG 0
-#endif
-
-#if DO_SVRLOG
-#define SVRLOG(x) { StringStream ss; ss << x << '\n'; RLOG(ss.GetResult()); fputs(ss.GetResult(), stderr); fflush(stderr); }
-#else
-#define SVRLOG(x)
-#endif
-
-/*
-void DeleteFolderDeep(const char *dir)
-{
-	FindFile ff(String(dir) + "/*.*");
-	while(ff) {
-		String name = ff.GetName();
-		String p = AppendFileName(dir, name);
-		if(ff.IsFile())
-			DeleteFile(p);
-		else
-		if(ff.IsFolder())
-			DeleteFolderDeep(p);
-		ff.Next();
-	}
-	DirectoryDelete(dir);
-}
-*/
-
-static bool quit_signal = false;
-
-static void QuitSignal(int)
-{
-	puts("Termination signal received, quitting...");
-	quit_signal = true;
-}
-
-class CommandServer
-{
-public:
-	typedef CommandServer CLASSNAME;
-	CommandServer();
-	virtual ~CommandServer();
-
-	CommandServer&  Logging(bool l)                { logging = l; return *this; }
-	CommandServer&  Timing(bool t)                 { timing = t; return *this; }
-	CommandServer&  Filter(const char *ip);
-
-	void            Execute(Socket& socket);
-	bool            StartServer(int port, const String& cmdline);
-	void            StopServer(int port);
-	void            RunServer(int port);
-	void            RunClient();
-	void            Quit()                         { quit_flag = true; }
-
-protected:
-	String          GetConInput(const char *prompt);
-	virtual void    ExecTimer();
-//	void            RunCommand(String cmd, Socket& socket);
-	String          CheckFiles(const char *f);
-	String          FileRemove(const char *f);
-	String          DeleteFolderDeep(const char *f);
-	String          UploadFiles(const char *f);
-	String          DownloadFiles(const char *f);
-	String          CreateDir(const char *f);
-	String          GetFileInfo(const char *f);
-
-protected:
-	class Connection
-	{
-	public:
-		Connection(Socket socket) : socket(socket), eof(false) {}
-		virtual ~Connection();
-
-		bool              IsEof() const   { return eof; }
-		String            GetName() const { return name; }
-		virtual bool      Run() = 0;
-
-	protected:
-		String            name;
-		Socket            socket;
-		bool              eof;
-	};
-
-	class CommandConnection : public Connection
-	{
-	public:
-		CommandConnection(Socket& socket, const char *command);
-
-		virtual bool      Run();
-
-	private:
-		One<SlaveProcess> slave;
-	};
-
-	Array<Connection> connections;
-	int               timer_chunk;
-	bool              logging;
-	bool              timing;
-	bool              quit_flag;
-	Index<dword>      ip_filter;
-//	int             thread_count;
-};
-
-//////////////////////////////////////////////////////////////////////
-// CommandServer::Connection::
-
-CommandServer::Connection::~Connection()
-{
-	if(socket.IsOpen())
-		socket.StopWrite();
-}
-
-//////////////////////////////////////////////////////////////////////
-// CommandServer::CommandConnection::
-
-CommandServer::CommandConnection::CommandConnection(Socket& _socket, const char *_command)
-: Connection(_socket)
-{
-	_socket.Clear();
-	
-	try {
-		String environment;
-		String pathlist;
-		if(*_command == ':') {
-			const char *b = ++_command;
-			while(*_command && *_command++ != '\n')
-				;
-			environment = ASCII85Decode(String(b, _command));
-			for(b = environment; *b; b += strlen(b) + 1)
-				if(!MemICmp(b, "PATH=", 5)) {
-					pathlist = b + 5;
-					break;
-				}
-		}
-		if(*_command == '=')
-			_command++;
-		String command = _command;
-		if(!IsNull(pathlist)) {
-			String exec;
-			if(*_command == '\"') {
-				while(*++_command && (*_command != '\"' || *++_command == '\"'))
-					exec.Cat(*_command);
-			}
-			else
-				while(*_command && (byte)*_command > ' ')
-					exec.Cat(*_command++);
-			command = GetFileOnPath(exec, pathlist, true);
-	#ifdef PLATFORM_WIN32
-			if(IsNull(command))
-				command = GetFileOnPath(exec + ".exe", pathlist, true);
-	#endif
-			if(IsNull(command))
-				command = exec;
-			if(command.Find(' ') >= 0)
-				command = '\"' + command + '\"';
-			command << ' ' << _command;
-		}
-		LOG("CommandServer::CommandConnection(" << command << ")");
-		slave = StartProcess(command, environment);
-		LOG("CommandServer::CommandConnection -> OK");
-		socket.Write("+\0", 2);
-		name << "[command]" << command;
-	}
-	catch(Exc e) {
-		if(socket.IsOpen())
-			socket.Write('-' + e + '\0');
-		throw;
-	}
-}
-
-bool CommandServer::CommandConnection::Run()
-{
-//	SVRLOG("CommandConnection::Run");
-	if(eof)
-		return true;
-	ASSERT(socket.IsOpen());
-	bool work = false;
-	String inp = socket.ReadUntil('\0', 0, 10000000);
-	if(inp.IsVoid())
-	{ // broken pipe
-		slave -> Kill();
-		eof = true;
-		return true;
-	}
-	if(!inp.IsEmpty())
-	{
-		SVRLOG("-> input data: <" << inp << ">");
-		work = true;
-		slave -> Write(inp);
-	}
-	String out = Null;
-	eof = !slave -> Read(out);
-	if(!out.IsEmpty())
-	{
-		work = true;
-		SVRLOG("-> output data: <" << out << ">");
-		socket.Write(out);
-	}
-	if(eof)
-	{
-		work = true;
-		socket.Write("\0", 1);
-		SVRLOG("Process terminated, exit code = " << slave -> GetExitCode());
-		String ec = IntStr(slave -> GetExitCode());
-		socket.Write(ec, ec.GetLength() + 1);
-		socket.StopWrite();
-	}
-//	SVRLOG("/ CommandConnection::Run -> " << (work ? "working" : "idle"));
-	return work;
-}
-
-//////////////////////////////////////////////////////////////////////
-// CommandServer::
-
-CommandServer::CommandServer()
-{
-	timer_chunk = 100;
-	quit_flag = true;
-	Logging(false);
-	Timing(false);
-}
-
-CommandServer::~CommandServer()
-{
-}
-
-CommandServer& CommandServer::Filter(const char *ip)
-{
-	Socket::Init();
-	hostent *he = gethostbyname(ip);
-	if(he)
-		ip_filter.FindAdd(Peek32be((in_addr *)(he -> h_addr_list[0])));
-	else
-		fputs(NFormat("gethostbyname: adresa '%s' nebyla nalezena ...\n", ip), stderr);
-	return *this;
-}
-
-String CommandServer::CheckFiles(const char *f)
-{
-	int line = 0;
-	String out = "OK\n";
-	while(*f)
-	{
-		line++;
-		const char *b = f;
-		while(*f && *f != '\n' && *f != '\t')
-			f++;
-		String fn = NativePath(String(b, f));
-		int t;
-		if(*f != '\t' || IsNull(t = ScanInt(f + 1, &f)))
-			return NFormat("ERROR(%s): file time expected at line %d", fn, line);
-
-		Time time = Time(2000, 1, 1) + t;
-		int l;
-		if(*f != '\t' || IsNull(l = ScanInt(f + 1, &f)))
-			return NFormat("ERROR(%s): file size expected at line %d", fn, line);
-
-			FindFile ff(fn);
-			if(ff && tabs(Time(ff.GetLastWriteTime()) - time) <= 2 && ff.GetLength() == l)
-				out << fn << '\n';
-
-		while(*f && *f++ != '\n')
-			;
-	}
-	return out;
-}
-
-String CommandServer::FileRemove(const char *f)
-{
-	String out;
-	while(*f)
-	{
-		const char *b = f;
-		while(*f && *f != '\n')
-			f++;
-		String fn(b, f);
-		if(!IsNull(fn) && !FileDelete(NativePath(fn)))
-			out << NFormat("%s: error deleting file\n", fn);
-		while(*f && *f++ != '\n')
-			;
-	}
-	if(IsNull(out))
-		out = "OK";
-	return out;
-}
-
-String CommandServer::DeleteFolderDeep(const char *f)
-{
-	while(*f)
-	{
-		const char *b = f;
-		while(*f && *f != '\n')
-			f++;
-		String fn(b, f);
-		if(!IsNull(fn))
-			Upp::DeleteFolderDeep(NativePath(fn));
-		while(*f && *f++ != '\n')
-			;
-	}
-	return "OK";
-}
-
-String CommandServer::GetFileInfo(const char *f)
-{
-	int td = ScanInt(f, &f) - (int)(GetSysTime() - Time(2000, 1, 1));
-	if(*f++ != ':')
-		return "ERROR(@): ':' expected after time delta";
-	int line = 0;
-	String output;
-	while(*f)
-	{
-		line++;
-		const char *b = f;
-		while(*f && *f != '\n')
-			f++;
-		String fn(b, f);
-		FindFile ff;
-		output << fn;
-		if(ff.Search(NativePath(fn)))
-			output << '\t' << ((int)(Time(ff.GetLastWriteTime()) - Time(2000, 1, 1)) + td)
-				<< '\t' << (ff.IsFile() ? (int)ff.GetLength() : -1);
-		output << "\n";
-		while(*f && *f++ != '\n')
-			;
-	}
-	return output;
-}
-
-String CommandServer::UploadFiles(const char *f)
-{
-	SVRLOG("CommandServer::UploadFiles");
-	int line = 0;
-	while(*f)
-	{
-		++line;
-		const char *b = f;
-		while(*f && *f != '\t' && *f != '\n')
-			f++;
-		String fn = NativePath(String(b, f));
-		if(IsNull(fn))
-			return NFormat("ERROR: file name expected at line %d", line);
-		SVRLOG("Updating file '" << fn << "'...");
-		int t;
-		if(*f != '\t' || IsNull(t = ScanInt(f + 1, &f)))
-			return NFormat("ERROR(%s): file time expected at line %d", fn, line);
-
-		Time time = Time(2000, 1, 1) + t;
-		int l;
-		if(*f != '\t' || IsNull(l = ScanInt(f + 1, &f)))
-			return NFormat("ERROR(%s): file size expected at line %d", fn, line);
-
-		if(*f != '\t')
-			return NFormat("ERROR(%s): file content expected at line %d", fn, line);
-		b = ++f;
-		while(*f && *f != '\n')
-			f++;
-		if(*f != '\n')
-			return NFormat("ERROR(%s): unexpected end of file at line %d", fn, line);
-		SVRLOG("ASCII85 length = " << (int)(f - b));
-		String bz = ASCII85Decode((const byte *)b, f - b);
-		SVRLOG("BZ compressed length = " << bz.GetLength());
-		String content = BZ2Decompress(bz);
-		SVRLOG("Content length = " << content.GetLength());
-		if(content.GetLength() != l)
-			return NFormat("ERROR(%s): file size (%d) doesn't match decompressed size %d", fn, l, content.GetLength());
-		RealizePath(fn);
-		if(!SaveFile(fn, content) || !FileSetTime(fn, time))
-			return NFormat("ERROR(%s): cannot write file", fn);
-		SVRLOG(NFormat("FileSetTime(%s, %`) -> %`", fn, time, FileGetTime(fn)));
-		while(*f && *f++ != '\n')
-			;
-	}
-	SVRLOG("// CommandServer::UploadFiles");
-	return "OK";
-}
-
-String CommandServer::DownloadFiles(const char *f)
-{
-	int line = 0;
-	String output;
-	while(*f)
-	{
-		line++;
-		const char *b = f;
-		while(*f && *f != '\n')
-			f++;
-		String fn(b, f);
-		FindFile ff;
-		output << fn;
-		String nfn = NativePath(fn);
-		if(ff.Search(nfn))
-		{
-			String data = LoadFile(nfn);
-			output << '\t' << data.GetLength() << '\t' << ASCII85Encode(BZ2Compress(data));
-		}
-		output << "\n";
-		while(*f && *f++ != '\n')
-			;
-	}
-	return output;
-}
-
-String CommandServer::CreateDir(const char *f)
-{
-	RealizeDirectory(f);
-	return "OK";
-}
-
-/*
-void CommandServer::RunCommand(const String& _command, Socket& socket)
-{
-	String command = _command;
-#ifdef PLATFORM_WIN32
-	if(*command == '/')
-		command = "x:" + command;
-#endif
-	LOG("CommandServer::RunCommand(" << command << ")");
-	One<SlaveProcess> process = StartProcess(command);
-	LOG("CommandServer::RunCommand -> OK");
-	socket.Send("+\0", 2);
-	bool work = false, running;
-	do
-	{
-		if(socket.Peek())
-		{
-			SVRLOG("-> socket peek");
-			String inp = socket.Recv(0 | Socket::MULTIPART);
-			SVRLOG("-> input data: <" << inp << ">");
-			if(!inp.IsEmpty())
-			{
-				work = true;
-				process -> Write(inp);
-			}
-		}
-		String out = Null;
-		running = process -> Read(out);
-//		SVRLOG("-> output data: <" << out << ">");
-		if(!out.IsEmpty())
-		{
-			work = true;
-			socket.Send(out);
-		}
-		else
-			MtSleep(200);
-//		SVRLOG("work = " << work << ", running = " << running);
-//		if(!work && running)
-	}
-	while(running);
-	socket.Send("\0", 1);
-	LOG("Process terminated, exit code = " << process -> GetExitCode());
-	String ec = IntStr(process -> GetExitCode());
-	socket.Send(ec, ec.GetLength() + 1);
-}
-*/
-
-void CommandServer::Execute(Socket& socket)
-{
-	String cmd = socket.ReadUntil('\0', Null, 10000000);
-	if(logging)
-		puts(cmd);
-	SVRLOG(cmd);
-	String out;
-	const char *data = cmd;
-	switch(*data++)
-	{
-	case '?':
-		out = "+" TSERV_VERSION "\x1A";
-		break;
-
-	case '.':
-		Quit();
-		out = ".QUITTING\x1A";
-		break;
-
-	case ':':
-	case '=':
-		connections.Add(new CommandConnection(socket, cmd));
-		return;
-
-	case '-':
-		out = FileRemove(data);
-		break;
-
-	case '~':
-		out = DeleteFolderDeep(data);
-		break;
-
-	case '<':
-		out = CheckFiles(data);
-		break;
-
-	case '>':
-		out = UploadFiles(data);
-		break;
-
-	case '^':
-		out = DownloadFiles(data);
-		break;
-
-	case '*':
-		out = CreateDir(data);
-		break;
-
-	case '@':
-		out = GetFileInfo(data);
-		break;
-
-	default:
-		throw Exc(NFormat("Invalid command: '%s'", cmd));
-	}
-	socket.Write(out);
-	socket.Write("\0", 1);
-	socket.Close();
-}
-
-void CommandServer::ExecTimer()
-{
-}
-
-bool CommandServer::StartServer(int port, const String& cmdline)
-{
-#ifdef PLATFORM_WIN32
-	STARTUPINFO sinfo;
-	GetStartupInfo(&sinfo);
-	PROCESS_INFORMATION pinfo;
-	Buffer<char> cmd(cmdline.GetLength() + 1);
-	memcpy(cmd, cmdline, cmdline.GetLength() + 1);
-	if(!CreateProcess(NULL, cmd, NULL, NULL, false,
-		CREATE_NO_WINDOW, NULL, NULL, &sinfo, &pinfo))
-		throw Exc(NFormat("Cannot create process '%s':\n%s", cmdline, GetErrorMessage(GetLastError())));
-	// detach from process
-	CloseHandle(pinfo.hThread);
-	CloseHandle(pinfo.hProcess);
-#else
-	pid_t pid = fork();
-	if(pid == -1)
-		throw Exc(NFormat("Error executing fork(), error code: %d", errno));
-//	printf("fork -> %d\n", pid);
-	if(!pid)
-	{ // new process, return true to fall through to server loop
-		Logging(false);
-		Timing(false);
-		return true;
-	}
-#endif
-	Socket::Init();
-	String sockerr;
-	String self = Socket::GetHostName();
-	Socket socket;
-	if(!ClientSocket(socket, self, port))
-		throw Exc(NFormat("Error opening server %s:%d: %s", self, port, Socket::GetErrorText()));
-	socket.Write("?\n");
-	String res = socket.ReadUntil('\x1A');
-	if(*res == '\x08')
-		throw Exc(res.Mid(1));
-	if(res != TSERV_VERSION)
-		throw Exc("Cannot run server process.");
-	return false;
-}
-
-void CommandServer::StopServer(int port)
-{
-	Socket::Init();
-	Socket socket;
-	if(!ClientSocket(socket, Socket::GetHostName(), port))
-		throw Exc(NFormat("Error opening server at port %d", port));
-	socket.Write(".\n");
-	socket.ReadUntil('\x1A');
-}
-
-void CommandServer::RunServer(int port)
-{
-//	thread_count = 0;
-
-	puts(NFormat("Running server at port %d", port));
-	if(logging)
-		puts(NFormat("Creating server socket at port %d ...", port));
-
-	String error;
-	Socket server;
-	if(!ServerSocket(server, port, true, 100)) {
-		puts(NFormat("Error creating server socket at port %d: %s", port, Socket::GetErrorText()));
-		return;
-	}
-	server.NoLinger();
-
-	if(logging) {
-		if(ip_filter.IsEmpty())
-			puts("IP Filtering: off (accepting requests from all IP addresses)");
-		else
-		{
-			fputs("IP filter:", stdout);
-			for(int i = 0; i < ip_filter.GetCount(); i++)
-				fputs(' ' + FormatIP(ip_filter[i]), stdout);
-			putc('\n', stdout);
-		}
-		puts("Running accept loop ...");
-	}
-
-	dword ipaddr;
-	dword ticks = GetTickCount() + 1000;
-	for(quit_flag = false; !quit_flag && !quit_signal;)
-	{
-		bool work = false;
-		Socket connection;
-		if(server.Accept(connection, &ipaddr, true, timer_chunk))
-		{
-			work = true;
-			if(logging)
-			{
-				fputc('\r', stderr);
-				fputs(Format(GetSysTime()), stderr);
-				fflush(stderr);
-			}
-			ExecTimer();
-			if(!connection.IsOpen())
-				continue;
-
-			try
-			{
-				if(!ip_filter.IsEmpty() && ip_filter.Find(ipaddr) < 0)
-					throw Exc(NFormat("Invalid request source IP address: %s", FormatIP(ipaddr)));
-				Execute(connection);
-			}
-			catch(Exc e)
-			{
-				if(connection.IsOpen())
-					connection.Write('-' + e + '\0');
-				if(logging)
-					puts(NFormat("ERROR: %s", e));
-			}
-		}
-		if(!connections.IsEmpty())
-		{
-			for(int i = connections.GetCount(); --i >= 0;)
-			{
-				Connection& conn = connections[i];
-				bool err = false;
-				try
-				{
-					if(conn.Run())
-						work = true;
-				}
-				catch(Exc e)
-				{
-					puts(NFormat("%s: %s", conn.GetName(), e));
-					err = true;
-				}
-				if(err || conn.IsEof())
-				{
-					connections.Remove(i);
-					continue;
-				}
-			}
-		}
-		if(!work)
-			Sleep(timer_chunk);
-		dword new_ticks = GetTickCount();
-		if(new_ticks >= ticks)
-		{
-			ticks = new_ticks + 1000;
-			fputs(String().Cat() << "\r" << Format(GetSysTime()), stderr);
-			fflush(stderr);
-		}
-	}
-	if(logging)
-		fputs("\nServer is shutting down ...                \n", stderr);
-}
-
-/*
-static void PutConsole(const char *p)
-{
-	enum { ROW_BATCH = 20 };
-	int rows = ROW_BATCH;
-	int col = 0;
-	const char *b = p;
-
-	while(*p)
-	{
-		char c = *p;
-		putchar(c);
-		if(*p++ == '\n' || ++col >= 70)
-		{
-			col = 0;
-			if(*p && --rows <= 0)
-			{
-				rows = ROW_BATCH;
-				fputs("\n==== Pokracovat pomoci Enter ====\n", stdout);
-				fflush(stdout);
-				bool quit = false;
-				for(int c; (c = getchar()) >= 0 && c != '\n'; quit |= (c == 'Q' || c == 'q'))
-					;
-				if(quit)
-					break;
-			}
-		}
-	}
-	if(p > b && p[-1] != '\n')
-		putchar('\n');
-}
-*/
-
-String CommandServer::GetConInput(const char *prompt)
-{
-	fputc('\n', stdout);
-	fputs(prompt, stdout);
-	int i = getchar();
-	if(i == EOF)
-		return String::GetVoid();
-	String s;
-	while(i != '\n')
-	{
-		s.Cat(i);
-		if((i = getchar()) == EOF)
-			break;
-	}
-	return s;
-}
-
-void CommandServer::RunClient()
-{
-	Socket::Init();
-	quit_flag = false;
-	for(String in; !quit_flag && !(in = GetConInput("run> ")).IsVoid();)
-	{
-		if(!CompareNoCase(in, "."))
-			break;
-
-		try
-		{
-			One<SlaveProcess> sp = StartProcess(in);
-			for(String s; sp -> Read(s); fputs(s, stdout))
-			{
-//				puts("Flushing application...");
-				Sleep(500);
-			}
-			printf("\nTerminated, exit code = %d\n", sp -> GetExitCode());
-		}
-		catch(Exc e)
-		{
-			puts("Error: " + e);
-		}
-	}
-}
-
-void TryMain()
-{
-	bool start = false;
-	bool stop = false;
-	int port = -1;
-
-	CommandServer server;
-	Vector<String> cmdline;
-	cmdline <<= CommandLine();
-
-	for(int c = 0; c < cmdline.GetCount(); c++)
-	{
-		const char *arg = cmdline[c];
-		if(*arg == '-')
-			switch(arg++, *arg++)
-			{
-			case 'r': start = true; break;
-			case 's': stop = true; break;
-			default:  throw Exc(NFormat("invalid option: '%s'", cmdline[c]));
-			}
-		else if(IsDigit(*arg))
-		{ // port number
-			port = atoi(arg);
-		}
-	}
-
-	bool noport = (port < 0);
-	if(noport)
-		port = DEFAULT_PORT;
-
-	if(stop)
-	{
-		server.StopServer(port);
-		return;
-	}
-
-	if(noport)
-	{ // run client against host
-		server.RunClient();
-		return;
-	}
-
-	if(start)
-	{
-		String cmd_line;
-		cmd_line << port;
-		if(!server.StartServer(port, cmd_line))
-			return;
-	}
-
-	server.RunServer(port);
-}
-
-CONSOLE_APP_MAIN
-{
-#ifdef PLATFORM_POSIX
-	signal(SIGPIPE, SIG_IGN);
-	signal(SIGINT, &QuitSignal);
-	signal(SIGTERM, &QuitSignal);
-#endif//PLATFORM_POSIX
-	puts(String().Cat() << "TSERV " TSERV_VERSION ", release date: " << TSERV_DATE << "\n"
-	TSERV_COPYRIGHT);
-
-/*
-	Vector<String> test;
-	for(int i = 0; i < 1000; i++)
-		test.Add(GetRandomIdent(10000));
-	test.Clear();
-
-	puts("Done !");
-	SetExitCode(111);
-	return;
-*/
-	int retcode = 1;
-	try
-	{
-//		SetLanguage(LNG_ENGLISH);
-		TryMain();
-	}
-	catch(Exc e)
-	{
-		puts("Error: " + e);
-		SetExitCode(1);
-	}
-}
+#include <Web/Web.h>
+#include "version.h"
+#include <plugin/bz2/bz2.h>
+#ifdef PLATFORM_POSIX
+#include <signal.h>
+#endif//PLATFORM_POSIX
+
+using namespace Upp;
+
+enum { DEFAULT_PORT = 2346 };
+
+#ifdef _DEBUG
+#define DO_SVRLOG 1
+#else
+#define DO_SVRLOG 0
+#endif
+
+#if DO_SVRLOG
+#define SVRLOG(x) { StringStream ss; ss << x << '\n'; RLOG(ss.GetResult()); fputs(ss.GetResult(), stderr); fflush(stderr); }
+#else
+#define SVRLOG(x)
+#endif
+
+/*
+void DeleteFolderDeep(const char *dir)
+{
+	FindFile ff(String(dir) + "/*.*");
+	while(ff) {
+		String name = ff.GetName();
+		String p = AppendFileName(dir, name);
+		if(ff.IsFile())
+			DeleteFile(p);
+		else
+		if(ff.IsFolder())
+			DeleteFolderDeep(p);
+		ff.Next();
+	}
+	DirectoryDelete(dir);
+}
+*/
+
+static bool quit_signal = false;
+
+static void QuitSignal(int)
+{
+	puts("Termination signal received, quitting...");
+	quit_signal = true;
+}
+
+class CommandServer
+{
+public:
+	typedef CommandServer CLASSNAME;
+	CommandServer();
+	virtual ~CommandServer();
+
+	CommandServer&  Logging(bool l)                { logging = l; return *this; }
+	CommandServer&  Timing(bool t)                 { timing = t; return *this; }
+	CommandServer&  Filter(const char *ip);
+
+	void            Execute(Socket& socket);
+	bool            StartServer(int port, const String& cmdline);
+	void            StopServer(int port);
+	void            RunServer(int port);
+	void            RunClient();
+	void            Quit()                         { quit_flag = true; }
+
+protected:
+	String          GetConInput(const char *prompt);
+	virtual void    ExecTimer();
+//	void            RunCommand(String cmd, Socket& socket);
+	String          CheckFiles(const char *f);
+	String          FileRemove(const char *f);
+	String          DeleteFolderDeep(const char *f);
+	String          UploadFiles(const char *f);
+	String          DownloadFiles(const char *f);
+	String          CreateDir(const char *f);
+	String          GetFileInfo(const char *f);
+
+protected:
+	class Connection
+	{
+	public:
+		Connection(Socket socket) : socket(socket), eof(false) {}
+		virtual ~Connection();
+
+		bool              IsEof() const   { return eof; }
+		String            GetName() const { return name; }
+		virtual bool      Run() = 0;
+
+	protected:
+		String            name;
+		Socket            socket;
+		bool              eof;
+	};
+
+	class CommandConnection : public Connection
+	{
+	public:
+		CommandConnection(Socket& socket, const char *command);
+
+		virtual bool      Run();
+
+	private:
+		One<SlaveProcess> slave;
+	};
+
+	Array<Connection> connections;
+	int               timer_chunk;
+	bool              logging;
+	bool              timing;
+	bool              quit_flag;
+	Index<dword>      ip_filter;
+//	int             thread_count;
+};
+
+//////////////////////////////////////////////////////////////////////
+// CommandServer::Connection::
+
+CommandServer::Connection::~Connection()
+{
+	if(socket.IsOpen())
+		socket.StopWrite();
+}
+
+//////////////////////////////////////////////////////////////////////
+// CommandServer::CommandConnection::
+
+CommandServer::CommandConnection::CommandConnection(Socket& _socket, const char *_command)
+: Connection(_socket)
+{
+	_socket.Clear();
+	
+	try {
+		String environment;
+		String pathlist;
+		if(*_command == ':') {
+			const char *b = ++_command;
+			while(*_command && *_command++ != '\n')
+				;
+			environment = ASCII85Decode(String(b, _command));
+			for(b = environment; *b; b += strlen(b) + 1)
+				if(!MemICmp(b, "PATH=", 5)) {
+					pathlist = b + 5;
+					break;
+				}
+		}
+		if(*_command == '=')
+			_command++;
+		String command = _command;
+		if(!IsNull(pathlist)) {
+			String exec;
+			if(*_command == '\"') {
+				while(*++_command && (*_command != '\"' || *++_command == '\"'))
+					exec.Cat(*_command);
+			}
+			else
+				while(*_command && (byte)*_command > ' ')
+					exec.Cat(*_command++);
+			command = GetFileOnPath(exec, pathlist, true);
+	#ifdef PLATFORM_WIN32
+			if(IsNull(command))
+				command = GetFileOnPath(exec + ".exe", pathlist, true);
+	#endif
+			if(IsNull(command))
+				command = exec;
+			if(command.Find(' ') >= 0)
+				command = '\"' + command + '\"';
+			command << ' ' << _command;
+		}
+		LOG("CommandServer::CommandConnection(" << command << ")");
+		slave = StartProcess(command, environment);
+		LOG("CommandServer::CommandConnection -> OK");
+		socket.Write("+\0", 2);
+		name << "[command]" << command;
+	}
+	catch(Exc e) {
+		if(socket.IsOpen())
+			socket.Write('-' + e + '\0');
+		throw;
+	}
+}
+
+bool CommandServer::CommandConnection::Run()
+{
+//	SVRLOG("CommandConnection::Run");
+	if(eof)
+		return true;
+	ASSERT(socket.IsOpen());
+	bool work = false;
+	String inp = socket.ReadUntil('\0', 0, 10000000);
+	if(inp.IsVoid())
+	{ // broken pipe
+		slave -> Kill();
+		eof = true;
+		return true;
+	}
+	if(!inp.IsEmpty())
+	{
+		SVRLOG("-> input data: <" << inp << ">");
+		work = true;
+		slave -> Write(inp);
+	}
+	String out = Null;
+	eof = !slave -> Read(out);
+	if(!out.IsEmpty())
+	{
+		work = true;
+		SVRLOG("-> output data: <" << out << ">");
+		socket.Write(out);
+	}
+	if(eof)
+	{
+		work = true;
+		socket.Write("\0", 1);
+		SVRLOG("Process terminated, exit code = " << slave -> GetExitCode());
+		String ec = IntStr(slave -> GetExitCode());
+		socket.Write(ec, ec.GetLength() + 1);
+		socket.StopWrite();
+	}
+//	SVRLOG("/ CommandConnection::Run -> " << (work ? "working" : "idle"));
+	return work;
+}
+
+//////////////////////////////////////////////////////////////////////
+// CommandServer::
+
+CommandServer::CommandServer()
+{
+	timer_chunk = 100;
+	quit_flag = true;
+	Logging(false);
+	Timing(false);
+}
+
+CommandServer::~CommandServer()
+{
+}
+
+CommandServer& CommandServer::Filter(const char *ip)
+{
+	Socket::Init();
+	hostent *he = gethostbyname(ip);
+	if(he)
+		ip_filter.FindAdd(Peek32be((in_addr *)(he -> h_addr_list[0])));
+	else
+		fputs(NFormat("gethostbyname: adresa '%s' nebyla nalezena ...\n", ip), stderr);
+	return *this;
+}
+
+String CommandServer::CheckFiles(const char *f)
+{
+	int line = 0;
+	String out = "OK\n";
+	while(*f)
+	{
+		line++;
+		const char *b = f;
+		while(*f && *f != '\n' && *f != '\t')
+			f++;
+		String fn = NativePath(String(b, f));
+		int t;
+		if(*f != '\t' || IsNull(t = ScanInt(f + 1, &f)))
+			return NFormat("ERROR(%s): file time expected at line %d", fn, line);
+
+		Time time = Time(2000, 1, 1) + t;
+		int l;
+		if(*f != '\t' || IsNull(l = ScanInt(f + 1, &f)))
+			return NFormat("ERROR(%s): file size expected at line %d", fn, line);
+
+			FindFile ff(fn);
+			if(ff && tabs(Time(ff.GetLastWriteTime()) - time) <= 2 && ff.GetLength() == l)
+				out << fn << '\n';
+
+		while(*f && *f++ != '\n')
+			;
+	}
+	return out;
+}
+
+String CommandServer::FileRemove(const char *f)
+{
+	String out;
+	while(*f)
+	{
+		const char *b = f;
+		while(*f && *f != '\n')
+			f++;
+		String fn(b, f);
+		if(!IsNull(fn) && !FileDelete(NativePath(fn)))
+			out << NFormat("%s: error deleting file\n", fn);
+		while(*f && *f++ != '\n')
+			;
+	}
+	if(IsNull(out))
+		out = "OK";
+	return out;
+}
+
+String CommandServer::DeleteFolderDeep(const char *f)
+{
+	while(*f)
+	{
+		const char *b = f;
+		while(*f && *f != '\n')
+			f++;
+		String fn(b, f);
+		if(!IsNull(fn))
+			Upp::DeleteFolderDeep(NativePath(fn));
+		while(*f && *f++ != '\n')
+			;
+	}
+	return "OK";
+}
+
+String CommandServer::GetFileInfo(const char *f)
+{
+	int td = ScanInt(f, &f) - (int)(GetSysTime() - Time(2000, 1, 1));
+	if(*f++ != ':')
+		return "ERROR(@): ':' expected after time delta";
+	int line = 0;
+	String output;
+	while(*f)
+	{
+		line++;
+		const char *b = f;
+		while(*f && *f != '\n')
+			f++;
+		String fn(b, f);
+		FindFile ff;
+		output << fn;
+		if(ff.Search(NativePath(fn)))
+			output << '\t' << ((int)(Time(ff.GetLastWriteTime()) - Time(2000, 1, 1)) + td)
+				<< '\t' << (ff.IsFile() ? (int)ff.GetLength() : -1);
+		output << "\n";
+		while(*f && *f++ != '\n')
+			;
+	}
+	return output;
+}
+
+String CommandServer::UploadFiles(const char *f)
+{
+	SVRLOG("CommandServer::UploadFiles");
+	int line = 0;
+	while(*f)
+	{
+		++line;
+		const char *b = f;
+		while(*f && *f != '\t' && *f != '\n')
+			f++;
+		String fn = NativePath(String(b, f));
+		if(IsNull(fn))
+			return NFormat("ERROR: file name expected at line %d", line);
+		SVRLOG("Updating file '" << fn << "'...");
+		int t;
+		if(*f != '\t' || IsNull(t = ScanInt(f + 1, &f)))
+			return NFormat("ERROR(%s): file time expected at line %d", fn, line);
+
+		Time time = Time(2000, 1, 1) + t;
+		int l;
+		if(*f != '\t' || IsNull(l = ScanInt(f + 1, &f)))
+			return NFormat("ERROR(%s): file size expected at line %d", fn, line);
+
+		if(*f != '\t')
+			return NFormat("ERROR(%s): file content expected at line %d", fn, line);
+		b = ++f;
+		while(*f && *f != '\n')
+			f++;
+		if(*f != '\n')
+			return NFormat("ERROR(%s): unexpected end of file at line %d", fn, line);
+		SVRLOG("ASCII85 length = " << (int)(f - b));
+		String bz = ASCII85Decode((const byte *)b, f - b);
+		SVRLOG("BZ compressed length = " << bz.GetLength());
+		String content = BZ2Decompress(bz);
+		SVRLOG("Content length = " << content.GetLength());
+		if(content.GetLength() != l)
+			return NFormat("ERROR(%s): file size (%d) doesn't match decompressed size %d", fn, l, content.GetLength());
+		RealizePath(fn);
+		if(!SaveFile(fn, content) || !FileSetTime(fn, time))
+			return NFormat("ERROR(%s): cannot write file", fn);
+		SVRLOG(NFormat("FileSetTime(%s, %`) -> %`", fn, time, FileGetTime(fn)));
+		while(*f && *f++ != '\n')
+			;
+	}
+	SVRLOG("// CommandServer::UploadFiles");
+	return "OK";
+}
+
+String CommandServer::DownloadFiles(const char *f)
+{
+	int line = 0;
+	String output;
+	while(*f)
+	{
+		line++;
+		const char *b = f;
+		while(*f && *f != '\n')
+			f++;
+		String fn(b, f);
+		FindFile ff;
+		output << fn;
+		String nfn = NativePath(fn);
+		if(ff.Search(nfn))
+		{
+			String data = LoadFile(nfn);
+			output << '\t' << data.GetLength() << '\t' << ASCII85Encode(BZ2Compress(data));
+		}
+		output << "\n";
+		while(*f && *f++ != '\n')
+			;
+	}
+	return output;
+}
+
+String CommandServer::CreateDir(const char *f)
+{
+	RealizeDirectory(f);
+	return "OK";
+}
+
+/*
+void CommandServer::RunCommand(const String& _command, Socket& socket)
+{
+	String command = _command;
+#ifdef PLATFORM_WIN32
+	if(*command == '/')
+		command = "x:" + command;
+#endif
+	LOG("CommandServer::RunCommand(" << command << ")");
+	One<SlaveProcess> process = StartProcess(command);
+	LOG("CommandServer::RunCommand -> OK");
+	socket.Send("+\0", 2);
+	bool work = false, running;
+	do
+	{
+		if(socket.Peek())
+		{
+			SVRLOG("-> socket peek");
+			String inp = socket.Recv(0 | Socket::MULTIPART);
+			SVRLOG("-> input data: <" << inp << ">");
+			if(!inp.IsEmpty())
+			{
+				work = true;
+				process -> Write(inp);
+			}
+		}
+		String out = Null;
+		running = process -> Read(out);
+//		SVRLOG("-> output data: <" << out << ">");
+		if(!out.IsEmpty())
+		{
+			work = true;
+			socket.Send(out);
+		}
+		else
+			MtSleep(200);
+//		SVRLOG("work = " << work << ", running = " << running);
+//		if(!work && running)
+	}
+	while(running);
+	socket.Send("\0", 1);
+	LOG("Process terminated, exit code = " << process -> GetExitCode());
+	String ec = IntStr(process -> GetExitCode());
+	socket.Send(ec, ec.GetLength() + 1);
+}
+*/
+
+void CommandServer::Execute(Socket& socket)
+{
+	String cmd = socket.ReadUntil('\0', Null, 10000000);
+	if(logging)
+		puts(cmd);
+	SVRLOG(cmd);
+	String out;
+	const char *data = cmd;
+	switch(*data++)
+	{
+	case '?':
+		out = "+" TSERV_VERSION "\x1A";
+		break;
+
+	case '.':
+		Quit();
+		out = ".QUITTING\x1A";
+		break;
+
+	case ':':
+	case '=':
+		connections.Add(new CommandConnection(socket, cmd));
+		return;
+
+	case '-':
+		out = FileRemove(data);
+		break;
+
+	case '~':
+		out = DeleteFolderDeep(data);
+		break;
+
+	case '<':
+		out = CheckFiles(data);
+		break;
+
+	case '>':
+		out = UploadFiles(data);
+		break;
+
+	case '^':
+		out = DownloadFiles(data);
+		break;
+
+	case '*':
+		out = CreateDir(data);
+		break;
+
+	case '@':
+		out = GetFileInfo(data);
+		break;
+
+	default:
+		throw Exc(NFormat("Invalid command: '%s'", cmd));
+	}
+	socket.Write(out);
+	socket.Write("\0", 1);
+	socket.Close();
+}
+
+void CommandServer::ExecTimer()
+{
+}
+
+bool CommandServer::StartServer(int port, const String& cmdline)
+{
+#ifdef PLATFORM_WIN32
+	STARTUPINFO sinfo;
+	GetStartupInfo(&sinfo);
+	PROCESS_INFORMATION pinfo;
+	Buffer<char> cmd(cmdline.GetLength() + 1);
+	memcpy(cmd, cmdline, cmdline.GetLength() + 1);
+	if(!CreateProcess(NULL, cmd, NULL, NULL, false,
+		CREATE_NO_WINDOW, NULL, NULL, &sinfo, &pinfo))
+		throw Exc(NFormat("Cannot create process '%s':\n%s", cmdline, GetErrorMessage(GetLastError())));
+	// detach from process
+	CloseHandle(pinfo.hThread);
+	CloseHandle(pinfo.hProcess);
+#else
+	pid_t pid = fork();
+	if(pid == -1)
+		throw Exc(NFormat("Error executing fork(), error code: %d", errno));
+//	printf("fork -> %d\n", pid);
+	if(!pid)
+	{ // new process, return true to fall through to server loop
+		Logging(false);
+		Timing(false);
+		return true;
+	}
+#endif
+	Socket::Init();
+	String sockerr;
+	String self = Socket::GetHostName();
+	Socket socket;
+	if(!ClientSocket(socket, self, port))
+		throw Exc(NFormat("Error opening server %s:%d: %s", self, port, Socket::GetErrorText()));
+	socket.Write("?\n");
+	String res = socket.ReadUntil('\x1A');
+	if(*res == '\x08')
+		throw Exc(res.Mid(1));
+	if(res != TSERV_VERSION)
+		throw Exc("Cannot run server process.");
+	return false;
+}
+
+void CommandServer::StopServer(int port)
+{
+	Socket::Init();
+	Socket socket;
+	if(!ClientSocket(socket, Socket::GetHostName(), port))
+		throw Exc(NFormat("Error opening server at port %d", port));
+	socket.Write(".\n");
+	socket.ReadUntil('\x1A');
+}
+
+void CommandServer::RunServer(int port)
+{
+//	thread_count = 0;
+
+	puts(NFormat("Running server at port %d", port));
+	if(logging)
+		puts(NFormat("Creating server socket at port %d ...", port));
+
+	String error;
+	Socket server;
+	if(!ServerSocket(server, port, true, 100)) {
+		puts(NFormat("Error creating server socket at port %d: %s", port, Socket::GetErrorText()));
+		return;
+	}
+	server.NoLinger();
+
+	if(logging) {
+		if(ip_filter.IsEmpty())
+			puts("IP Filtering: off (accepting requests from all IP addresses)");
+		else
+		{
+			fputs("IP filter:", stdout);
+			for(int i = 0; i < ip_filter.GetCount(); i++)
+				fputs(' ' + FormatIP(ip_filter[i]), stdout);
+			putc('\n', stdout);
+		}
+		puts("Running accept loop ...");
+	}
+
+	dword ipaddr;
+	dword ticks = GetTickCount() + 1000;
+	for(quit_flag = false; !quit_flag && !quit_signal;)
+	{
+		bool work = false;
+		Socket connection;
+		if(server.Accept(connection, &ipaddr, true, timer_chunk))
+		{
+			work = true;
+			if(logging)
+			{
+				fputc('\r', stderr);
+				fputs(Format(GetSysTime()), stderr);
+				fflush(stderr);
+			}
+			ExecTimer();
+			if(!connection.IsOpen())
+				continue;
+
+			try
+			{
+				if(!ip_filter.IsEmpty() && ip_filter.Find(ipaddr) < 0)
+					throw Exc(NFormat("Invalid request source IP address: %s", FormatIP(ipaddr)));
+				Execute(connection);
+			}
+			catch(Exc e)
+			{
+				if(connection.IsOpen())
+					connection.Write('-' + e + '\0');
+				if(logging)
+					puts(NFormat("ERROR: %s", e));
+			}
+		}
+		if(!connections.IsEmpty())
+		{
+			for(int i = connections.GetCount(); --i >= 0;)
+			{
+				Connection& conn = connections[i];
+				bool err = false;
+				try
+				{
+					if(conn.Run())
+						work = true;
+				}
+				catch(Exc e)
+				{
+					puts(NFormat("%s: %s", conn.GetName(), e));
+					err = true;
+				}
+				if(err || conn.IsEof())
+				{
+					connections.Remove(i);
+					continue;
+				}
+			}
+		}
+		if(!work)
+			Sleep(timer_chunk);
+		dword new_ticks = GetTickCount();
+		if(new_ticks >= ticks)
+		{
+			ticks = new_ticks + 1000;
+			fputs(String().Cat() << "\r" << Format(GetSysTime()), stderr);
+			fflush(stderr);
+		}
+	}
+	if(logging)
+		fputs("\nServer is shutting down ...                \n", stderr);
+}
+
+/*
+static void PutConsole(const char *p)
+{
+	enum { ROW_BATCH = 20 };
+	int rows = ROW_BATCH;
+	int col = 0;
+	const char *b = p;
+
+	while(*p)
+	{
+		char c = *p;
+		putchar(c);
+		if(*p++ == '\n' || ++col >= 70)
+		{
+			col = 0;
+			if(*p && --rows <= 0)
+			{
+				rows = ROW_BATCH;
+				fputs("\n==== Pokracovat pomoci Enter ====\n", stdout);
+				fflush(stdout);
+				bool quit = false;
+				for(int c; (c = getchar()) >= 0 && c != '\n'; quit |= (c == 'Q' || c == 'q'))
+					;
+				if(quit)
+					break;
+			}
+		}
+	}
+	if(p > b && p[-1] != '\n')
+		putchar('\n');
+}
+*/
+
+String CommandServer::GetConInput(const char *prompt)
+{
+	fputc('\n', stdout);
+	fputs(prompt, stdout);
+	int i = getchar();
+	if(i == EOF)
+		return String::GetVoid();
+	String s;
+	while(i != '\n')
+	{
+		s.Cat(i);
+		if((i = getchar()) == EOF)
+			break;
+	}
+	return s;
+}
+
+void CommandServer::RunClient()
+{
+	Socket::Init();
+	quit_flag = false;
+	for(String in; !quit_flag && !(in = GetConInput("run> ")).IsVoid();)
+	{
+		if(!CompareNoCase(in, "."))
+			break;
+
+		try
+		{
+			One<SlaveProcess> sp = StartProcess(in);
+			for(String s; sp -> Read(s); fputs(s, stdout))
+			{
+//				puts("Flushing application...");
+				Sleep(500);
+			}
+			printf("\nTerminated, exit code = %d\n", sp -> GetExitCode());
+		}
+		catch(Exc e)
+		{
+			puts("Error: " + e);
+		}
+	}
+}
+
+void TryMain()
+{
+	bool start = false;
+	bool stop = false;
+	int port = -1;
+
+	CommandServer server;
+	Vector<String> cmdline;
+	cmdline <<= CommandLine();
+
+	for(int c = 0; c < cmdline.GetCount(); c++)
+	{
+		const char *arg = cmdline[c];
+		if(*arg == '-')
+			switch(arg++, *arg++)
+			{
+			case 'r': start = true; break;
+			case 's': stop = true; break;
+			default:  throw Exc(NFormat("invalid option: '%s'", cmdline[c]));
+			}
+		else if(IsDigit(*arg))
+		{ // port number
+			port = atoi(arg);
+		}
+	}
+
+	bool noport = (port < 0);
+	if(noport)
+		port = DEFAULT_PORT;
+
+	if(stop)
+	{
+		server.StopServer(port);
+		return;
+	}
+
+	if(noport)
+	{ // run client against host
+		server.RunClient();
+		return;
+	}
+
+	if(start)
+	{
+		String cmd_line;
+		cmd_line << port;
+		if(!server.StartServer(port, cmd_line))
+			return;
+	}
+
+	server.RunServer(port);
+}
+
+CONSOLE_APP_MAIN
+{
+#ifdef PLATFORM_POSIX
+	signal(SIGPIPE, SIG_IGN);
+	signal(SIGINT, &QuitSignal);
+	signal(SIGTERM, &QuitSignal);
+#endif//PLATFORM_POSIX
+	puts(String().Cat() << "TSERV " TSERV_VERSION ", release date: " << TSERV_DATE << "\n"
+	TSERV_COPYRIGHT);
+
+/*
+	Vector<String> test;
+	for(int i = 0; i < 1000; i++)
+		test.Add(GetRandomIdent(10000));
+	test.Clear();
+
+	puts("Done !");
+	SetExitCode(111);
+	return;
+*/
+	int retcode = 1;
+	try
+	{
+//		SetLanguage(LNG_ENGLISH);
+		TryMain();
+	}
+	catch(Exc e)
+	{
+		puts("Error: " + e);
+		SetExitCode(1);
+	}
+}
diff --git a/uppsrc2/TServ/version.h b/archive/uppsrc/TServ/version.h
similarity index 97%
rename from uppsrc2/TServ/version.h
rename to archive/uppsrc/TServ/version.h
index 908df0167..af02a24ad 100644
--- a/uppsrc2/TServ/version.h
+++ b/archive/uppsrc/TServ/version.h
@@ -1,3 +1,3 @@
-#define TSERV_VERSION   "2.17c"
-#define TSERV_DATE      Date(2007, 6, 5)
-#define TSERV_COPYRIGHT "Copyright (c) 2001-2007 Tomas Rylek"
+#define TSERV_VERSION   "2.17c"
+#define TSERV_DATE      Date(2007, 6, 5)
+#define TSERV_COPYRIGHT "Copyright (c) 2001-2007 Tomas Rylek"
diff --git a/uppsrc2/coff/Copying b/archive/uppsrc/coff/Copying
similarity index 100%
rename from uppsrc2/coff/Copying
rename to archive/uppsrc/coff/Copying
diff --git a/uppsrc2/coff/binobj/Copying b/archive/uppsrc/coff/binobj/Copying
similarity index 100%
rename from uppsrc2/coff/binobj/Copying
rename to archive/uppsrc/coff/binobj/Copying
diff --git a/uppsrc2/coff/binobj/binobj.cpp b/archive/uppsrc/coff/binobj/binobj.cpp
similarity index 100%
rename from uppsrc2/coff/binobj/binobj.cpp
rename to archive/uppsrc/coff/binobj/binobj.cpp
diff --git a/uppsrc2/coff/binobj/binobj.h b/archive/uppsrc/coff/binobj/binobj.h
similarity index 100%
rename from uppsrc2/coff/binobj/binobj.h
rename to archive/uppsrc/coff/binobj/binobj.h
diff --git a/uppsrc2/coff/binobj/binobj.upp b/archive/uppsrc/coff/binobj/binobj.upp
similarity index 100%
rename from uppsrc2/coff/binobj/binobj.upp
rename to archive/uppsrc/coff/binobj/binobj.upp
diff --git a/uppsrc2/coff/coff.cpp b/archive/uppsrc/coff/coff.cpp
similarity index 100%
rename from uppsrc2/coff/coff.cpp
rename to archive/uppsrc/coff/coff.cpp
diff --git a/uppsrc2/coff/coff.h b/archive/uppsrc/coff/coff.h
similarity index 100%
rename from uppsrc2/coff/coff.h
rename to archive/uppsrc/coff/coff.h
diff --git a/uppsrc2/coff/coff.upp b/archive/uppsrc/coff/coff.upp
similarity index 100%
rename from uppsrc2/coff/coff.upp
rename to archive/uppsrc/coff/coff.upp
diff --git a/uppsrc2/coff/defs.cpp b/archive/uppsrc/coff/defs.cpp
similarity index 100%
rename from uppsrc2/coff/defs.cpp
rename to archive/uppsrc/coff/defs.cpp
diff --git a/uppsrc2/coff/defs.h b/archive/uppsrc/coff/defs.h
similarity index 100%
rename from uppsrc2/coff/defs.h
rename to archive/uppsrc/coff/defs.h
diff --git a/uppsrc2/coff/imagehlp.dli b/archive/uppsrc/coff/imagehlp.dli
similarity index 100%
rename from uppsrc2/coff/imagehlp.dli
rename to archive/uppsrc/coff/imagehlp.dli
diff --git a/uppsrc2/coff/lib.cpp b/archive/uppsrc/coff/lib.cpp
similarity index 100%
rename from uppsrc2/coff/lib.cpp
rename to archive/uppsrc/coff/lib.cpp
diff --git a/uppsrc2/coff/lib.h b/archive/uppsrc/coff/lib.h
similarity index 100%
rename from uppsrc2/coff/lib.h
rename to archive/uppsrc/coff/lib.h
diff --git a/uppsrc2/coff/stab.def b/archive/uppsrc/coff/stab.def
similarity index 100%
rename from uppsrc2/coff/stab.def
rename to archive/uppsrc/coff/stab.def
diff --git a/uppsrc2/coff/uar/Copying b/archive/uppsrc/coff/uar/Copying
similarity index 100%
rename from uppsrc2/coff/uar/Copying
rename to archive/uppsrc/coff/uar/Copying
diff --git a/uppsrc2/coff/uar/lib.cpp b/archive/uppsrc/coff/uar/lib.cpp
similarity index 100%
rename from uppsrc2/coff/uar/lib.cpp
rename to archive/uppsrc/coff/uar/lib.cpp
diff --git a/uppsrc2/coff/uar/lib.h b/archive/uppsrc/coff/uar/lib.h
similarity index 100%
rename from uppsrc2/coff/uar/lib.h
rename to archive/uppsrc/coff/uar/lib.h
diff --git a/uppsrc2/coff/uar/main.cpp b/archive/uppsrc/coff/uar/main.cpp
similarity index 100%
rename from uppsrc2/coff/uar/main.cpp
rename to archive/uppsrc/coff/uar/main.cpp
diff --git a/uppsrc2/coff/uar/uar.h b/archive/uppsrc/coff/uar/uar.h
similarity index 100%
rename from uppsrc2/coff/uar/uar.h
rename to archive/uppsrc/coff/uar/uar.h
diff --git a/uppsrc2/coff/uar/uar.upp b/archive/uppsrc/coff/uar/uar.upp
similarity index 100%
rename from uppsrc2/coff/uar/uar.upp
rename to archive/uppsrc/coff/uar/uar.upp
diff --git a/uppsrc2/coff/uar/version.h b/archive/uppsrc/coff/uar/version.h
similarity index 100%
rename from uppsrc2/coff/uar/version.h
rename to archive/uppsrc/coff/uar/version.h
diff --git a/uppsrc2/coff/uld/Copying b/archive/uppsrc/coff/uld/Copying
similarity index 100%
rename from uppsrc2/coff/uld/Copying
rename to archive/uppsrc/coff/uld/Copying
diff --git a/uppsrc2/coff/uld/diff b/archive/uppsrc/coff/uld/diff
similarity index 100%
rename from uppsrc2/coff/uld/diff
rename to archive/uppsrc/coff/uld/diff
diff --git a/uppsrc2/coff/uld/dump.cpp b/archive/uppsrc/coff/uld/dump.cpp
similarity index 100%
rename from uppsrc2/coff/uld/dump.cpp
rename to archive/uppsrc/coff/uld/dump.cpp
diff --git a/uppsrc2/coff/uld/linkjob.cpp b/archive/uppsrc/coff/uld/linkjob.cpp
similarity index 100%
rename from uppsrc2/coff/uld/linkjob.cpp
rename to archive/uppsrc/coff/uld/linkjob.cpp
diff --git a/uppsrc2/coff/uld/main.cpp b/archive/uppsrc/coff/uld/main.cpp
similarity index 100%
rename from uppsrc2/coff/uld/main.cpp
rename to archive/uppsrc/coff/uld/main.cpp
diff --git a/uppsrc2/coff/uld/notes.txt b/archive/uppsrc/coff/uld/notes.txt
similarity index 100%
rename from uppsrc2/coff/uld/notes.txt
rename to archive/uppsrc/coff/uld/notes.txt
diff --git a/uppsrc2/coff/uld/obj.h b/archive/uppsrc/coff/uld/obj.h
similarity index 100%
rename from uppsrc2/coff/uld/obj.h
rename to archive/uppsrc/coff/uld/obj.h
diff --git a/uppsrc2/coff/uld/object.cpp b/archive/uppsrc/coff/uld/object.cpp
similarity index 100%
rename from uppsrc2/coff/uld/object.cpp
rename to archive/uppsrc/coff/uld/object.cpp
diff --git a/uppsrc2/coff/uld/uld.h b/archive/uppsrc/coff/uld/uld.h
similarity index 100%
rename from uppsrc2/coff/uld/uld.h
rename to archive/uppsrc/coff/uld/uld.h
diff --git a/uppsrc2/coff/uld/uld.upp b/archive/uppsrc/coff/uld/uld.upp
similarity index 100%
rename from uppsrc2/coff/uld/uld.upp
rename to archive/uppsrc/coff/uld/uld.upp
diff --git a/uppsrc2/coff/uld/version.h b/archive/uppsrc/coff/uld/version.h
similarity index 100%
rename from uppsrc2/coff/uld/version.h
rename to archive/uppsrc/coff/uld/version.h
diff --git a/uppsrc2/coff/util.cpp b/archive/uppsrc/coff/util.cpp
similarity index 100%
rename from uppsrc2/coff/util.cpp
rename to archive/uppsrc/coff/util.cpp
diff --git a/uppsrc2/coff/util.h b/archive/uppsrc/coff/util.h
similarity index 100%
rename from uppsrc2/coff/util.h
rename to archive/uppsrc/coff/util.h
diff --git a/uppsrc2/plugin/wincert/pdf.cpp b/archive/uppsrc/plugin/wincert/pdf.cpp
similarity index 100%
rename from uppsrc2/plugin/wincert/pdf.cpp
rename to archive/uppsrc/plugin/wincert/pdf.cpp
diff --git a/uppsrc2/plugin/wincert/util.cpp b/archive/uppsrc/plugin/wincert/util.cpp
similarity index 100%
rename from uppsrc2/plugin/wincert/util.cpp
rename to archive/uppsrc/plugin/wincert/util.cpp
diff --git a/uppsrc2/plugin/wincert/wincert.h b/archive/uppsrc/plugin/wincert/wincert.h
similarity index 100%
rename from uppsrc2/plugin/wincert/wincert.h
rename to archive/uppsrc/plugin/wincert/wincert.h
diff --git a/uppsrc2/plugin/wincert/wincert.upp b/archive/uppsrc/plugin/wincert/wincert.upp
similarity index 100%
rename from uppsrc2/plugin/wincert/wincert.upp
rename to archive/uppsrc/plugin/wincert/wincert.upp
diff --git a/uppsrc2/rw/Alias.cpp b/archive/uppsrc/rw/Alias.cpp
similarity index 95%
rename from uppsrc2/rw/Alias.cpp
rename to archive/uppsrc/rw/Alias.cpp
index de9f35438..b2613c634 100644
--- a/uppsrc2/rw/Alias.cpp
+++ b/archive/uppsrc/rw/Alias.cpp
@@ -1,174 +1,174 @@
-#include "Designer.h"
-
-String AliasMap::StdFileName()
-{
-	return ConfigFile("rw.ali");
-}
-
-bool AliasMap::Load(const char *path)
-{
-	String file = LoadFile(path);
-	if(file.IsVoid())
-		return false;
-	obj_source.Clear();
-	obj_dest.Clear();
-	for(const char *s = file; *s;)
-	{
-		bool is_dest = (*s == ' ' || *s == '\t');
-		while(*s == ' ' || *s == '\t')
-			s++;
-		const char *b = s;
-		while(*s && *s != '\n')
-			s++;
-		const char *e = s;
-		while(e > b && (byte)e[-1] <= ' ')
-			e--;
-		String part(b, e);
-		if(is_dest)
-		{
-			while(obj_dest.GetCount() < obj_source.GetCount())
-				obj_dest.Add(part);
-		}
-		else
-			obj_source.Add(part);
-		if(*s)
-			s++;
-	}
-	if(obj_dest.GetCount() < obj_source.GetCount())
-		obj_source.SetCount(obj_dest.GetCount());
-	IndexSort(obj_source, obj_dest, StdLess<String>());
-	return true;
-}
-
-bool AliasMap::Save(const char *path)
-{
-	IndexSort(obj_dest, obj_source, StdLess<String>());
-	String out;
-	for(int i = 0; i < obj_source.GetCount(); i++)
-	{
-		out.Cat(obj_source[i]);
-		out.Cat("\r\n");
-		if(i + 1 >= obj_source.GetCount() || obj_dest[i + 1] != obj_dest[i])
-		{
-			out.Cat('\t');
-			out.Cat(obj_dest[i]);
-			out.Cat("\r\n");
-		}
-	}
-	IndexSort(obj_source, obj_dest, StdLess<String>());
-	return SaveFile(path, out);
-}
-
-void AliasMap::SetDefault()
-{
-	obj_source.Add("WithKeyMap<*>");         obj_dest.Add("@1");
-	obj_source.Add("WithDropChoice<*>");     obj_dest.Add("@1");
-	obj_source.Add("WithChoiceList<*>");     obj_dest.Add("@1");
-	obj_source.Add("EditDoubleSpin");        obj_dest.Add("EditDouble");
-	obj_source.Add("EditDoubleNotNullSpin"); obj_dest.Add("EditDouble");
-	obj_source.Add("Ctrl");                  obj_dest.Add("Label");
-	obj_source.Add("NotNullCtrl<*>");        obj_dest.Add("@1");
-	obj_source.Add("SqlArray");              obj_dest.Add("ArrayCtrl");
-	obj_source.Add("DataPusher");            obj_dest.Add("EditField");
-}
-
-static bool MatchAlias(const char *s, const char *t, Vector<String>& a)
-{
-	while(*t)
-		switch(*t++)
-		{
-		case '*':
-			{
-				const char *b = s;
-				do
-				{
-					a.Add(String(b, s));
-					if(MatchAlias(s, t, a))
-						return true;
-					a.Drop();
-				}
-				while(*s++);
-				return false;
-			}
-
-		default:
-			if(t[-1] != *s++)
-				return false;
-			break;
-		}
-	return !*s;
-}
-
-String AliasMap::Convert(const String& name) const
-{
-	for(int i = 0; i < obj_source.GetCount(); i++)
-	{
-		Vector<String> args;
-		if(MatchAlias(name, obj_source[i], args))
-		{
-			const char *s = obj_dest[i];
-			String out;
-			while(*s)
-				if(*s == '@' && (s[1] >= '1' && s[1] < '1' + min(args.GetCount(), 10)))
-				{
-					s += 2;
-					out.Cat(args[s[-1] - '1']);
-				}
-				else
-					out.Cat(*s++);
-			return out;
-		}
-	}
-	return name;
-}
-
-class DlgAlias : public WithAliasLayout<TopWindow>
-{
-public:
-	typedef DlgAlias CLASSNAME;
-	DlgAlias();
-
-	bool Run(AliasMap& map);
-
-private:
-	EditStringNotNull obj_source;
-	EditStringNotNull obj_dest;
-};
-
-bool AliasMap::Edit()
-{
-	return DlgAlias().Run(*this);
-}
-
-DlgAlias::DlgAlias()
-{
-	CtrlLayoutOKCancel(*this, "Object alias map");
-	list.AutoHideSb();
-	list.AddColumn("Source object").Edit(obj_source);
-	list.AddColumn("Alias object").Edit(obj_dest);
-	list.Inserting().Removing().NoAskRemove();
-}
-
-bool DlgAlias::Run(AliasMap& map)
-{
-	list.SetCount(map.obj_source.GetCount());
-	int i;
-	for(i = 0; i < map.obj_source.GetCount(); i++)
-	{
-		list.Set(i, 0, map.obj_source[i]);
-		list.Set(i, 1, map.obj_dest[i]);
-	}
-	if(!map.obj_source.IsEmpty())
-		list.SetCursor(0);
-	if(TopWindow::Run() != IDOK)
-		return false;
-	int n = list.GetCount();
-	map.obj_source.SetCount(n);
-	map.obj_dest.SetCount(n);
-	for(i = 0; i < n; i++)
-	{
-		map.obj_source[i] = list.Get(i, 0);
-		map.obj_dest[i]   = list.Get(i, 1);
-	}
-	return true;
-}
+#include "Designer.h"
+
+String AliasMap::StdFileName()
+{
+	return ConfigFile("rw.ali");
+}
+
+bool AliasMap::Load(const char *path)
+{
+	String file = LoadFile(path);
+	if(file.IsVoid())
+		return false;
+	obj_source.Clear();
+	obj_dest.Clear();
+	for(const char *s = file; *s;)
+	{
+		bool is_dest = (*s == ' ' || *s == '\t');
+		while(*s == ' ' || *s == '\t')
+			s++;
+		const char *b = s;
+		while(*s && *s != '\n')
+			s++;
+		const char *e = s;
+		while(e > b && (byte)e[-1] <= ' ')
+			e--;
+		String part(b, e);
+		if(is_dest)
+		{
+			while(obj_dest.GetCount() < obj_source.GetCount())
+				obj_dest.Add(part);
+		}
+		else
+			obj_source.Add(part);
+		if(*s)
+			s++;
+	}
+	if(obj_dest.GetCount() < obj_source.GetCount())
+		obj_source.SetCount(obj_dest.GetCount());
+	IndexSort(obj_source, obj_dest, StdLess<String>());
+	return true;
+}
+
+bool AliasMap::Save(const char *path)
+{
+	IndexSort(obj_dest, obj_source, StdLess<String>());
+	String out;
+	for(int i = 0; i < obj_source.GetCount(); i++)
+	{
+		out.Cat(obj_source[i]);
+		out.Cat("\r\n");
+		if(i + 1 >= obj_source.GetCount() || obj_dest[i + 1] != obj_dest[i])
+		{
+			out.Cat('\t');
+			out.Cat(obj_dest[i]);
+			out.Cat("\r\n");
+		}
+	}
+	IndexSort(obj_source, obj_dest, StdLess<String>());
+	return SaveFile(path, out);
+}
+
+void AliasMap::SetDefault()
+{
+	obj_source.Add("WithKeyMap<*>");         obj_dest.Add("@1");
+	obj_source.Add("WithDropChoice<*>");     obj_dest.Add("@1");
+	obj_source.Add("WithChoiceList<*>");     obj_dest.Add("@1");
+	obj_source.Add("EditDoubleSpin");        obj_dest.Add("EditDouble");
+	obj_source.Add("EditDoubleNotNullSpin"); obj_dest.Add("EditDouble");
+	obj_source.Add("Ctrl");                  obj_dest.Add("Label");
+	obj_source.Add("NotNullCtrl<*>");        obj_dest.Add("@1");
+	obj_source.Add("SqlArray");              obj_dest.Add("ArrayCtrl");
+	obj_source.Add("DataPusher");            obj_dest.Add("EditField");
+}
+
+static bool MatchAlias(const char *s, const char *t, Vector<String>& a)
+{
+	while(*t)
+		switch(*t++)
+		{
+		case '*':
+			{
+				const char *b = s;
+				do
+				{
+					a.Add(String(b, s));
+					if(MatchAlias(s, t, a))
+						return true;
+					a.Drop();
+				}
+				while(*s++);
+				return false;
+			}
+
+		default:
+			if(t[-1] != *s++)
+				return false;
+			break;
+		}
+	return !*s;
+}
+
+String AliasMap::Convert(const String& name) const
+{
+	for(int i = 0; i < obj_source.GetCount(); i++)
+	{
+		Vector<String> args;
+		if(MatchAlias(name, obj_source[i], args))
+		{
+			const char *s = obj_dest[i];
+			String out;
+			while(*s)
+				if(*s == '@' && (s[1] >= '1' && s[1] < '1' + min(args.GetCount(), 10)))
+				{
+					s += 2;
+					out.Cat(args[s[-1] - '1']);
+				}
+				else
+					out.Cat(*s++);
+			return out;
+		}
+	}
+	return name;
+}
+
+class DlgAlias : public WithAliasLayout<TopWindow>
+{
+public:
+	typedef DlgAlias CLASSNAME;
+	DlgAlias();
+
+	bool Run(AliasMap& map);
+
+private:
+	EditStringNotNull obj_source;
+	EditStringNotNull obj_dest;
+};
+
+bool AliasMap::Edit()
+{
+	return DlgAlias().Run(*this);
+}
+
+DlgAlias::DlgAlias()
+{
+	CtrlLayoutOKCancel(*this, "Object alias map");
+	list.AutoHideSb();
+	list.AddColumn("Source object").Edit(obj_source);
+	list.AddColumn("Alias object").Edit(obj_dest);
+	list.Inserting().Removing().NoAskRemove();
+}
+
+bool DlgAlias::Run(AliasMap& map)
+{
+	list.SetCount(map.obj_source.GetCount());
+	int i;
+	for(i = 0; i < map.obj_source.GetCount(); i++)
+	{
+		list.Set(i, 0, map.obj_source[i]);
+		list.Set(i, 1, map.obj_dest[i]);
+	}
+	if(!map.obj_source.IsEmpty())
+		list.SetCursor(0);
+	if(TopWindow::Run() != IDOK)
+		return false;
+	int n = list.GetCount();
+	map.obj_source.SetCount(n);
+	map.obj_dest.SetCount(n);
+	for(i = 0; i < n; i++)
+	{
+		map.obj_source[i] = list.Get(i, 0);
+		map.obj_dest[i]   = list.Get(i, 1);
+	}
+	return true;
+}
diff --git a/uppsrc2/rw/Copying b/archive/uppsrc/rw/Copying
similarity index 100%
rename from uppsrc2/rw/Copying
rename to archive/uppsrc/rw/Copying
diff --git a/uppsrc2/rw/Designer.cpp b/archive/uppsrc/rw/Designer.cpp
similarity index 96%
rename from uppsrc2/rw/Designer.cpp
rename to archive/uppsrc/rw/Designer.cpp
index 57e152bec..58cd63cec 100644
--- a/uppsrc2/rw/Designer.cpp
+++ b/archive/uppsrc/rw/Designer.cpp
@@ -1,1217 +1,1217 @@
-#include "Designer.h"
-#pragma hdrstop
-
-#define  IMAGEFILE <rw/rw.iml>
-#include <Draw/iml_source.h>
-
-#define LLOG(x) // LOG(x)
-
-int LayoutDesigner::GetTrack(int a, int b, int type) {
-	return type == LEFT   ? a - TRACKERSIZE :
-	       type == CENTER ? (a + b - TRACKERSIZE) / 2 :
-	                        b;
-}
-
-Image LayoutDesigner::GetTrackShape(Point track) {
-	const Image& (*id[3][3])() = {
-		{ CtrlImg::SizeHoVe0, CtrlImg::SizeVert0, CtrlImg::SizeVeHo0 },
-		{ CtrlImg::SizeHorz0, Image::SizeAll,     CtrlImg::SizeHorz0 },
-		{ CtrlImg::SizeVeHo0, CtrlImg::SizeVert0, CtrlImg::SizeHoVe0 }
-	};
-	if(track.x == FORM)
-		return CtrlImg::SizeHoVe0();
-	if(track.x >= 0 && track.x <= 4 && track.y >= 0 && track.y <= 4)
-		return (*id[track.y][track.x])();
-	return Image::Arrow();
-}
-
-Rect LayoutDesigner::GetTracker(Point track) {
-	if(track.x == FORM) {
-		Rect r = form.GetRect() + sb;
-		return RectC(r.right, r.bottom, TRACKERSIZE, TRACKERSIZE);
-	}
-	Rect actual = GetActual();
-	return RectC(GetTrack(actual.left, actual.right, track.x),
-		         GetTrack(actual.top, actual.bottom, track.y),
-				 TRACKERSIZE, TRACKERSIZE);
-}
-
-Rect LayoutDesigner::GetSpringRect(int i) {
-	Rect r = form.GetRect() + sb;
-	r.Inflate(10, 10);
-	Rect actual = GetActual();
-	if(i == SLEFT || i == SRIGHT) {
-		r.top = actual.top + actual.Height() / 4 - TRACKERSIZE;
-		r.bottom = r.top + 2 * TRACKERSIZE;
-		if(i == SLEFT)
-			r.right = actual.left;
-		else {
-			int h2 = actual.Height() / 2;
-			r.top += h2;
-			r.bottom += h2;
-			r.left = actual.right;
-		}
-	}
-	if(i == STOP || i == SBOTTOM) {
-		r.left = actual.left + actual.Width() / 4 - TRACKERSIZE;
-		r.right = r.left + 2 * TRACKERSIZE;
-		if(i == STOP)
-			r.bottom = actual.top;
-		else {
-			int w2 = actual.Width() / 2;
-			r.left += w2;
-			r.right += w2;
-			r.top = actual.bottom;
-		}
-	}
-	return r;
-}
-
-Rect LayoutDesigner::GetCtrlRect(int i) {
-	return ctrl[i].GetRect();
-}
-
-Rect LayoutDesigner::GetActualRect() {
-	return itemi.IsEmpty() ? Rect(-INT_MAX, -INT_MAX, -INT_MAX, -INT_MAX)
-		                   : GetCtrlRect(itemi.Top());
-}
-
-Rect LayoutDesigner::GetActual() {
-	return GetActualRect() + Point(10, 10);
-}
-
-bool LayoutDesigner::GetSpring(int im, int i) {
-	LogPos p = ctrl[im].GetPos();
-	switch(i) {
-	case SLEFT:
-		return p.x.GetAlign() == Ctrl::LEFT || p.x.GetAlign() == Ctrl::SIZE;
-	case SRIGHT:
-		return p.x.GetAlign() == Ctrl::RIGHT || p.x.GetAlign() == Ctrl::SIZE;
-	case STOP:
-		return p.y.GetAlign() == Ctrl::TOP || p.y.GetAlign() == Ctrl::SIZE;
-	case SBOTTOM:
-		return p.y.GetAlign() == Ctrl::BOTTOM || p.y.GetAlign() == Ctrl::SIZE;
-	};
-	return false;
-}
-
-bool LayoutDesigner::GetSpring(int i) {
-	if(itemi.IsEmpty()) return false;
-	return GetSpring(itemi.Top(), i);
-}
-
-void LayoutDesigner::Paint(Draw& w) {
-	Size sz = GetSize();
-	w.DrawRect(0, 0, sz.cx, sz.cy, layouti < 0 ? SLtGray : SWhite);
-	if(layouti >= 0) {
-		Rect r = form.GetRect();
-		DrawFatFrame(w, r, SBlack, -1);
-		w.DrawRect(r.right, r.bottom, TRACKERSIZE, TRACKERSIZE, SLtBlue);
-	}
-}
-
-bool LayoutDesigner::IsMoving() {
-	return HasCapture() && track.x == CENTER && track.y == CENTER && cltm;
-}
-
-void LayoutDesigner::DrawHorzSpring(Draw& w, int i) {
-	Rect r = GetSpringRect(i) - sb;
-	bool spring = GetSpring(i);
-	int wd = r.Width();
-	int y = (r.top + r.bottom) / 2;
-	Point p1 = Point(r.left, y);
-	if(!spring)
-		for(int i = 1; i < 10; i++) {
-			Point p2 = Point(r.left + i * wd / 10, y + (1 - 2 * (i & 1)) * (TRACKERSIZE - 1));
-			w.DrawLine(p1, p2, 1, SGray);
-			p1 = p2;
-		}
-	w.DrawLine(p1, Point(r.right - spring, y), 1 + spring, spring ? SRed : SGray);
-}
-
-void LayoutDesigner::DrawVertSpring(Draw& w, int i) {
-	Rect r = GetSpringRect(i) - sb;
-	bool spring = GetSpring(i);
-	int hg = r.Height();
-	int x = (r.left + r.right) / 2;
-	Point p1 = Point(x, r.top);
-	if(!spring)
-		for(int i = 1; i < 10; i++) {
-			Point p2 = Point(x + (1 - 2 * (i & 1)) * (TRACKERSIZE - 1), r.top + i * hg / 10);
-			w.DrawLine(p1, p2, 1, SGray);
-			p1 = p2;
-		}
-	w.DrawLine(p1, Point(x, r.bottom - spring), 1 + spring, spring ? SRed : SGray);
-}
-
-void LayoutDesigner::PaintTrack(Draw& w) {
-	if(track.x == SELECTRECT) {
-		Rect m = selectrect;
-		m.Normalize();
-		if(!m.IsEmpty())
-			DrawFrame(w, m, SLtRed, SLtRed);
-	}
-	else
-	if(!itemi.IsEmpty() && !IsMoving()) {
-		SetBar();
-		Point p = sb;
-		for(int i = 0; i < itemi.GetCount() - 1; i++) {
-			Rect r = ctrl[itemi[i]].GetRect() + (Point(10, 10) - p);
-			DrawFatFrame(w, r.left, r.top, r.Width(), r.Height(), SBrown, -3);
-		}
-		Rect actual = GetActual() - p;
-		DrawFatFrame(w, actual.left, actual.top, actual.Width(), actual.Height(), SCyan, -3);
-		DrawHorzSpring(w, SLEFT);
-		DrawHorzSpring(w, SRIGHT);
-		DrawVertSpring(w, STOP);
-		DrawVertSpring(w, SBOTTOM);
-		for(int h = LEFT; h <= RIGHT; h++)
-			for(int v = TOP; v <= BOTTOM; v++)
-				if(h != CENTER || v != CENTER)
-					w.DrawRect(GetTracker(Point(h, v)) - p, SLtBlue);
-	}
-}
-
-void LayoutDesigner::PaintForm(Draw& w) {
-	Size sz = form.GetRect().Size();
-	w.DrawRect(0, 0, sz.cx, sz.cy, SLtGray);
-	for(Ctrl *q = form.GetFirstChild(); q; q = q->GetNext())
-		if(q->IsTransparent())
-			DrawFrame(w, q->GetRect(), SWhiteGray, SWhiteGray);
-}
-
-Point LayoutDesigner::FindTracker(Point p) {
-	Point track;
-	for(track.x = LEFT; track.x <= FORM; track.x++)
-		for(track.y = TOP; track.y <= BOTTOM; track.y++)
-			if((track.x != CENTER || track.y != CENTER) && GetTracker(track).Contains(p))
-				return track;
-	return Point(-1, -1);
-}
-
-int   LayoutDesigner::FindItem(Point p) {
-	int i;
-	int mini = -1;
-	int min = INT_MAX;
-	p += Point(-10, -10);
-	for(i = 0; i < ctrl.GetCount(); i++) {
-		Rect r = ctrl[i].GetRect();
-		if(r.Contains(p)) {
-			int m = r.Width() * r.Height();
-			if(m < min) {
-				mini = i;
-				min = m;
-			}
-		}
-	}
-	return mini;
-}
-
-void LayoutDesigner::SetItemPos(int i, const Rect& r, int chi, bool val, bool sync) {
-	bool l = chi == SLEFT   ? val : GetSpring(i, SLEFT);
-	bool p = chi == SRIGHT  ? val : GetSpring(i, SRIGHT);
-	bool t = chi == STOP    ? val : GetSpring(i, STOP);
-	bool b = chi == SBOTTOM ? val : GetSpring(i, SBOTTOM);
-	Ctrl& q = ctrl[i];
-	Size sz = form.GetSize();
-	if(l)
-		if(p) q.HSizePos(r.left, sz.cx - r.right);
-		else  q.LeftPos(r.left, r.Width());
-	else
-		if(p) q.RightPos(sz.cx - r.right, r.Width());
-		else  q.HCenterPos(r.Width(), (r.left + r.right - sz.cx) / 2);
-	if(t)
-		if(b) q.VSizePos(r.top, sz.cy - r.bottom);
-		else  q.TopPos(r.top, r.Height());
-	else
-		if(b) q.BottomPos(sz.cy - r.bottom, r.Height());
-		else  q.VCenterPos(r.Height(), (r.top + r.bottom - sz.cy) / 2);
-	Item(i).pos = q.GetPos();
-	if(sync) {
-		{ TIMING("SetItemPos::Status");
-		ShowStatus();
-		}
-		{ TIMING("SetItemPos::Layout");
-		Layout();
-		}
-		{ TIMING("SetItemPos::Sync");
-		Sync();
-		}
-	}
-}
-
-void LayoutDesigner::SetActualPos(const Rect& r, int chi, bool val) {
-	if(itemi.GetCount())
-		SetItemPos(itemi.Top(), r, chi, val);
-}
-
-/*
-void LayoutDesigner::SetAutoItemPos(int i, const Rect& r) {
-	Ctrl& q = ctrl[i];
-	Size sz = form.GetSize();
-	if(r.left < sz.cx / 2)
-		if(r.right < sz.cx / 2)
-			q.LeftPos(r.left, r.Width());
-		else
-			q.HSizePos(r.left, sz.cx - r.right);
-	else
-		q.RightPos(sz.cx - r.right, r.Width());
-	if(r.top < sz.cy / 2)
-		if(r.bottom < sz.cy / 2)
-			q.TopPos(r.top, r.Height());
-		else
-			q.VSizePos(r.top, sz.cy - r.bottom);
-	else
-		q.BottomPos(sz.cy - r.bottom, r.Height());
-	Item(i).pos = q.GetPos();
-	ShowStatus();
-	Layout();
-	Sync();
-}
-*/
-
-Image LayoutDesigner::CursorImage(Point p, dword keyflags) {
-	p += sb;
-	if(IsMoving())
-		return CrossCursor();
-	if(HasCapture())
-		return track.x == SELECTRECT ? Image::Arrow() : GetTrackShape(track);
-	if(GetActual().Contains(p))
-		return Image::SizeAll();
-	Point track = FindTracker(p);
-	if(track.x >= 0)
-		return GetTrackShape(track);
-	return Image::Arrow();
-}
-
-void LayoutDesigner::RefreshActual() {
-	if(itemi.GetCount()) {
-		Rect r = GetActual();
-		r.Inflate(TRACKERSIZE, TRACKERSIZE);
-		Refresh(r - sb);
-		for(int i = SLEFT; i <= SBOTTOM; i++)
-			Refresh(GetSpringRect(i) - sb);
-	}
-}
-
-void LayoutDesigner::RefreshSelect(int i) {
-	if(i == itemi.GetCount() - 1)
-		RefreshActual();
-	else {
-		Rect r = ctrl[itemi[i]].GetRect() + Point(10, 10);
-		r.Inflate(TRACKERSIZE, TRACKERSIZE);
-		Refresh(r - sb);
-	}
-}
-
-int  LayoutDesigner::FindSelect(int im) {
-	for(int i = 0; i < itemi.GetCount(); i++)
-		if(itemi[i] == im) return i;
-	return -1;
-}
-
-void LayoutDesigner::UnselectItem(int im) {
-	int i = FindSelect(im);
-	if(i < 0) return;
-	RefreshSelect(i);
-	itemi.Remove(i);
-	RefreshActual();
-	if(itemi.GetCount() == 0)
-		ClearSelection();
-	else
-		SelectItem(itemi.Top());
-}
-
-void LayoutDesigner::ClearSelection0() {
-	for(int i = 0; i < itemi.GetCount(); i++) {
-		RefreshSelect(i);
-		itab.SetDisplay(itemi[i], 0, StdDisplay());
-		itab.SetDisplay(itemi[i], 1, VarLblDisplay(false));
-	}
-	itemi.Clear();
-	classname.Disable();
-	classname.Clear();
-	variable.Disable();
-	variable.Clear();
-	label.Disable();
-	label.Set("");
-	help.Disable();
-	help.Set("");
-	ShowStatus();
-	SetBar();
-}
-
-void LayoutDesigner::ShowHideLayouts()
-{
-	if(layouti < 0)
-		return;
-	Vector<int> layouts;
-	String dummy;
-	int i;
-	for(i = 0; i < ItemCount(); i++)
-		if(ParseLayoutRef(Item(i).classname, dummy) >= 0)
-			layouts.Add(i);
-	for(i = 0; i < layouts.GetCount(); i++)
-	{
-		int li = layouts[i];
-		Rect rc = ctrl[li].GetRect();
-		bool show = (FindIndex(itemi, li) >= 0);
-		if(!show)
-		{
-			show = true;
-			for(int p = 0; p < layouts.GetCount(); p++)
-				if(p != i && (ctrl[layouts[p]].GetRect() && rc) && (p < i || FindIndex(itemi, layouts[p]) >= 0))
-				{
-					show = false;
-					break;
-				}
-		}
-		ctrl[li].Show(show);
-	}
-	SynchronizeMnemonic();
-}
-
-void LayoutDesigner::ClearSelection() {
-	ClearSelection0();
-	itab.SetCursor(-1);
-}
-
-void LayoutDesigner::SelectItem(int im) {
-	if(im < 0) return;
-	RefreshActual();
-	UnselectItem(im);
-	itemi.Add(im);
-	RefreshActual();
-	itab.SetCursor(im);
-	itab.SetDisplay(im, 0, SelDisplay);
-	itab.SetDisplay(im, 1, VarLblDisplay(true));
-	classname.Enable();
-	variable.Enable();
-	label.Enable();
-	help.Enable();
-	ItemInfo& ii = Item(im);
-	classname <<= ii.classname;
-	variable <<= ii.variable;
-	label <<= Lng(ii.label);
-	help <<= Lng(ii.help);
-	ShowHideLayouts();
-	ShowStatus();
-	SetBar();
-}
-
-void LayoutDesigner::SelectOneItem(int im) {
-	ClearSelection0();
-	if(im < ctrl.GetCount())
-		SelectItem(im);
-}
-
-int FilterName(int c) {
-	return IsAlNum(c) ? ToLower(c) : 0;
-}
-
-void LayoutDesigner::WhenITab() {
-	if(itab.GetCursor() >= 0)
-		if(::GetCtrl() || ::GetShift())
-			SelectItem(itab.GetCursor());
-		else
-			SelectOneItem(itab.GetCursor());
-	SetFocus();
-}
-
-void LayoutDesigner::SetFormSize(Size sz) {
-	Point p = sb;
-	form.SetRect(-p.x + 10, -p.y + 10, sz.cx, sz.cy);
-	ActualForm().size = sz;
-	Refresh();
-	Layout();
-	Sync();
-}
-
-void LayoutDesigner::NewCtrl(int i) {
-	String clss = i < 0 ? String() : ClassMap().GetKey(i);
-	AddCtrl(clss, String(), String(), String());
-	Size sz = ctrl[itemi.Top()].GetMinSize();
-	SetActualPos(RectC(newctrl.x, newctrl.y, sz.cx * 8, sz.cy));
-}
-
-void LayoutDesigner::ClassMenu(Bar& menu) {
-	menu.Add("User class", classset[-1]);
-	menu.Separator();
-	for(int i = 0; i < ClassMap().GetCount(); i++) {
-		Bar::Item& m = menu.Add(ClassMap().GetKey(i), classset[i]);
-		if((i + 2) % 16 == 0) menu.Break();
-	}
-}
-
-void LayoutDesigner::RightDown(Point p, dword keyflags) {
-	if(layouti < 0) return;
-	newctrl = p;
-	MenuBar bar;
-	bar.SetFont(Arial(10)).LeftGap(2);
-	ClassMenu(bar);
-	bar.Execute();
-}
-
-void LayoutDesigner::RefreshSelectRect() {
-	Rect m = selectrect;
-	m.Normalize();
-	Refresh(m.left, m.top, 1, m.Height());
-	Refresh(m.left, m.top, m.Width(), 1);
-	Refresh(m.left, m.bottom - 1, m.Width(), 1);
-	Refresh(m.right - 1, m.top, 1, m.Height());
-}
-
-void LayoutDesigner::StartMoving(Point p) {
-	Rect actual = GetActualRect();
-	delta = p - actual.TopLeft();
-	melta.SetCount(itemi.GetCount() - 1);
-	for(int i = 0; i < itemi.GetCount() - 1; i++)
-		melta[i] = GetCtrlRect(itemi[i]).TopLeft() - actual.TopLeft();
-	track.x = track.y = CENTER;
-	SetCapture();
-}
-
-void LayoutDesigner::DoMoving() {
-	cltm = true;
-	for(int i = 0; i < itemi.GetCount(); i++)
-		RefreshSelect(i);
-}
-
-void LayoutDesigner::LeftDown(Point p, dword keyflags) {
-	LOG("@@ LeftDown");
-	if(layouti < 0) return;
-	int i;
-	moved = cltm = false;
-	p += sb;
-	SetFocus();
-	Rect actual = GetActual();
-	if(actual.Contains(p)) {
-		if((keyflags & K_SHIFT) && itemi.GetCount()) {
-			UnselectItem(itemi.Top());
-			return;
-		}
-		StartMoving(p);
-		DoMoving();
-		return;
-	}
-	track = FindTracker(p);
-	if(track.x >= 0) {
-		Rect fr = form.GetRect();
-		delta = Point(p.x - (track.x == FORM ? fr.right :
-		                     track.x == LEFT ? actual.left : actual.right),
-				      p.y - (track.x == FORM ? fr.bottom :
-							 track.y == TOP ? actual.top : actual.bottom));
-		SetCapture();
-		return;
-	}
-	i = FindItem(p);
-	if(i >= 0) {
-		if(keyflags & K_SHIFT)
-			if(ItemSelected(i))
-				UnselectItem(i);
-			else
-				SelectItem(i);
-		else
-			if(!ItemSelected(i))
-				SelectOneItem(i);
-		StartMoving(p);
-		DoMoving();
-		return;
-	}
-	for(i = SLEFT; i <= SBOTTOM; i++)
-		if(GetSpringRect(i).Contains(p)) {
-			RefreshActual();
-			SetActualPos(GetActualRect(), i, !GetSpring(i));
-			return;
-		}
-	if(!(keyflags & (K_SHIFT|K_CTRL)))
-		ClearSelection();
-	track.x = SELECTRECT;
-	selectrect.Set(p.x, p.y, p.x, p.y);
-	RefreshSelectRect();
-	SetCapture();
-}
-
-void LayoutDesigner::LeftRepeat(Point p, dword keyflags) {
-	if(!cltm) DoMoving();
-}
-
-void LayoutDesigner::MouseMove(Point p, dword keyflags) {
-	p += sb;
-	if(track.x == SELECTRECT && HasCapture()) {
-		RefreshSelectRect();
-		selectrect.right = p.x;
-		selectrect.bottom = p.y;
-		RefreshSelectRect();
-		return;
-	}
-	int gx = GridX();
-	int gy = GridY();
-	if(IsMoving() && itemi.GetCount()) {
-		LLOG("LayoutDesigner::MouseMove -> " << p);
-		bool m = false;
-		Size sz = GetActualRect().Size();
-		if(!moved) {
-			RefreshSelect(itemi.GetCount() - 1);
-			m = true;
-		}
-		Rect cr = RectC((p.x - delta.x) / gx * gx, (p.y - delta.y) / gy * gy, sz.cx, sz.cy);
-		for(int i = 0; i < itemi.GetCount() - 1; i++) {
-			int im = itemi[i];
-			if(!moved) {
-				RefreshSelect(i);
-				m = true;
-			}
-			Size sz = GetCtrlRect(im).Size();
-			SetItemPos(im, RectC(cr.left + melta[i].x, cr.top + melta[i].y, sz.cx, sz.cy), -1, false, false);
-		}
-		SetItemPos(itemi.Top(), cr, -1, false, true);
-		if(m) moved = true;
-		return;
-	}
-	p -= delta;
-	if(HasCapture()) {
-		if(track.x == FORM) {
-			Size sz = Size(max(0, p.x - 10), max(0, p.y - 10));
-			sz.cx = sz.cx / gx * gx;
-			sz.cy = sz.cy / gy * gy;
-			SetFormSize(sz);
-			ShowStatus();
-			return;
-		}
-		if(itemi.GetCount()) {
-			Rect actual = GetActualRect();
-			RefreshActual();
-			p.Offset(-10, -10);
-			if(track.x == LEFT) actual.left = min(actual.right, p.x) / gx * gx;
-			if(track.x == RIGHT) actual.right = max(actual.left, p.x) / gy * gy;
-			if(track.y == TOP) actual.top = min(actual.bottom, p.y) / gx * gx;
-			if(track.y == BOTTOM) actual.bottom = max(actual.top, p.y) / gy * gy;
-			if(!ignoremin) {
-				Size sz = ctrl[itemi.Top()].GetMinSize();
-				actual.right = max(actual.left + sz.cx, actual.right);
-				actual.bottom = max(actual.top + sz.cy, actual.bottom);
-			}
-			SetActualPos(actual);
-			RefreshActual();
-			moved = true;
-		}
-	}
-}
-
-void LayoutDesigner::LeftUp(Point p, dword keyflags) {
-	LOG("@@@ LeftUp");
-	for(int i = 0; i < itemi.GetCount(); i++)
-		RefreshSelect(i);
-	if(track.x == SELECTRECT) {
-		if(!(keyflags & (K_SHIFT|K_CTRL)))
-			ClearSelection();
-		Rect m = selectrect;
-		m.Normalize();
-		m.Offset(-10, -10);
-		m += sb;
-		for(int i = 0; i < ctrl.GetCount(); i++) {
-			Rect r = ctrl[i].GetRect();
-			if(r.left >= m.left && r.right <= m.right && r.top >= m.top && r.bottom <= m.bottom)
-				SelectItem(i);
-		}
-		track.x = -1;
-		RefreshSelectRect();
-		return;
-	}
-	if(!(keyflags & K_SHIFT) && !(keyflags & K_CTRL) && !moved) {
-		int i = FindItem(p + sb);
-		if(i >= 0)
-			SelectOneItem(i);
-	}
-}
-
-void LayoutDesigner::Scroll() {
-	SetFormSize(form.GetSize());
-}
-
-void LayoutDesigner::NewClass() {
-	if(itemi.IsEmpty()) return;
-	for(int i = 0; i < itemi.GetCount(); i++) {
-		int im = itemi[i];
-		Item(im).classname = classname;
-		SetClass(im);
-		RefreshActual();
-	}
-}
-
-void LayoutDesigner::NewVariable() {
-	if(itemi.IsEmpty()) return;
-	itab.Set(itemi.Top(), 1, Item(itemi.Top()).variable = variable);
-}
-
-static int FilterOutCr(int c) {
-	return c == '\r' ? 0 : c;
-}
-
-void LayoutDesigner::NewLabel() {
-	if(itemi.IsEmpty()) return;
-	ItemLabel(itemi.Top()) = Filter(label.Get(), FilterOutCr);
-	SynchronizeCtrl();
-	SynchronizeMnemonic();
-}
-
-void LayoutDesigner::NewHelp() {
-	if(itemi.IsEmpty()) return;
-	Help(itemi.Top()) = Filter(help.Get(), FilterOutCr);
-	SynchronizeCtrl();
-}
-
-void LayoutDesigner::Layout() {
-	sb.SetPage(GetSize());
-	Size sz = form.GetSize() + Size(20, 20);
-	for(int i = 0; i < ctrl.GetCount(); i++) {
-		sz.cx = max(ctrl[i].GetRect().right + TRACKERSIZE + 20, sz.cx);
-		sz.cy = max(ctrl[i].GetRect().bottom + TRACKERSIZE + 20, sz.cy);
-	}
-	sb.SetTotal(sz);
-	int cx = frame.GetSize().cx;
-//	menubar.LeftPos(0, cx / 2);
-	status.Width(cx >> 1);
-}
-
-void LayoutDesigner::ShowStatus() {
-	String s;
-	if(layouti >= 0) {
-		Size sz = form.GetRect().Size();
-		s = "Layout size: " + ::AsString(sz);
-		if(itemi.GetCount()) {
-			Rect r = ctrl[itemi.Top()].GetRect();
-			s << "  Item: " << ::AsString(r) <<
-				 " - {" << sz.cx - r.right << ", " << sz.cy - r.bottom << '}';
-		}
-	}
-	status.SetLabelText(s);
-}
-
-static int RoundStep(int org, int d, int g)
-{
-	return d ? itimesfloor(org + d * g + (d > 0 ? 0 : g - 1), g) - org : 0;
-}
-
-void LayoutDesigner::KeyMove(int dx, int dy, int sx, int sy) {
-	if(itemi.IsEmpty())
-		return;
-	Rect main = GetCtrlRect(itemi.Top()), shift;
-	int gx = GridX(), gy = GridY();
-	shift.left = shift.right = RoundStep(main.left, dx, gx);
-	shift.top = shift.bottom = RoundStep(main.top, dy, gy);
-	shift.right += RoundStep(main.Width(), sx, gx);
-	shift.bottom += RoundStep(main.Height(), sy, gy);
-	for(int i = itemi.GetCount(); --i >= 0;) {
-		RefreshSelect(i);
-		SetItemPos(itemi[i], GetCtrlRect(itemi[i]) + shift, -1, false, i == 0);
-		RefreshSelect(i);
-	}
-}
-
-bool LayoutDesigner::Key(dword key, int count) {
-	switch(key) {
-	case K_RIGHT:
-	case K_DOWN:
-		if(itemi.IsEmpty())
-			SelectOneItem(ctrl.GetCount() - 1);
-		else
-		if(itemi.Top() < ctrl.GetCount() - 1)
-			SelectOneItem(itemi.Top() + 1);
-		return true;
-	case K_LEFT:
-	case K_UP:
-		if(itemi.IsEmpty())
-			SelectOneItem(0);
-		else
-		if(itemi.Top() > 0)
-			SelectOneItem(itemi.Top() - 1);
-		return true;
-	case K_PAGEUP:
-		if(layouti > 0 && layout.GetCount() - 1)
-			SetLayout(layouti - 1);
-		break;
-	case K_PAGEDOWN:
-		if(layouti < layout.GetCount() - 1)
-			SetLayout(layouti + 1);
-		break;
-	case K_HOME:
-		SelectOneItem(0);
-		break;
-	case K_END:
-		SelectOneItem(ctrl.GetCount() - 1);
-		break;
-	case K_SHIFT_LEFT:
-		KeyMove(-1, 0, 0, 0);
-		break;
-	case K_SHIFT_RIGHT:
-		KeyMove(1, 0, 0, 0);
-		break;
-	case K_SHIFT_UP:
-		KeyMove(0, -1, 0, 0);
-		break;
-	case K_SHIFT_DOWN:
-		KeyMove(0, 1, 0, 0);
-		break;
-	case K_SHIFT_CTRL_LEFT:
-		KeyMove(0, 0, -1, 0);
-		break;
-	case K_SHIFT_CTRL_RIGHT:
-		KeyMove(0, 0, 1, 0);
-		break;
-	case K_SHIFT_CTRL_UP:
-		KeyMove(0, 0, 0, -1);
-		break;
-	case K_SHIFT_CTRL_DOWN:
-		KeyMove(0, 0, 0, 1);
-		break;
-	default:
-		if(key >= ' ' && key < 256) {
-			label.SetFocus();
-			return label.Key(key, count);
-		}
-		return menubar.HotKey(key);
-	}
-	SetFocus();
-	return true;
-}
-
-void LayoutDesigner::AddItem() {
-	if(layouti < 0) return;
-	AddCtrl(String(), String(), String(), String());
-}
-
-void LayoutDesigner::MoveUp() {
-#ifdef _DEBUG
-	if(GetFocusCtrl())
-		GetFocusCtrl()->Dump();
-#endif
-	if(itemi.GetCount()) {
-		int sc = itab.GetCursorSc();
-		Vector<int> ilist(itemi, 0), sorted(itemi, 0);
-		Sort(sorted);
-		if(sorted[0] == 0)
-		{
-			BeepExclamation();
-			return;
-		}
-		ClearSelection();
-		int i;
-		for(i = 0; i < sorted.GetCount(); i++)
-			Swap(sorted[i], sorted[i] - 1);
-		for(i = 0; i < ilist.GetCount(); i++)
-			SelectItem(ilist[i] - 1);
-		itab.ScCursor(sc - itab.GetLineCy());
-		itab.ScrollIntoCursor();
-	}
-}
-
-void LayoutDesigner::MoveDown() {
-	if(itemi.GetCount()) {
-		int sc = itab.GetCursorSc();
-		Vector<int> ilist(itemi, 0), sorted(itemi, 0);
-		Sort(sorted);
-		if(sorted.Top() >= ctrl.GetCount() - 1)
-		{
-			BeepExclamation();
-			return;
-		}
-		ClearSelection();
-		int i;
-		for(i = sorted.GetCount(); --i >= 0;)
-			Swap(sorted[i], sorted[i] + 1);
-		for(i = 0; i < ilist.GetCount(); i++)
-			SelectItem(ilist[i] + 1);
-		itab.ScCursor(sc + itab.GetLineCy());
-		itab.ScrollIntoCursor();
-	}
-}
-
-void LayoutDesigner::ToggleIgnoreMin() {
-	ignoremin = !ignoremin;
-}
-
-void LayoutDesigner::ToggleQLIB2Output() {
-	qlib2_output = !qlib2_output;
-}
-
-void LayoutDesigner::ItemPos(int xy)
-{
-	ITEMPOS xpos = (ITEMPOS)LOWORD(xy), ypos = (ITEMPOS)HIWORD(xy);
-	Size sz = form.GetSize(), half = sz >> 1;
-
-	for(int i = 0; i < itemi.GetCount(); i++)
-	{
-		RefreshSelect(i);
-		Ctrl& q = ctrl[itemi[i]];
-		Rect r = q.GetRect();
-
-		ITEMPOS axpos = xpos;
-		if(axpos == POS_AUTO)
-			axpos = (r.left < half.cy ? r.right < half.cy ? POS_LEFT : POS_SIZE : POS_RIGHT);
-		switch(axpos)
-		{
-		case POS_LEFT:   q.LeftPos(r.left, r.Width()); break;
-		case POS_RIGHT:  q.RightPos(sz.cx - r.right, r.Width()); break;
-		case POS_CENTER: q.HCenterPos(r.Width(), (r.left + r.right - sz.cx) >> 1); break;
-		case POS_SIZE:   q.HSizePos(r.left, sz.cx - r.right); break;
-		}
-
-		ITEMPOS aypos = ypos;
-		if(aypos == POS_AUTO)
-			aypos = (r.top < half.cy ? r.bottom < half.cy ? POS_TOP : POS_SIZE : POS_BOTTOM);
-		switch(aypos)
-		{
-		case POS_TOP:    q.TopPos(r.top, r.Height()); break;
-		case POS_BOTTOM: q.BottomPos(sz.cy - r.bottom, r.Height()); break;
-		case POS_CENTER: q.VCenterPos(r.Height(), (r.top + r.bottom - sz.cy) >> 1); break;
-		case POS_SIZE:   q.VSizePos(r.top, sz.cy - r.bottom); break;
-		}
-
-		SetItemPos(itemi[i], r);
-		RefreshSelect(i);
-	}
-}
-
-int LayoutDesigner::GetItemPosMask() const
-{
-	int xbits = 0, ybits = 0;
-	for(int i = 0; i < itemi.GetCount(); i++)
-	{
-		LogPos pos = ctrl[itemi[i]].GetPos();
-		switch(pos.x.GetAlign())
-		{
-		case Ctrl::LEFT:   xbits |= 1 << POS_LEFT; break;
-		case Ctrl::RIGHT:  xbits |= 1 << POS_RIGHT; break;
-		case Ctrl::CENTER: xbits |= 1 << POS_CENTER; break;
-		case Ctrl::SIZE:   xbits |= 1 << POS_SIZE; break;
-		}
-		switch(pos.y.GetAlign())
-		{
-		case Ctrl::LEFT:   ybits |= 1 << POS_TOP; break;
-		case Ctrl::RIGHT:  ybits |= 1 << POS_BOTTOM; break;
-		case Ctrl::CENTER: ybits |= 1 << POS_CENTER; break;
-		case Ctrl::SIZE:   ybits |= 1 << POS_SIZE; break;
-		}
-	}
-	return MAKELONG(xbits, ybits);
-}
-
-/*
-void LayoutDesigner::AutoPos() {
-	for(int i = 0; i < itemi.GetCount(); i++) {
-		int im = itemi[i];
-		Rect r = GetCtrlRect(im);
-		SetAutoItemPos(im, r);
-		RefreshSelect(i);
-	}
-}
-
-void LayoutDesigner::NormalPos() {
-	for(int i = 0; i < itemi.GetCount(); i++) {
-		int im = itemi[i];
-		Rect r = GetCtrlRect(im);
-		ctrl[im].TopPos(0, 0).LeftPos(0, 0);
-		SetItemPos(im, r);
-		RefreshSelect(i);
-	}
-}
-*/
-
-void LayoutDesigner::VertCenter() {
-	for(int i = 0; i < itemi.GetCount(); i++) {
-		int im = itemi[i];
-		RefreshSelect(i);
-		Rect r = GetCtrlRect(im);
-		ctrl[im].VCenterPos(0, 0);
-		int h = r.Height();
-		r.top = (form.GetSize().cy - h) / 2;
-		r.bottom = r.top + h;
-		SetItemPos(im, r);
-		RefreshSelect(i);
-	}
-}
-
-void LayoutDesigner::HorzCenter() {
-	for(int i = 0; i < itemi.GetCount(); i++) {
-		int im = itemi[i];
-		RefreshSelect(i);
-		Rect r = GetCtrlRect(im);
-		ctrl[im].HCenterPos(0, 0);
-		int w = r.Width();
-		r.left = (form.GetSize().cx - w) / 2;
-		r.right = r.left + w;
-		SetItemPos(im, r);
-		RefreshSelect(i);
-	}
-}
-
-void LayoutDesigner::AlignLeft() {
-	if(!itemi.GetCount()) return;
-	int ax = GetCtrlRect(itemi.Top()).left;
-	for(int i = 0; i < itemi.GetCount() - 1; i++) {
-		int im = itemi[i];
-		RefreshSelect(i);
-		Rect r = GetCtrlRect(im);
-		r.Offset(ax - r.left, 0);
-		SetItemPos(im, r);
-		RefreshSelect(i);
-	}
-}
-
-void LayoutDesigner::AlignRight() {
-	if(!itemi.GetCount()) return;
-	int ax = GetCtrlRect(itemi.Top()).right;
-	for(int i = 0; i < itemi.GetCount() - 1; i++) {
-		int im = itemi[i];
-		RefreshSelect(i);
-		Rect r = GetCtrlRect(im);
-		r.Offset(ax - r.right, 0);
-		SetItemPos(im, r);
-		RefreshSelect(i);
-	}
-}
-
-void LayoutDesigner::AlignTop() {
-	if(!itemi.GetCount()) return;
-	int ay = GetCtrlRect(itemi.Top()).top;
-	for(int i = 0; i < itemi.GetCount() - 1; i++) {
-		int im = itemi[i];
-		RefreshSelect(i);
-		Rect r = GetCtrlRect(im);
-		r.Offset(0, ay - r.top);
-		SetItemPos(im, r);
-		RefreshSelect(i);
-	}
-}
-
-void LayoutDesigner::AlignBottom() {
-	if(!itemi.GetCount()) return;
-	int ay = GetCtrlRect(itemi.Top()).bottom;
-	for(int i = 0; i < itemi.GetCount() - 1; i++) {
-		int im = itemi[i];
-		RefreshSelect(i);
-		Rect r = GetCtrlRect(im);
-		r.Offset(0, ay - r.bottom);
-		SetItemPos(im, r);
-		RefreshSelect(i);
-	}
-}
-
-void LayoutDesigner::AlignVCenter() {
-	if(!itemi.GetCount()) return;
-	Rect dr = GetCtrlRect(itemi.Top());
-	for(int i = 0; i < itemi.GetCount() - 1; i++) {
-		int im = itemi[i];
-		RefreshSelect(i);
-		Rect r = GetCtrlRect(im);
-		r.Offset(0, dr.top + (dr.Height() - r.Height()) / 2 - r.top);
-		SetItemPos(im, r);
-		RefreshSelect(i);
-	}
-}
-
-void LayoutDesigner::AlignHCenter() {
-	if(!itemi.GetCount()) return;
-	Rect dr = GetCtrlRect(itemi.Top());
-	for(int i = 0; i < itemi.GetCount() - 1; i++) {
-		int im = itemi[i];
-		RefreshSelect(i);
-		Rect r = GetCtrlRect(im);
-		r.Offset(dr.left + (dr.Width() - r.Width()) / 2 - r.left, 0);
-		SetItemPos(im, r);
-		RefreshSelect(i);
-	}
-}
-
-void LayoutDesigner::AlignLbl() {
-	if(!itemi.GetCount()) return;
-	for(int i = 0; i < itemi.GetCount(); i++) {
-		int im = itemi[i];
-		if(Item(im).classname == "Label") {
-			Ctrl *ref = NULL;
-			if(im + 1 >= ItemCount() || Item(im + 1).classname == "Label") {
-				if(im > 0 && Item(im - 1).classname != "Label")
-					ref = &ctrl[im - 1];
-			}
-			else
-				ref = &ctrl[im + 1];
-			if(ref) {
-				Rect dr = ref->GetRect();
-				RefreshSelect(i);
-				Rect r = GetCtrlRect(im);
-				r.Offset(0, dr.top + (dr.Height() - r.Height()) / 2 - r.top);
-				SetItemPos(im, r);
-				RefreshSelect(i);
-			}
-		}
-	}
-}
-
-void LayoutDesigner::SameWidth() {
-	if(!itemi.GetCount()) return;
-	int ax = GetCtrlRect(itemi.Top()).Width();
-	for(int i = 0; i < itemi.GetCount() - 1; i++) {
-		int im = itemi[i];
-		RefreshSelect(i);
-		Rect r = GetCtrlRect(im);
-		r.right = r.left + ax;
-		SetItemPos(im, r);
-		RefreshSelect(i);
-	}
-}
-
-void LayoutDesigner::SameHeight() {
-	if(!itemi.GetCount()) return;
-	int ay = GetCtrlRect(itemi.Top()).Height();
-	for(int i = 0; i < itemi.GetCount() - 1; i++) {
-		int im = itemi[i];
-		RefreshSelect(i);
-		Rect r = GetCtrlRect(im);
-		r.bottom = r.top + ay;
-		SetItemPos(im, r);
-		RefreshSelect(i);
-	}
-}
-
-void LayoutDesigner::SameSize() {
-	if(!itemi.GetCount()) return;
-	Rect m = GetCtrlRect(itemi.Top());
-	for(int i = 0; i < itemi.GetCount() - 1; i++) {
-		int im = itemi[i];
-		RefreshSelect(i);
-		Rect r = GetCtrlRect(im);
-		r.right = r.left + m.Width();
-		r.bottom = r.top + m.Height();
-		SetItemPos(im, r);
-		RefreshSelect(i);
-	}
-}
-
-void LayoutDesigner::MinHeight() {
-	for(int i = 0; i < itemi.GetCount(); i++) {
-		int im = itemi[i];
-		RefreshSelect(i);
-		Rect r = GetCtrlRect(im);
-		Size sz = ctrl[im].GetMinSize();
-		r.bottom = r.top + sz.cy;
-		SetItemPos(im, r);
-		RefreshSelect(i);
-	}
-}
-
-void LayoutDesigner::MinWidth() {
-	for(int i = 0; i < itemi.GetCount(); i++) {
-		int im = itemi[i];
-		RefreshSelect(i);
-		Rect r = GetCtrlRect(im);
-		Size sz = ctrl[im].GetMinSize();
-		r.right = r.left + sz.cx;
-		SetItemPos(im, r);
-		RefreshSelect(i);
-	}
-}
-
-void LayoutDesigner::Cut() {
-	Copy();
-	Delete();
-}
-
-void LayoutDesigner::Copy() {
-	String out;
-	for(int i = 0; i < itemi.GetCount(); i++)
-		out << SaveCtrl(Item(itemi[i]), i, "", false);
-//	EmptyClipboard();
-//	WriteClipboard(CF_TEXT, out);
-	WriteClipboardText(out, true);
-}
-
-void LayoutDesigner::SelectToEnd(int i) {
-	ClearSelection();
-	while(i < ctrl.GetCount())
-		SelectItem(i++);
-}
-
-void LayoutDesigner::Paste() {
-	int i = ctrl.GetCount();
-	try {
-		String s = ReadClipboardText();
-		CParser p(s);
-		for(;;)
-			LoadCtrl(p, ActualForm().item.Add(), langi);
-	}
-	catch(CParser::Error&) {
-		ActualForm().item.Drop();
-	}
-	SynchronizeCtrls();
-	SelectToEnd(i);
-}
-
-void LayoutDesigner::SelectAll() {
-	SelectToEnd(0);
-}
-
-int FindIndex(const Vector<int>& c, int ii) {
-	for(int i = 0; i < c.GetCount(); i++)
-		if(c[i] == ii) return i;
-	return -1;
-}
-
-void LayoutDesigner::Delete() {
-	for(int ii = ctrl.GetCount(); ii >= 0; ii--)
-		if(FindIndex(itemi, ii) >= 0) {
-			UnselectItem(ii);
-			ctrl.Remove(ii);
-			ActualForm().item.Remove(ii);
-			itab.Remove(ii);
-		}
-	Refresh();
-}
-
-void LayoutDesigner::DoDuplicate(const Vector<int>& imi, int dx, int dy) {
-	if(layouti < 0) return;
-	for(int i = 0; i < imi.GetCount(); i++) {
-		int im = imi[i];
-		const ItemInfo& ii = Item(im);
-		const Ctrl& q = ctrl[im];
-		AddCtrl(ii.classname, String(), Lng(ii.label), Lng(ii.help));
-		SetItemPos(ctrl.GetCount() - 1, q.GetRect() + Point(dx, dy));
-	}
-}
-
-void LayoutDesigner::Duplicate() {
-	int si = ctrl.GetCount();
-	Vector<int> imi(itemi, 1);
-	ClearSelection();
-	DoDuplicate(imi, 16, 16);
-	SelectToEnd(si);
-}
-
-void LayoutDesigner::Matrix() {
-	if(!itemi.GetCount()) return;
-	if(matrix.Execute() != IDOK) return;
-	int si = ctrl.GetCount();
-	Vector<int> imi(itemi, 1);
-	Rect br = GetActualRect();
-	ClearSelection();
-	for(int i = 0; i < imi.GetCount() - 1; i++)
-		br |= GetCtrlRect(imi[i]);
-	for(int x = 0; x < (int)~matrix.x; x++)
-		for(int y = 0; y < (int)~matrix.y; y++)
-			if(x > 0 || y > 0)
-				DoDuplicate(imi, x * (br.Width() + (int)~matrix.hspace),
-								 y * (br.Height() + (int)~matrix.vspace));
-	SelectToEnd(si);
-}
-
-void LayoutDesigner::ToggleGrid() {
-	usegrid = !usegrid;
-	SetBar();
-}
-
-void LayoutDesigner::SetupAlias() {
-	if(alias_map.Edit() && !alias_map.Save(alias_map_file))
-		Exclamation(NFormat("Error saving alias file [* \1%s\1].", alias_map_file));
-	UpdateClassList();
-}
+#include "Designer.h"
+#pragma hdrstop
+
+#define  IMAGEFILE <rw/rw.iml>
+#include <Draw/iml_source.h>
+
+#define LLOG(x) // LOG(x)
+
+int LayoutDesigner::GetTrack(int a, int b, int type) {
+	return type == LEFT   ? a - TRACKERSIZE :
+	       type == CENTER ? (a + b - TRACKERSIZE) / 2 :
+	                        b;
+}
+
+Image LayoutDesigner::GetTrackShape(Point track) {
+	const Image& (*id[3][3])() = {
+		{ CtrlImg::SizeHoVe0, CtrlImg::SizeVert0, CtrlImg::SizeVeHo0 },
+		{ CtrlImg::SizeHorz0, Image::SizeAll,     CtrlImg::SizeHorz0 },
+		{ CtrlImg::SizeVeHo0, CtrlImg::SizeVert0, CtrlImg::SizeHoVe0 }
+	};
+	if(track.x == FORM)
+		return CtrlImg::SizeHoVe0();
+	if(track.x >= 0 && track.x <= 4 && track.y >= 0 && track.y <= 4)
+		return (*id[track.y][track.x])();
+	return Image::Arrow();
+}
+
+Rect LayoutDesigner::GetTracker(Point track) {
+	if(track.x == FORM) {
+		Rect r = form.GetRect() + sb;
+		return RectC(r.right, r.bottom, TRACKERSIZE, TRACKERSIZE);
+	}
+	Rect actual = GetActual();
+	return RectC(GetTrack(actual.left, actual.right, track.x),
+		         GetTrack(actual.top, actual.bottom, track.y),
+				 TRACKERSIZE, TRACKERSIZE);
+}
+
+Rect LayoutDesigner::GetSpringRect(int i) {
+	Rect r = form.GetRect() + sb;
+	r.Inflate(10, 10);
+	Rect actual = GetActual();
+	if(i == SLEFT || i == SRIGHT) {
+		r.top = actual.top + actual.Height() / 4 - TRACKERSIZE;
+		r.bottom = r.top + 2 * TRACKERSIZE;
+		if(i == SLEFT)
+			r.right = actual.left;
+		else {
+			int h2 = actual.Height() / 2;
+			r.top += h2;
+			r.bottom += h2;
+			r.left = actual.right;
+		}
+	}
+	if(i == STOP || i == SBOTTOM) {
+		r.left = actual.left + actual.Width() / 4 - TRACKERSIZE;
+		r.right = r.left + 2 * TRACKERSIZE;
+		if(i == STOP)
+			r.bottom = actual.top;
+		else {
+			int w2 = actual.Width() / 2;
+			r.left += w2;
+			r.right += w2;
+			r.top = actual.bottom;
+		}
+	}
+	return r;
+}
+
+Rect LayoutDesigner::GetCtrlRect(int i) {
+	return ctrl[i].GetRect();
+}
+
+Rect LayoutDesigner::GetActualRect() {
+	return itemi.IsEmpty() ? Rect(-INT_MAX, -INT_MAX, -INT_MAX, -INT_MAX)
+		                   : GetCtrlRect(itemi.Top());
+}
+
+Rect LayoutDesigner::GetActual() {
+	return GetActualRect() + Point(10, 10);
+}
+
+bool LayoutDesigner::GetSpring(int im, int i) {
+	LogPos p = ctrl[im].GetPos();
+	switch(i) {
+	case SLEFT:
+		return p.x.GetAlign() == Ctrl::LEFT || p.x.GetAlign() == Ctrl::SIZE;
+	case SRIGHT:
+		return p.x.GetAlign() == Ctrl::RIGHT || p.x.GetAlign() == Ctrl::SIZE;
+	case STOP:
+		return p.y.GetAlign() == Ctrl::TOP || p.y.GetAlign() == Ctrl::SIZE;
+	case SBOTTOM:
+		return p.y.GetAlign() == Ctrl::BOTTOM || p.y.GetAlign() == Ctrl::SIZE;
+	};
+	return false;
+}
+
+bool LayoutDesigner::GetSpring(int i) {
+	if(itemi.IsEmpty()) return false;
+	return GetSpring(itemi.Top(), i);
+}
+
+void LayoutDesigner::Paint(Draw& w) {
+	Size sz = GetSize();
+	w.DrawRect(0, 0, sz.cx, sz.cy, layouti < 0 ? SLtGray : SWhite);
+	if(layouti >= 0) {
+		Rect r = form.GetRect();
+		DrawFatFrame(w, r, SBlack, -1);
+		w.DrawRect(r.right, r.bottom, TRACKERSIZE, TRACKERSIZE, SLtBlue);
+	}
+}
+
+bool LayoutDesigner::IsMoving() {
+	return HasCapture() && track.x == CENTER && track.y == CENTER && cltm;
+}
+
+void LayoutDesigner::DrawHorzSpring(Draw& w, int i) {
+	Rect r = GetSpringRect(i) - sb;
+	bool spring = GetSpring(i);
+	int wd = r.Width();
+	int y = (r.top + r.bottom) / 2;
+	Point p1 = Point(r.left, y);
+	if(!spring)
+		for(int i = 1; i < 10; i++) {
+			Point p2 = Point(r.left + i * wd / 10, y + (1 - 2 * (i & 1)) * (TRACKERSIZE - 1));
+			w.DrawLine(p1, p2, 1, SGray);
+			p1 = p2;
+		}
+	w.DrawLine(p1, Point(r.right - spring, y), 1 + spring, spring ? SRed : SGray);
+}
+
+void LayoutDesigner::DrawVertSpring(Draw& w, int i) {
+	Rect r = GetSpringRect(i) - sb;
+	bool spring = GetSpring(i);
+	int hg = r.Height();
+	int x = (r.left + r.right) / 2;
+	Point p1 = Point(x, r.top);
+	if(!spring)
+		for(int i = 1; i < 10; i++) {
+			Point p2 = Point(x + (1 - 2 * (i & 1)) * (TRACKERSIZE - 1), r.top + i * hg / 10);
+			w.DrawLine(p1, p2, 1, SGray);
+			p1 = p2;
+		}
+	w.DrawLine(p1, Point(x, r.bottom - spring), 1 + spring, spring ? SRed : SGray);
+}
+
+void LayoutDesigner::PaintTrack(Draw& w) {
+	if(track.x == SELECTRECT) {
+		Rect m = selectrect;
+		m.Normalize();
+		if(!m.IsEmpty())
+			DrawFrame(w, m, SLtRed, SLtRed);
+	}
+	else
+	if(!itemi.IsEmpty() && !IsMoving()) {
+		SetBar();
+		Point p = sb;
+		for(int i = 0; i < itemi.GetCount() - 1; i++) {
+			Rect r = ctrl[itemi[i]].GetRect() + (Point(10, 10) - p);
+			DrawFatFrame(w, r.left, r.top, r.Width(), r.Height(), SBrown, -3);
+		}
+		Rect actual = GetActual() - p;
+		DrawFatFrame(w, actual.left, actual.top, actual.Width(), actual.Height(), SCyan, -3);
+		DrawHorzSpring(w, SLEFT);
+		DrawHorzSpring(w, SRIGHT);
+		DrawVertSpring(w, STOP);
+		DrawVertSpring(w, SBOTTOM);
+		for(int h = LEFT; h <= RIGHT; h++)
+			for(int v = TOP; v <= BOTTOM; v++)
+				if(h != CENTER || v != CENTER)
+					w.DrawRect(GetTracker(Point(h, v)) - p, SLtBlue);
+	}
+}
+
+void LayoutDesigner::PaintForm(Draw& w) {
+	Size sz = form.GetRect().Size();
+	w.DrawRect(0, 0, sz.cx, sz.cy, SLtGray);
+	for(Ctrl *q = form.GetFirstChild(); q; q = q->GetNext())
+		if(q->IsTransparent())
+			DrawFrame(w, q->GetRect(), SWhiteGray, SWhiteGray);
+}
+
+Point LayoutDesigner::FindTracker(Point p) {
+	Point track;
+	for(track.x = LEFT; track.x <= FORM; track.x++)
+		for(track.y = TOP; track.y <= BOTTOM; track.y++)
+			if((track.x != CENTER || track.y != CENTER) && GetTracker(track).Contains(p))
+				return track;
+	return Point(-1, -1);
+}
+
+int   LayoutDesigner::FindItem(Point p) {
+	int i;
+	int mini = -1;
+	int min = INT_MAX;
+	p += Point(-10, -10);
+	for(i = 0; i < ctrl.GetCount(); i++) {
+		Rect r = ctrl[i].GetRect();
+		if(r.Contains(p)) {
+			int m = r.Width() * r.Height();
+			if(m < min) {
+				mini = i;
+				min = m;
+			}
+		}
+	}
+	return mini;
+}
+
+void LayoutDesigner::SetItemPos(int i, const Rect& r, int chi, bool val, bool sync) {
+	bool l = chi == SLEFT   ? val : GetSpring(i, SLEFT);
+	bool p = chi == SRIGHT  ? val : GetSpring(i, SRIGHT);
+	bool t = chi == STOP    ? val : GetSpring(i, STOP);
+	bool b = chi == SBOTTOM ? val : GetSpring(i, SBOTTOM);
+	Ctrl& q = ctrl[i];
+	Size sz = form.GetSize();
+	if(l)
+		if(p) q.HSizePos(r.left, sz.cx - r.right);
+		else  q.LeftPos(r.left, r.Width());
+	else
+		if(p) q.RightPos(sz.cx - r.right, r.Width());
+		else  q.HCenterPos(r.Width(), (r.left + r.right - sz.cx) / 2);
+	if(t)
+		if(b) q.VSizePos(r.top, sz.cy - r.bottom);
+		else  q.TopPos(r.top, r.Height());
+	else
+		if(b) q.BottomPos(sz.cy - r.bottom, r.Height());
+		else  q.VCenterPos(r.Height(), (r.top + r.bottom - sz.cy) / 2);
+	Item(i).pos = q.GetPos();
+	if(sync) {
+		{ TIMING("SetItemPos::Status");
+		ShowStatus();
+		}
+		{ TIMING("SetItemPos::Layout");
+		Layout();
+		}
+		{ TIMING("SetItemPos::Sync");
+		Sync();
+		}
+	}
+}
+
+void LayoutDesigner::SetActualPos(const Rect& r, int chi, bool val) {
+	if(itemi.GetCount())
+		SetItemPos(itemi.Top(), r, chi, val);
+}
+
+/*
+void LayoutDesigner::SetAutoItemPos(int i, const Rect& r) {
+	Ctrl& q = ctrl[i];
+	Size sz = form.GetSize();
+	if(r.left < sz.cx / 2)
+		if(r.right < sz.cx / 2)
+			q.LeftPos(r.left, r.Width());
+		else
+			q.HSizePos(r.left, sz.cx - r.right);
+	else
+		q.RightPos(sz.cx - r.right, r.Width());
+	if(r.top < sz.cy / 2)
+		if(r.bottom < sz.cy / 2)
+			q.TopPos(r.top, r.Height());
+		else
+			q.VSizePos(r.top, sz.cy - r.bottom);
+	else
+		q.BottomPos(sz.cy - r.bottom, r.Height());
+	Item(i).pos = q.GetPos();
+	ShowStatus();
+	Layout();
+	Sync();
+}
+*/
+
+Image LayoutDesigner::CursorImage(Point p, dword keyflags) {
+	p += sb;
+	if(IsMoving())
+		return CrossCursor();
+	if(HasCapture())
+		return track.x == SELECTRECT ? Image::Arrow() : GetTrackShape(track);
+	if(GetActual().Contains(p))
+		return Image::SizeAll();
+	Point track = FindTracker(p);
+	if(track.x >= 0)
+		return GetTrackShape(track);
+	return Image::Arrow();
+}
+
+void LayoutDesigner::RefreshActual() {
+	if(itemi.GetCount()) {
+		Rect r = GetActual();
+		r.Inflate(TRACKERSIZE, TRACKERSIZE);
+		Refresh(r - sb);
+		for(int i = SLEFT; i <= SBOTTOM; i++)
+			Refresh(GetSpringRect(i) - sb);
+	}
+}
+
+void LayoutDesigner::RefreshSelect(int i) {
+	if(i == itemi.GetCount() - 1)
+		RefreshActual();
+	else {
+		Rect r = ctrl[itemi[i]].GetRect() + Point(10, 10);
+		r.Inflate(TRACKERSIZE, TRACKERSIZE);
+		Refresh(r - sb);
+	}
+}
+
+int  LayoutDesigner::FindSelect(int im) {
+	for(int i = 0; i < itemi.GetCount(); i++)
+		if(itemi[i] == im) return i;
+	return -1;
+}
+
+void LayoutDesigner::UnselectItem(int im) {
+	int i = FindSelect(im);
+	if(i < 0) return;
+	RefreshSelect(i);
+	itemi.Remove(i);
+	RefreshActual();
+	if(itemi.GetCount() == 0)
+		ClearSelection();
+	else
+		SelectItem(itemi.Top());
+}
+
+void LayoutDesigner::ClearSelection0() {
+	for(int i = 0; i < itemi.GetCount(); i++) {
+		RefreshSelect(i);
+		itab.SetDisplay(itemi[i], 0, StdDisplay());
+		itab.SetDisplay(itemi[i], 1, VarLblDisplay(false));
+	}
+	itemi.Clear();
+	classname.Disable();
+	classname.Clear();
+	variable.Disable();
+	variable.Clear();
+	label.Disable();
+	label.Set("");
+	help.Disable();
+	help.Set("");
+	ShowStatus();
+	SetBar();
+}
+
+void LayoutDesigner::ShowHideLayouts()
+{
+	if(layouti < 0)
+		return;
+	Vector<int> layouts;
+	String dummy;
+	int i;
+	for(i = 0; i < ItemCount(); i++)
+		if(ParseLayoutRef(Item(i).classname, dummy) >= 0)
+			layouts.Add(i);
+	for(i = 0; i < layouts.GetCount(); i++)
+	{
+		int li = layouts[i];
+		Rect rc = ctrl[li].GetRect();
+		bool show = (FindIndex(itemi, li) >= 0);
+		if(!show)
+		{
+			show = true;
+			for(int p = 0; p < layouts.GetCount(); p++)
+				if(p != i && (ctrl[layouts[p]].GetRect() && rc) && (p < i || FindIndex(itemi, layouts[p]) >= 0))
+				{
+					show = false;
+					break;
+				}
+		}
+		ctrl[li].Show(show);
+	}
+	SynchronizeMnemonic();
+}
+
+void LayoutDesigner::ClearSelection() {
+	ClearSelection0();
+	itab.SetCursor(-1);
+}
+
+void LayoutDesigner::SelectItem(int im) {
+	if(im < 0) return;
+	RefreshActual();
+	UnselectItem(im);
+	itemi.Add(im);
+	RefreshActual();
+	itab.SetCursor(im);
+	itab.SetDisplay(im, 0, SelDisplay);
+	itab.SetDisplay(im, 1, VarLblDisplay(true));
+	classname.Enable();
+	variable.Enable();
+	label.Enable();
+	help.Enable();
+	ItemInfo& ii = Item(im);
+	classname <<= ii.classname;
+	variable <<= ii.variable;
+	label <<= Lng(ii.label);
+	help <<= Lng(ii.help);
+	ShowHideLayouts();
+	ShowStatus();
+	SetBar();
+}
+
+void LayoutDesigner::SelectOneItem(int im) {
+	ClearSelection0();
+	if(im < ctrl.GetCount())
+		SelectItem(im);
+}
+
+int FilterName(int c) {
+	return IsAlNum(c) ? ToLower(c) : 0;
+}
+
+void LayoutDesigner::WhenITab() {
+	if(itab.GetCursor() >= 0)
+		if(::GetCtrl() || ::GetShift())
+			SelectItem(itab.GetCursor());
+		else
+			SelectOneItem(itab.GetCursor());
+	SetFocus();
+}
+
+void LayoutDesigner::SetFormSize(Size sz) {
+	Point p = sb;
+	form.SetRect(-p.x + 10, -p.y + 10, sz.cx, sz.cy);
+	ActualForm().size = sz;
+	Refresh();
+	Layout();
+	Sync();
+}
+
+void LayoutDesigner::NewCtrl(int i) {
+	String clss = i < 0 ? String() : ClassMap().GetKey(i);
+	AddCtrl(clss, String(), String(), String());
+	Size sz = ctrl[itemi.Top()].GetMinSize();
+	SetActualPos(RectC(newctrl.x, newctrl.y, sz.cx * 8, sz.cy));
+}
+
+void LayoutDesigner::ClassMenu(Bar& menu) {
+	menu.Add("User class", classset[-1]);
+	menu.Separator();
+	for(int i = 0; i < ClassMap().GetCount(); i++) {
+		Bar::Item& m = menu.Add(ClassMap().GetKey(i), classset[i]);
+		if((i + 2) % 16 == 0) menu.Break();
+	}
+}
+
+void LayoutDesigner::RightDown(Point p, dword keyflags) {
+	if(layouti < 0) return;
+	newctrl = p;
+	MenuBar bar;
+	bar.SetFont(Arial(10)).LeftGap(2);
+	ClassMenu(bar);
+	bar.Execute();
+}
+
+void LayoutDesigner::RefreshSelectRect() {
+	Rect m = selectrect;
+	m.Normalize();
+	Refresh(m.left, m.top, 1, m.Height());
+	Refresh(m.left, m.top, m.Width(), 1);
+	Refresh(m.left, m.bottom - 1, m.Width(), 1);
+	Refresh(m.right - 1, m.top, 1, m.Height());
+}
+
+void LayoutDesigner::StartMoving(Point p) {
+	Rect actual = GetActualRect();
+	delta = p - actual.TopLeft();
+	melta.SetCount(itemi.GetCount() - 1);
+	for(int i = 0; i < itemi.GetCount() - 1; i++)
+		melta[i] = GetCtrlRect(itemi[i]).TopLeft() - actual.TopLeft();
+	track.x = track.y = CENTER;
+	SetCapture();
+}
+
+void LayoutDesigner::DoMoving() {
+	cltm = true;
+	for(int i = 0; i < itemi.GetCount(); i++)
+		RefreshSelect(i);
+}
+
+void LayoutDesigner::LeftDown(Point p, dword keyflags) {
+	LOG("@@ LeftDown");
+	if(layouti < 0) return;
+	int i;
+	moved = cltm = false;
+	p += sb;
+	SetFocus();
+	Rect actual = GetActual();
+	if(actual.Contains(p)) {
+		if((keyflags & K_SHIFT) && itemi.GetCount()) {
+			UnselectItem(itemi.Top());
+			return;
+		}
+		StartMoving(p);
+		DoMoving();
+		return;
+	}
+	track = FindTracker(p);
+	if(track.x >= 0) {
+		Rect fr = form.GetRect();
+		delta = Point(p.x - (track.x == FORM ? fr.right :
+		                     track.x == LEFT ? actual.left : actual.right),
+				      p.y - (track.x == FORM ? fr.bottom :
+							 track.y == TOP ? actual.top : actual.bottom));
+		SetCapture();
+		return;
+	}
+	i = FindItem(p);
+	if(i >= 0) {
+		if(keyflags & K_SHIFT)
+			if(ItemSelected(i))
+				UnselectItem(i);
+			else
+				SelectItem(i);
+		else
+			if(!ItemSelected(i))
+				SelectOneItem(i);
+		StartMoving(p);
+		DoMoving();
+		return;
+	}
+	for(i = SLEFT; i <= SBOTTOM; i++)
+		if(GetSpringRect(i).Contains(p)) {
+			RefreshActual();
+			SetActualPos(GetActualRect(), i, !GetSpring(i));
+			return;
+		}
+	if(!(keyflags & (K_SHIFT|K_CTRL)))
+		ClearSelection();
+	track.x = SELECTRECT;
+	selectrect.Set(p.x, p.y, p.x, p.y);
+	RefreshSelectRect();
+	SetCapture();
+}
+
+void LayoutDesigner::LeftRepeat(Point p, dword keyflags) {
+	if(!cltm) DoMoving();
+}
+
+void LayoutDesigner::MouseMove(Point p, dword keyflags) {
+	p += sb;
+	if(track.x == SELECTRECT && HasCapture()) {
+		RefreshSelectRect();
+		selectrect.right = p.x;
+		selectrect.bottom = p.y;
+		RefreshSelectRect();
+		return;
+	}
+	int gx = GridX();
+	int gy = GridY();
+	if(IsMoving() && itemi.GetCount()) {
+		LLOG("LayoutDesigner::MouseMove -> " << p);
+		bool m = false;
+		Size sz = GetActualRect().Size();
+		if(!moved) {
+			RefreshSelect(itemi.GetCount() - 1);
+			m = true;
+		}
+		Rect cr = RectC((p.x - delta.x) / gx * gx, (p.y - delta.y) / gy * gy, sz.cx, sz.cy);
+		for(int i = 0; i < itemi.GetCount() - 1; i++) {
+			int im = itemi[i];
+			if(!moved) {
+				RefreshSelect(i);
+				m = true;
+			}
+			Size sz = GetCtrlRect(im).Size();
+			SetItemPos(im, RectC(cr.left + melta[i].x, cr.top + melta[i].y, sz.cx, sz.cy), -1, false, false);
+		}
+		SetItemPos(itemi.Top(), cr, -1, false, true);
+		if(m) moved = true;
+		return;
+	}
+	p -= delta;
+	if(HasCapture()) {
+		if(track.x == FORM) {
+			Size sz = Size(max(0, p.x - 10), max(0, p.y - 10));
+			sz.cx = sz.cx / gx * gx;
+			sz.cy = sz.cy / gy * gy;
+			SetFormSize(sz);
+			ShowStatus();
+			return;
+		}
+		if(itemi.GetCount()) {
+			Rect actual = GetActualRect();
+			RefreshActual();
+			p.Offset(-10, -10);
+			if(track.x == LEFT) actual.left = min(actual.right, p.x) / gx * gx;
+			if(track.x == RIGHT) actual.right = max(actual.left, p.x) / gy * gy;
+			if(track.y == TOP) actual.top = min(actual.bottom, p.y) / gx * gx;
+			if(track.y == BOTTOM) actual.bottom = max(actual.top, p.y) / gy * gy;
+			if(!ignoremin) {
+				Size sz = ctrl[itemi.Top()].GetMinSize();
+				actual.right = max(actual.left + sz.cx, actual.right);
+				actual.bottom = max(actual.top + sz.cy, actual.bottom);
+			}
+			SetActualPos(actual);
+			RefreshActual();
+			moved = true;
+		}
+	}
+}
+
+void LayoutDesigner::LeftUp(Point p, dword keyflags) {
+	LOG("@@@ LeftUp");
+	for(int i = 0; i < itemi.GetCount(); i++)
+		RefreshSelect(i);
+	if(track.x == SELECTRECT) {
+		if(!(keyflags & (K_SHIFT|K_CTRL)))
+			ClearSelection();
+		Rect m = selectrect;
+		m.Normalize();
+		m.Offset(-10, -10);
+		m += sb;
+		for(int i = 0; i < ctrl.GetCount(); i++) {
+			Rect r = ctrl[i].GetRect();
+			if(r.left >= m.left && r.right <= m.right && r.top >= m.top && r.bottom <= m.bottom)
+				SelectItem(i);
+		}
+		track.x = -1;
+		RefreshSelectRect();
+		return;
+	}
+	if(!(keyflags & K_SHIFT) && !(keyflags & K_CTRL) && !moved) {
+		int i = FindItem(p + sb);
+		if(i >= 0)
+			SelectOneItem(i);
+	}
+}
+
+void LayoutDesigner::Scroll() {
+	SetFormSize(form.GetSize());
+}
+
+void LayoutDesigner::NewClass() {
+	if(itemi.IsEmpty()) return;
+	for(int i = 0; i < itemi.GetCount(); i++) {
+		int im = itemi[i];
+		Item(im).classname = classname;
+		SetClass(im);
+		RefreshActual();
+	}
+}
+
+void LayoutDesigner::NewVariable() {
+	if(itemi.IsEmpty()) return;
+	itab.Set(itemi.Top(), 1, Item(itemi.Top()).variable = variable);
+}
+
+static int FilterOutCr(int c) {
+	return c == '\r' ? 0 : c;
+}
+
+void LayoutDesigner::NewLabel() {
+	if(itemi.IsEmpty()) return;
+	ItemLabel(itemi.Top()) = Filter(label.Get(), FilterOutCr);
+	SynchronizeCtrl();
+	SynchronizeMnemonic();
+}
+
+void LayoutDesigner::NewHelp() {
+	if(itemi.IsEmpty()) return;
+	Help(itemi.Top()) = Filter(help.Get(), FilterOutCr);
+	SynchronizeCtrl();
+}
+
+void LayoutDesigner::Layout() {
+	sb.SetPage(GetSize());
+	Size sz = form.GetSize() + Size(20, 20);
+	for(int i = 0; i < ctrl.GetCount(); i++) {
+		sz.cx = max(ctrl[i].GetRect().right + TRACKERSIZE + 20, sz.cx);
+		sz.cy = max(ctrl[i].GetRect().bottom + TRACKERSIZE + 20, sz.cy);
+	}
+	sb.SetTotal(sz);
+	int cx = frame.GetSize().cx;
+//	menubar.LeftPos(0, cx / 2);
+	status.Width(cx >> 1);
+}
+
+void LayoutDesigner::ShowStatus() {
+	String s;
+	if(layouti >= 0) {
+		Size sz = form.GetRect().Size();
+		s = "Layout size: " + ::AsString(sz);
+		if(itemi.GetCount()) {
+			Rect r = ctrl[itemi.Top()].GetRect();
+			s << "  Item: " << ::AsString(r) <<
+				 " - {" << sz.cx - r.right << ", " << sz.cy - r.bottom << '}';
+		}
+	}
+	status.SetLabelText(s);
+}
+
+static int RoundStep(int org, int d, int g)
+{
+	return d ? itimesfloor(org + d * g + (d > 0 ? 0 : g - 1), g) - org : 0;
+}
+
+void LayoutDesigner::KeyMove(int dx, int dy, int sx, int sy) {
+	if(itemi.IsEmpty())
+		return;
+	Rect main = GetCtrlRect(itemi.Top()), shift;
+	int gx = GridX(), gy = GridY();
+	shift.left = shift.right = RoundStep(main.left, dx, gx);
+	shift.top = shift.bottom = RoundStep(main.top, dy, gy);
+	shift.right += RoundStep(main.Width(), sx, gx);
+	shift.bottom += RoundStep(main.Height(), sy, gy);
+	for(int i = itemi.GetCount(); --i >= 0;) {
+		RefreshSelect(i);
+		SetItemPos(itemi[i], GetCtrlRect(itemi[i]) + shift, -1, false, i == 0);
+		RefreshSelect(i);
+	}
+}
+
+bool LayoutDesigner::Key(dword key, int count) {
+	switch(key) {
+	case K_RIGHT:
+	case K_DOWN:
+		if(itemi.IsEmpty())
+			SelectOneItem(ctrl.GetCount() - 1);
+		else
+		if(itemi.Top() < ctrl.GetCount() - 1)
+			SelectOneItem(itemi.Top() + 1);
+		return true;
+	case K_LEFT:
+	case K_UP:
+		if(itemi.IsEmpty())
+			SelectOneItem(0);
+		else
+		if(itemi.Top() > 0)
+			SelectOneItem(itemi.Top() - 1);
+		return true;
+	case K_PAGEUP:
+		if(layouti > 0 && layout.GetCount() - 1)
+			SetLayout(layouti - 1);
+		break;
+	case K_PAGEDOWN:
+		if(layouti < layout.GetCount() - 1)
+			SetLayout(layouti + 1);
+		break;
+	case K_HOME:
+		SelectOneItem(0);
+		break;
+	case K_END:
+		SelectOneItem(ctrl.GetCount() - 1);
+		break;
+	case K_SHIFT_LEFT:
+		KeyMove(-1, 0, 0, 0);
+		break;
+	case K_SHIFT_RIGHT:
+		KeyMove(1, 0, 0, 0);
+		break;
+	case K_SHIFT_UP:
+		KeyMove(0, -1, 0, 0);
+		break;
+	case K_SHIFT_DOWN:
+		KeyMove(0, 1, 0, 0);
+		break;
+	case K_SHIFT_CTRL_LEFT:
+		KeyMove(0, 0, -1, 0);
+		break;
+	case K_SHIFT_CTRL_RIGHT:
+		KeyMove(0, 0, 1, 0);
+		break;
+	case K_SHIFT_CTRL_UP:
+		KeyMove(0, 0, 0, -1);
+		break;
+	case K_SHIFT_CTRL_DOWN:
+		KeyMove(0, 0, 0, 1);
+		break;
+	default:
+		if(key >= ' ' && key < 256) {
+			label.SetFocus();
+			return label.Key(key, count);
+		}
+		return menubar.HotKey(key);
+	}
+	SetFocus();
+	return true;
+}
+
+void LayoutDesigner::AddItem() {
+	if(layouti < 0) return;
+	AddCtrl(String(), String(), String(), String());
+}
+
+void LayoutDesigner::MoveUp() {
+#ifdef _DEBUG
+	if(GetFocusCtrl())
+		GetFocusCtrl()->Dump();
+#endif
+	if(itemi.GetCount()) {
+		int sc = itab.GetCursorSc();
+		Vector<int> ilist(itemi, 0), sorted(itemi, 0);
+		Sort(sorted);
+		if(sorted[0] == 0)
+		{
+			BeepExclamation();
+			return;
+		}
+		ClearSelection();
+		int i;
+		for(i = 0; i < sorted.GetCount(); i++)
+			Swap(sorted[i], sorted[i] - 1);
+		for(i = 0; i < ilist.GetCount(); i++)
+			SelectItem(ilist[i] - 1);
+		itab.ScCursor(sc - itab.GetLineCy());
+		itab.ScrollIntoCursor();
+	}
+}
+
+void LayoutDesigner::MoveDown() {
+	if(itemi.GetCount()) {
+		int sc = itab.GetCursorSc();
+		Vector<int> ilist(itemi, 0), sorted(itemi, 0);
+		Sort(sorted);
+		if(sorted.Top() >= ctrl.GetCount() - 1)
+		{
+			BeepExclamation();
+			return;
+		}
+		ClearSelection();
+		int i;
+		for(i = sorted.GetCount(); --i >= 0;)
+			Swap(sorted[i], sorted[i] + 1);
+		for(i = 0; i < ilist.GetCount(); i++)
+			SelectItem(ilist[i] + 1);
+		itab.ScCursor(sc + itab.GetLineCy());
+		itab.ScrollIntoCursor();
+	}
+}
+
+void LayoutDesigner::ToggleIgnoreMin() {
+	ignoremin = !ignoremin;
+}
+
+void LayoutDesigner::ToggleQLIB2Output() {
+	qlib2_output = !qlib2_output;
+}
+
+void LayoutDesigner::ItemPos(int xy)
+{
+	ITEMPOS xpos = (ITEMPOS)LOWORD(xy), ypos = (ITEMPOS)HIWORD(xy);
+	Size sz = form.GetSize(), half = sz >> 1;
+
+	for(int i = 0; i < itemi.GetCount(); i++)
+	{
+		RefreshSelect(i);
+		Ctrl& q = ctrl[itemi[i]];
+		Rect r = q.GetRect();
+
+		ITEMPOS axpos = xpos;
+		if(axpos == POS_AUTO)
+			axpos = (r.left < half.cy ? r.right < half.cy ? POS_LEFT : POS_SIZE : POS_RIGHT);
+		switch(axpos)
+		{
+		case POS_LEFT:   q.LeftPos(r.left, r.Width()); break;
+		case POS_RIGHT:  q.RightPos(sz.cx - r.right, r.Width()); break;
+		case POS_CENTER: q.HCenterPos(r.Width(), (r.left + r.right - sz.cx) >> 1); break;
+		case POS_SIZE:   q.HSizePos(r.left, sz.cx - r.right); break;
+		}
+
+		ITEMPOS aypos = ypos;
+		if(aypos == POS_AUTO)
+			aypos = (r.top < half.cy ? r.bottom < half.cy ? POS_TOP : POS_SIZE : POS_BOTTOM);
+		switch(aypos)
+		{
+		case POS_TOP:    q.TopPos(r.top, r.Height()); break;
+		case POS_BOTTOM: q.BottomPos(sz.cy - r.bottom, r.Height()); break;
+		case POS_CENTER: q.VCenterPos(r.Height(), (r.top + r.bottom - sz.cy) >> 1); break;
+		case POS_SIZE:   q.VSizePos(r.top, sz.cy - r.bottom); break;
+		}
+
+		SetItemPos(itemi[i], r);
+		RefreshSelect(i);
+	}
+}
+
+int LayoutDesigner::GetItemPosMask() const
+{
+	int xbits = 0, ybits = 0;
+	for(int i = 0; i < itemi.GetCount(); i++)
+	{
+		LogPos pos = ctrl[itemi[i]].GetPos();
+		switch(pos.x.GetAlign())
+		{
+		case Ctrl::LEFT:   xbits |= 1 << POS_LEFT; break;
+		case Ctrl::RIGHT:  xbits |= 1 << POS_RIGHT; break;
+		case Ctrl::CENTER: xbits |= 1 << POS_CENTER; break;
+		case Ctrl::SIZE:   xbits |= 1 << POS_SIZE; break;
+		}
+		switch(pos.y.GetAlign())
+		{
+		case Ctrl::LEFT:   ybits |= 1 << POS_TOP; break;
+		case Ctrl::RIGHT:  ybits |= 1 << POS_BOTTOM; break;
+		case Ctrl::CENTER: ybits |= 1 << POS_CENTER; break;
+		case Ctrl::SIZE:   ybits |= 1 << POS_SIZE; break;
+		}
+	}
+	return MAKELONG(xbits, ybits);
+}
+
+/*
+void LayoutDesigner::AutoPos() {
+	for(int i = 0; i < itemi.GetCount(); i++) {
+		int im = itemi[i];
+		Rect r = GetCtrlRect(im);
+		SetAutoItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::NormalPos() {
+	for(int i = 0; i < itemi.GetCount(); i++) {
+		int im = itemi[i];
+		Rect r = GetCtrlRect(im);
+		ctrl[im].TopPos(0, 0).LeftPos(0, 0);
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+*/
+
+void LayoutDesigner::VertCenter() {
+	for(int i = 0; i < itemi.GetCount(); i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		ctrl[im].VCenterPos(0, 0);
+		int h = r.Height();
+		r.top = (form.GetSize().cy - h) / 2;
+		r.bottom = r.top + h;
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::HorzCenter() {
+	for(int i = 0; i < itemi.GetCount(); i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		ctrl[im].HCenterPos(0, 0);
+		int w = r.Width();
+		r.left = (form.GetSize().cx - w) / 2;
+		r.right = r.left + w;
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::AlignLeft() {
+	if(!itemi.GetCount()) return;
+	int ax = GetCtrlRect(itemi.Top()).left;
+	for(int i = 0; i < itemi.GetCount() - 1; i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		r.Offset(ax - r.left, 0);
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::AlignRight() {
+	if(!itemi.GetCount()) return;
+	int ax = GetCtrlRect(itemi.Top()).right;
+	for(int i = 0; i < itemi.GetCount() - 1; i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		r.Offset(ax - r.right, 0);
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::AlignTop() {
+	if(!itemi.GetCount()) return;
+	int ay = GetCtrlRect(itemi.Top()).top;
+	for(int i = 0; i < itemi.GetCount() - 1; i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		r.Offset(0, ay - r.top);
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::AlignBottom() {
+	if(!itemi.GetCount()) return;
+	int ay = GetCtrlRect(itemi.Top()).bottom;
+	for(int i = 0; i < itemi.GetCount() - 1; i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		r.Offset(0, ay - r.bottom);
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::AlignVCenter() {
+	if(!itemi.GetCount()) return;
+	Rect dr = GetCtrlRect(itemi.Top());
+	for(int i = 0; i < itemi.GetCount() - 1; i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		r.Offset(0, dr.top + (dr.Height() - r.Height()) / 2 - r.top);
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::AlignHCenter() {
+	if(!itemi.GetCount()) return;
+	Rect dr = GetCtrlRect(itemi.Top());
+	for(int i = 0; i < itemi.GetCount() - 1; i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		r.Offset(dr.left + (dr.Width() - r.Width()) / 2 - r.left, 0);
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::AlignLbl() {
+	if(!itemi.GetCount()) return;
+	for(int i = 0; i < itemi.GetCount(); i++) {
+		int im = itemi[i];
+		if(Item(im).classname == "Label") {
+			Ctrl *ref = NULL;
+			if(im + 1 >= ItemCount() || Item(im + 1).classname == "Label") {
+				if(im > 0 && Item(im - 1).classname != "Label")
+					ref = &ctrl[im - 1];
+			}
+			else
+				ref = &ctrl[im + 1];
+			if(ref) {
+				Rect dr = ref->GetRect();
+				RefreshSelect(i);
+				Rect r = GetCtrlRect(im);
+				r.Offset(0, dr.top + (dr.Height() - r.Height()) / 2 - r.top);
+				SetItemPos(im, r);
+				RefreshSelect(i);
+			}
+		}
+	}
+}
+
+void LayoutDesigner::SameWidth() {
+	if(!itemi.GetCount()) return;
+	int ax = GetCtrlRect(itemi.Top()).Width();
+	for(int i = 0; i < itemi.GetCount() - 1; i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		r.right = r.left + ax;
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::SameHeight() {
+	if(!itemi.GetCount()) return;
+	int ay = GetCtrlRect(itemi.Top()).Height();
+	for(int i = 0; i < itemi.GetCount() - 1; i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		r.bottom = r.top + ay;
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::SameSize() {
+	if(!itemi.GetCount()) return;
+	Rect m = GetCtrlRect(itemi.Top());
+	for(int i = 0; i < itemi.GetCount() - 1; i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		r.right = r.left + m.Width();
+		r.bottom = r.top + m.Height();
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::MinHeight() {
+	for(int i = 0; i < itemi.GetCount(); i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		Size sz = ctrl[im].GetMinSize();
+		r.bottom = r.top + sz.cy;
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::MinWidth() {
+	for(int i = 0; i < itemi.GetCount(); i++) {
+		int im = itemi[i];
+		RefreshSelect(i);
+		Rect r = GetCtrlRect(im);
+		Size sz = ctrl[im].GetMinSize();
+		r.right = r.left + sz.cx;
+		SetItemPos(im, r);
+		RefreshSelect(i);
+	}
+}
+
+void LayoutDesigner::Cut() {
+	Copy();
+	Delete();
+}
+
+void LayoutDesigner::Copy() {
+	String out;
+	for(int i = 0; i < itemi.GetCount(); i++)
+		out << SaveCtrl(Item(itemi[i]), i, "", false);
+//	EmptyClipboard();
+//	WriteClipboard(CF_TEXT, out);
+	WriteClipboardText(out, true);
+}
+
+void LayoutDesigner::SelectToEnd(int i) {
+	ClearSelection();
+	while(i < ctrl.GetCount())
+		SelectItem(i++);
+}
+
+void LayoutDesigner::Paste() {
+	int i = ctrl.GetCount();
+	try {
+		String s = ReadClipboardText();
+		CParser p(s);
+		for(;;)
+			LoadCtrl(p, ActualForm().item.Add(), langi);
+	}
+	catch(CParser::Error&) {
+		ActualForm().item.Drop();
+	}
+	SynchronizeCtrls();
+	SelectToEnd(i);
+}
+
+void LayoutDesigner::SelectAll() {
+	SelectToEnd(0);
+}
+
+int FindIndex(const Vector<int>& c, int ii) {
+	for(int i = 0; i < c.GetCount(); i++)
+		if(c[i] == ii) return i;
+	return -1;
+}
+
+void LayoutDesigner::Delete() {
+	for(int ii = ctrl.GetCount(); ii >= 0; ii--)
+		if(FindIndex(itemi, ii) >= 0) {
+			UnselectItem(ii);
+			ctrl.Remove(ii);
+			ActualForm().item.Remove(ii);
+			itab.Remove(ii);
+		}
+	Refresh();
+}
+
+void LayoutDesigner::DoDuplicate(const Vector<int>& imi, int dx, int dy) {
+	if(layouti < 0) return;
+	for(int i = 0; i < imi.GetCount(); i++) {
+		int im = imi[i];
+		const ItemInfo& ii = Item(im);
+		const Ctrl& q = ctrl[im];
+		AddCtrl(ii.classname, String(), Lng(ii.label), Lng(ii.help));
+		SetItemPos(ctrl.GetCount() - 1, q.GetRect() + Point(dx, dy));
+	}
+}
+
+void LayoutDesigner::Duplicate() {
+	int si = ctrl.GetCount();
+	Vector<int> imi(itemi, 1);
+	ClearSelection();
+	DoDuplicate(imi, 16, 16);
+	SelectToEnd(si);
+}
+
+void LayoutDesigner::Matrix() {
+	if(!itemi.GetCount()) return;
+	if(matrix.Execute() != IDOK) return;
+	int si = ctrl.GetCount();
+	Vector<int> imi(itemi, 1);
+	Rect br = GetActualRect();
+	ClearSelection();
+	for(int i = 0; i < imi.GetCount() - 1; i++)
+		br |= GetCtrlRect(imi[i]);
+	for(int x = 0; x < (int)~matrix.x; x++)
+		for(int y = 0; y < (int)~matrix.y; y++)
+			if(x > 0 || y > 0)
+				DoDuplicate(imi, x * (br.Width() + (int)~matrix.hspace),
+								 y * (br.Height() + (int)~matrix.vspace));
+	SelectToEnd(si);
+}
+
+void LayoutDesigner::ToggleGrid() {
+	usegrid = !usegrid;
+	SetBar();
+}
+
+void LayoutDesigner::SetupAlias() {
+	if(alias_map.Edit() && !alias_map.Save(alias_map_file))
+		Exclamation(NFormat("Error saving alias file [* \1%s\1].", alias_map_file));
+	UpdateClassList();
+}
diff --git a/uppsrc2/rw/Designer.h b/archive/uppsrc/rw/Designer.h
similarity index 96%
rename from uppsrc2/rw/Designer.h
rename to archive/uppsrc/rw/Designer.h
index 67d635715..95cfc02ae 100644
--- a/uppsrc2/rw/Designer.h
+++ b/archive/uppsrc/rw/Designer.h
@@ -1,401 +1,401 @@
-#include <CtrlLib/CtrlLib.h>
-
-#define  LAYOUTFILE <rw/Designer.lay>
-#include <CtrlCore/lay.h>
-
-#define  IMAGEFILE <rw/rw.iml>
-#include <Draw/iml_header.h>
-
-const Display& VarLblDisplay(bool selected);
-
-typedef Ctrl *(*CtrlCreator)();
-
-class AliasMap {
-public:
-	AliasMap() {}
-
-	static String  StdFileName();
-
-	bool           IsEmpty() const { return obj_source.IsEmpty(); }
-
-	bool           Edit();
-
-	bool           Load(const char *path);
-	bool           Save(const char *path);
-	void           SetDefault();
-
-	String         Convert(const String& name) const;
-
-public:
-	Vector<String> obj_source;
-	Vector<String> obj_dest;
-};
-
-class SelectedDisplay : public Display {
-	virtual void Paint(Draw& w, const Rect& r, const Value& q, Color i, Color p, dword s) const;
-};
-
-extern const SelectedDisplay SelDisplay;
-
-class LayoutDesigner : public Ctrl {
-public:
-	virtual void  Paint(Draw& w);
-	virtual Image CursorImage(Point p, dword keyflags);
-	virtual void  LeftDown(Point p, dword keyflags);
-	virtual void  LeftRepeat(Point p, dword keyflags);
-	virtual void  LeftUp(Point p, dword keyflags);
-	virtual void  RightDown(Point p, dword keyflags);
-	virtual void  MouseMove(Point p, dword keyflags);
-	virtual bool  Key(dword key, int count);
-	virtual void  Layout();
-	virtual void  Serialize(Stream& s);
-
-protected:
-	enum {
-		LEFT,
-		CENTER,
-		RIGHT,
-		TOP     = LEFT,
-		BOTTOM  = RIGHT,
-		FORM,
-		SELECTRECT,
-
-		TRACKERSIZE = 6,
-
-		SLEFT = 0,
-		SRIGHT,
-		STOP,
-		SBOTTOM,
-	};
-
-	enum ITEMPOS
-	{
-		POS_NONE,
-		POS_AUTO,
-		POS_LEFT,
-		POS_CENTER,
-		POS_RIGHT,
-		POS_SIZE,
-		POS_TOP = POS_LEFT,
-		POS_BOTTOM = POS_RIGHT,
-	};
-
-	struct ItemInfo {
-		LogPos         pos;
-		String         classname;
-		String         variable;
-		String         labelid;
-		String         helpid;
-		Vector<String> label;
-		Vector<String> help;
-		dword          hotkey;
-	};
-
-	struct Form {
-		String          name;
-		Size            size;
-		Array<ItemInfo> item;
-	};
-
-	Array<Form> layout;
-	int         layouti;
-	int         langi;
-
-	DropList         layoutlist;
-	DropList         langlist;
-
-	CallbackArg<int>   classset;
-	Point              newctrl;
-
-	WithGridLayout<TopWindow> grid;
-	bool        usegrid;
-	bool        ignoremin;
-	bool        qlib2_output;
-
-	WithMatrixLayout<TopWindow> matrix;
-
-	String        filename;
-	FileSel       filesel;
-	LRUList       LruList;
-
-	AliasMap      alias_map;
-	String        alias_map_file;
-
-	Rect          selectrect;
-	Point         track;
-	Vector<int>   itemi;
-	Vector<Point> melta;
-	Point         delta;
-	bool          moved;
-	bool          cltm;
-
-	Ctrl            design;
-	Splitter        splital;
-
-	ArrayCtrl       itab;
-
-	Splitter                   props;
-	Splitter                   label_help_split;
-	Ctrl                       class_var_lbl;
-	WithDropChoice<EditString> classname;
-	EditString                 variable;
-	DocEdit                    label;
-	DocEdit                    help;
-
-	struct DesignForm;
-	friend struct DesignForm;
-	struct DesignForm : public Ctrl {
-		virtual void Paint(Draw& w)                               { ld->PaintForm(w); }
-		LayoutDesigner *ld;
-	};
-
-	DesignForm      form;
-	Array<Ctrl>     ctrl;
-	Array<Ctrl>     ref_ctrl;
-	Array<Ctrl>     mnem_ctrl;
-
-	ScrollBars      sb;
-
-	struct AfterPaint;
-	friend struct AfterPaint;
-
-	struct AfterPaint : public Ctrl {
-		virtual void Paint(Draw& w)                               { ld->PaintTrack(w); }
-		LayoutDesigner *ld;
-	};
-
-	AfterPaint  apaint;
-
-	MenuBar     menubar;
-	ToolBar     toolbar;
-	FrameRight<Label> status;
-
-	static VectorMap<String, CtrlCreator>& ClassMap();
-
-	struct Frame;
-	friend struct Frame;
-	struct Frame : public TopWindow {
-		void WindowClose()       { ld->CloseFile(); }
-		virtual bool Key(dword k, int c) { return ld->Key(k, c) ? true : TopWindow::Key(k, c); }
-		LayoutDesigner *ld;
-
-		Frame() { WhenClose = callback(this, &Frame::WindowClose); }
-	};
-
-	Frame frame;
-
-	static int   GetTrack(int a, int b, int type);
-	static Image GetTrackShape(Point track);
-
-	String&   Lng(Vector<String>& x)          { return x.At(langi); }
-	String    Lng(const Vector<String>& x) const;
-	Form&     ActualForm()                    { return layout[layouti]; }
-	const Form& ActualForm() const            { return layout[layouti]; }
-	ItemInfo& Item(int i)                     { return ActualForm().item[i]; }
-	const ItemInfo& Item(int i) const         { return ActualForm().item[i]; }
-	int       ItemCount()                     { return ActualForm().item.GetCount(); }
-//G++ bug
-	String&   ItemLabel(int i);
-	String    ItemLabel(int i) const;
-	String&   Help(int i);
-	String    Help(int i) const;
-
-	Ctrl     *CreateCtrl(const String& classname);
-	Ctrl     *CreateCtrl(const String& classname, Index<String>& recursed);
-	Ctrl     *CreateLayoutCtrl(String classname, Index<String>& recursed);
-
-	int    ParseLayoutRef(String cls, String& base) const;
-	bool   IsLayoutRef(String cls) const { String dummy; return ParseLayoutRef(cls, dummy) >= 0; }
-	void   SynchronizeCtrl(int im);
-	void   SynchronizeCtrl(Ctrl& ctrl, const ItemInfo& ii);
-	void   SynchronizeCtrl();
-	void   SynchronizeCtrls();
-	void   SynchronizeMnemonic();
-	void   CleanRefCtrl();
-	void   AddCtrl(const String& cls, const String& var, const String& lbl, const String& hlp);
-	void   SetClass(int im);
-	void   UpdateClassList();
-
-	void   LoadCtrl(CParser& p, ItemInfo& ii, int langi = 0);
-	String SaveCtrl(const ItemInfo& ii, int i, const String& name, bool lang) const;
-
-	Rect   GetSpringRect(int i);
-	Rect   GetTracker(Point track);
-	Point  FindTracker(Point p);
-	Rect   GetCtrlRect(int i);
-	Rect   GetActualRect();
-	Rect   GetActual();
-	void   RefreshActual();
-	int    FindItem(Point p);
-	void   DrawHorzSpring(Draw& w, int i);
-	void   DrawVertSpring(Draw& w, int i);
-	void   PaintTrack(Draw& w);
-	void   PaintForm(Draw& w);
-	void   StartMoving(Point p);
-	void   DoMoving();
-	bool   IsMoving();
-	bool   GetSpring(int im, int i);
-	bool   GetSpring(int i);
-	void   SetItemPos(int i, const Rect& r, int chi = -1, bool val = false, bool sync = true);
-	void   SetActualPos(const Rect& r, int chi = -1, bool val = false);
-	void   ShowHideLayouts();
-//	void   SetAutoItemPos(int i, const Rect& r);
-	void   WhenITab();
-	void   NewClass();
-	void   NewVariable();
-	void   NewLabel();
-	void   NewHelp();
-	void   SetFormSize(Size sz);
-	void   ClassMenu(Bar& menu);
-	void   NewCtrl(int i);
-
-	int    FindSelect(int im);
-	void   SelectItem(int im);
-	void   SelectOneItem(int im);
-	void   UnselectItem(int im);
-	bool   ItemSelected(int im)                                { return FindSelect(im) >= 0; }
-	void   ClearSelection();
-	void   ClearSelection0();
-	void   RefreshSelect(int i);
-	void   SelectToEnd(int i);
-
-	void   RefreshSelectRect();
-
-	void   Swap(int i1, int i2);
-	void   SetLayout(int i, int li);
-	void   SetLayout(int i)                                    { SetLayout(i, langi); }
-	void   EnterLayout();
-	void   EnterLanguage();
-	void   Scroll();
-	void   ItemPos(int xy_long);
-	int    GetItemPosMask() const;
-
-	void   SetupLayoutList();
-	void   NewLayout();
-	void   RemoveLayout();
-	void   RenameLayout();
-	void   PrevLayout();
-	void   NextLayout();
-
-	bool   SaveLayoutFileAs();
-
-	bool   DoSave();
-	bool   PromptSave();
-	void   LruOpen(const String& s);
-	void   MakeCaption();
-	void   OpenFile();
-	void   SaveFile();
-	void   SaveFileAs();
-	void   CloseFile();
-	void   NewFile();
-
-#ifdef flagIDERW
-	void   CloseDesigner();
-#endif
-
-	void   SetupAlias();
-	void   SetupGrid();
-	void   ToggleGrid();
-	void   ToggleIgnoreMin();
-	void   ToggleQLIB2Output();
-	int    GridX()                           { return usegrid ? max((int)~grid.x, 1) : 1; }
-	int    GridY()                           { return usegrid ? max((int)~grid.y, 1) : 1; }
-
-	void   AddItem();
-	void   MoveUp();
-	void   MoveDown();
-
-	void   DoDuplicate(const Vector<int>& imi, int dx, int dy);
-	void   KeyMove(int dx, int dy, int sx, int sy);
-
-	void   Copy();
-	void   Cut();
-	void   Paste();
-	void   Delete();
-	void   Duplicate();
-	void   SelectAll();
-
-	void   VertCenter();
-	void   HorzCenter();
-	void   AlignLeft();
-	void   AlignRight();
-	void   AlignTop();
-	void   AlignBottom();
-	void   AlignHCenter();
-	void   AlignVCenter();
-	void   SameWidth();
-	void   SameHeight();
-	void   SameSize();
-	void   MinWidth();
-	void   MinHeight();
-	void   Matrix();
-	void   AlignLbl();
-
-	void   ShowStatus();
-
-	Vector<String> CoreLangs();
-	void   AddLang(const String& lang, bool copy);
-	void   NewLanguage();
-	void   RenameLanguage();
-	void   RemoveLanguage();
-	void   AddCoreLanguages();
-	void   NextLang();
-	void   PrevLang();
-
-	void   FileBar(Bar& bar);
-	void   LayoutBar(Bar& bar);
-	void   SpringsBar(Bar& bar);
-	void   AlignBar(Bar& bar);
-	void   SizeBar(Bar& bar);
-	void   ItemBar(Bar& bar);
-	void   OptionsBar(Bar& bar);
-	void   EditBar(Bar& bar);
-	void   LangBar(Bar& bar);
-	void   MainBar(Bar& bar);
-
-	void   Tool(Bar& bar);
-
-	void   SetBar();
-
-public:
-	static void Register(const String& classname, CtrlCreator creator);
-
-	void   LoadLayoutFile(const char *s);
-	bool   SaveLayoutFile();
-	bool   CloseLayoutFile();
-	String GetLayoutFile() const;
-	String GetFileName() const              { return filename; }
-
-	void   Execute();
-	void   OpenWindow();
-
-	LayoutDesigner();
-
-	typedef LayoutDesigner CLASSNAME;
-};
-
-template <class T>
-class CtrlClassRegistrator {
-public:
-	static Ctrl *Create()                   { return new T; }
-
-	CtrlClassRegistrator(const char *name)  { LayoutDesigner::Register(name, Create); }
-};
-
-class UrgCtrl : public Ctrl {
-public:
-	virtual void SetLabelText(const char *s);
-	virtual void Paint(Draw& w);
-
-protected:
-	String label;
-	String classname;
-
-public:
-	UrgCtrl(const String& classname) : classname(classname) { SetFrame(InsetFrame()); }
-};
-
-
-#define REGCTRLCLASS(x)  static CtrlClassRegistrator<x > MK__s (#x);
-
-void DesignLayout();
+#include <CtrlLib/CtrlLib.h>
+
+#define  LAYOUTFILE <rw/Designer.lay>
+#include <CtrlCore/lay.h>
+
+#define  IMAGEFILE <rw/rw.iml>
+#include <Draw/iml_header.h>
+
+const Display& VarLblDisplay(bool selected);
+
+typedef Ctrl *(*CtrlCreator)();
+
+class AliasMap {
+public:
+	AliasMap() {}
+
+	static String  StdFileName();
+
+	bool           IsEmpty() const { return obj_source.IsEmpty(); }
+
+	bool           Edit();
+
+	bool           Load(const char *path);
+	bool           Save(const char *path);
+	void           SetDefault();
+
+	String         Convert(const String& name) const;
+
+public:
+	Vector<String> obj_source;
+	Vector<String> obj_dest;
+};
+
+class SelectedDisplay : public Display {
+	virtual void Paint(Draw& w, const Rect& r, const Value& q, Color i, Color p, dword s) const;
+};
+
+extern const SelectedDisplay SelDisplay;
+
+class LayoutDesigner : public Ctrl {
+public:
+	virtual void  Paint(Draw& w);
+	virtual Image CursorImage(Point p, dword keyflags);
+	virtual void  LeftDown(Point p, dword keyflags);
+	virtual void  LeftRepeat(Point p, dword keyflags);
+	virtual void  LeftUp(Point p, dword keyflags);
+	virtual void  RightDown(Point p, dword keyflags);
+	virtual void  MouseMove(Point p, dword keyflags);
+	virtual bool  Key(dword key, int count);
+	virtual void  Layout();
+	virtual void  Serialize(Stream& s);
+
+protected:
+	enum {
+		LEFT,
+		CENTER,
+		RIGHT,
+		TOP     = LEFT,
+		BOTTOM  = RIGHT,
+		FORM,
+		SELECTRECT,
+
+		TRACKERSIZE = 6,
+
+		SLEFT = 0,
+		SRIGHT,
+		STOP,
+		SBOTTOM,
+	};
+
+	enum ITEMPOS
+	{
+		POS_NONE,
+		POS_AUTO,
+		POS_LEFT,
+		POS_CENTER,
+		POS_RIGHT,
+		POS_SIZE,
+		POS_TOP = POS_LEFT,
+		POS_BOTTOM = POS_RIGHT,
+	};
+
+	struct ItemInfo {
+		LogPos         pos;
+		String         classname;
+		String         variable;
+		String         labelid;
+		String         helpid;
+		Vector<String> label;
+		Vector<String> help;
+		dword          hotkey;
+	};
+
+	struct Form {
+		String          name;
+		Size            size;
+		Array<ItemInfo> item;
+	};
+
+	Array<Form> layout;
+	int         layouti;
+	int         langi;
+
+	DropList         layoutlist;
+	DropList         langlist;
+
+	CallbackArg<int>   classset;
+	Point              newctrl;
+
+	WithGridLayout<TopWindow> grid;
+	bool        usegrid;
+	bool        ignoremin;
+	bool        qlib2_output;
+
+	WithMatrixLayout<TopWindow> matrix;
+
+	String        filename;
+	FileSel       filesel;
+	LRUList       LruList;
+
+	AliasMap      alias_map;
+	String        alias_map_file;
+
+	Rect          selectrect;
+	Point         track;
+	Vector<int>   itemi;
+	Vector<Point> melta;
+	Point         delta;
+	bool          moved;
+	bool          cltm;
+
+	Ctrl            design;
+	Splitter        splital;
+
+	ArrayCtrl       itab;
+
+	Splitter                   props;
+	Splitter                   label_help_split;
+	Ctrl                       class_var_lbl;
+	WithDropChoice<EditString> classname;
+	EditString                 variable;
+	DocEdit                    label;
+	DocEdit                    help;
+
+	struct DesignForm;
+	friend struct DesignForm;
+	struct DesignForm : public Ctrl {
+		virtual void Paint(Draw& w)                               { ld->PaintForm(w); }
+		LayoutDesigner *ld;
+	};
+
+	DesignForm      form;
+	Array<Ctrl>     ctrl;
+	Array<Ctrl>     ref_ctrl;
+	Array<Ctrl>     mnem_ctrl;
+
+	ScrollBars      sb;
+
+	struct AfterPaint;
+	friend struct AfterPaint;
+
+	struct AfterPaint : public Ctrl {
+		virtual void Paint(Draw& w)                               { ld->PaintTrack(w); }
+		LayoutDesigner *ld;
+	};
+
+	AfterPaint  apaint;
+
+	MenuBar     menubar;
+	ToolBar     toolbar;
+	FrameRight<Label> status;
+
+	static VectorMap<String, CtrlCreator>& ClassMap();
+
+	struct Frame;
+	friend struct Frame;
+	struct Frame : public TopWindow {
+		void WindowClose()       { ld->CloseFile(); }
+		virtual bool Key(dword k, int c) { return ld->Key(k, c) ? true : TopWindow::Key(k, c); }
+		LayoutDesigner *ld;
+
+		Frame() { WhenClose = callback(this, &Frame::WindowClose); }
+	};
+
+	Frame frame;
+
+	static int   GetTrack(int a, int b, int type);
+	static Image GetTrackShape(Point track);
+
+	String&   Lng(Vector<String>& x)          { return x.At(langi); }
+	String    Lng(const Vector<String>& x) const;
+	Form&     ActualForm()                    { return layout[layouti]; }
+	const Form& ActualForm() const            { return layout[layouti]; }
+	ItemInfo& Item(int i)                     { return ActualForm().item[i]; }
+	const ItemInfo& Item(int i) const         { return ActualForm().item[i]; }
+	int       ItemCount()                     { return ActualForm().item.GetCount(); }
+//G++ bug
+	String&   ItemLabel(int i);
+	String    ItemLabel(int i) const;
+	String&   Help(int i);
+	String    Help(int i) const;
+
+	Ctrl     *CreateCtrl(const String& classname);
+	Ctrl     *CreateCtrl(const String& classname, Index<String>& recursed);
+	Ctrl     *CreateLayoutCtrl(String classname, Index<String>& recursed);
+
+	int    ParseLayoutRef(String cls, String& base) const;
+	bool   IsLayoutRef(String cls) const { String dummy; return ParseLayoutRef(cls, dummy) >= 0; }
+	void   SynchronizeCtrl(int im);
+	void   SynchronizeCtrl(Ctrl& ctrl, const ItemInfo& ii);
+	void   SynchronizeCtrl();
+	void   SynchronizeCtrls();
+	void   SynchronizeMnemonic();
+	void   CleanRefCtrl();
+	void   AddCtrl(const String& cls, const String& var, const String& lbl, const String& hlp);
+	void   SetClass(int im);
+	void   UpdateClassList();
+
+	void   LoadCtrl(CParser& p, ItemInfo& ii, int langi = 0);
+	String SaveCtrl(const ItemInfo& ii, int i, const String& name, bool lang) const;
+
+	Rect   GetSpringRect(int i);
+	Rect   GetTracker(Point track);
+	Point  FindTracker(Point p);
+	Rect   GetCtrlRect(int i);
+	Rect   GetActualRect();
+	Rect   GetActual();
+	void   RefreshActual();
+	int    FindItem(Point p);
+	void   DrawHorzSpring(Draw& w, int i);
+	void   DrawVertSpring(Draw& w, int i);
+	void   PaintTrack(Draw& w);
+	void   PaintForm(Draw& w);
+	void   StartMoving(Point p);
+	void   DoMoving();
+	bool   IsMoving();
+	bool   GetSpring(int im, int i);
+	bool   GetSpring(int i);
+	void   SetItemPos(int i, const Rect& r, int chi = -1, bool val = false, bool sync = true);
+	void   SetActualPos(const Rect& r, int chi = -1, bool val = false);
+	void   ShowHideLayouts();
+//	void   SetAutoItemPos(int i, const Rect& r);
+	void   WhenITab();
+	void   NewClass();
+	void   NewVariable();
+	void   NewLabel();
+	void   NewHelp();
+	void   SetFormSize(Size sz);
+	void   ClassMenu(Bar& menu);
+	void   NewCtrl(int i);
+
+	int    FindSelect(int im);
+	void   SelectItem(int im);
+	void   SelectOneItem(int im);
+	void   UnselectItem(int im);
+	bool   ItemSelected(int im)                                { return FindSelect(im) >= 0; }
+	void   ClearSelection();
+	void   ClearSelection0();
+	void   RefreshSelect(int i);
+	void   SelectToEnd(int i);
+
+	void   RefreshSelectRect();
+
+	void   Swap(int i1, int i2);
+	void   SetLayout(int i, int li);
+	void   SetLayout(int i)                                    { SetLayout(i, langi); }
+	void   EnterLayout();
+	void   EnterLanguage();
+	void   Scroll();
+	void   ItemPos(int xy_long);
+	int    GetItemPosMask() const;
+
+	void   SetupLayoutList();
+	void   NewLayout();
+	void   RemoveLayout();
+	void   RenameLayout();
+	void   PrevLayout();
+	void   NextLayout();
+
+	bool   SaveLayoutFileAs();
+
+	bool   DoSave();
+	bool   PromptSave();
+	void   LruOpen(const String& s);
+	void   MakeCaption();
+	void   OpenFile();
+	void   SaveFile();
+	void   SaveFileAs();
+	void   CloseFile();
+	void   NewFile();
+
+#ifdef flagIDERW
+	void   CloseDesigner();
+#endif
+
+	void   SetupAlias();
+	void   SetupGrid();
+	void   ToggleGrid();
+	void   ToggleIgnoreMin();
+	void   ToggleQLIB2Output();
+	int    GridX()                           { return usegrid ? max((int)~grid.x, 1) : 1; }
+	int    GridY()                           { return usegrid ? max((int)~grid.y, 1) : 1; }
+
+	void   AddItem();
+	void   MoveUp();
+	void   MoveDown();
+
+	void   DoDuplicate(const Vector<int>& imi, int dx, int dy);
+	void   KeyMove(int dx, int dy, int sx, int sy);
+
+	void   Copy();
+	void   Cut();
+	void   Paste();
+	void   Delete();
+	void   Duplicate();
+	void   SelectAll();
+
+	void   VertCenter();
+	void   HorzCenter();
+	void   AlignLeft();
+	void   AlignRight();
+	void   AlignTop();
+	void   AlignBottom();
+	void   AlignHCenter();
+	void   AlignVCenter();
+	void   SameWidth();
+	void   SameHeight();
+	void   SameSize();
+	void   MinWidth();
+	void   MinHeight();
+	void   Matrix();
+	void   AlignLbl();
+
+	void   ShowStatus();
+
+	Vector<String> CoreLangs();
+	void   AddLang(const String& lang, bool copy);
+	void   NewLanguage();
+	void   RenameLanguage();
+	void   RemoveLanguage();
+	void   AddCoreLanguages();
+	void   NextLang();
+	void   PrevLang();
+
+	void   FileBar(Bar& bar);
+	void   LayoutBar(Bar& bar);
+	void   SpringsBar(Bar& bar);
+	void   AlignBar(Bar& bar);
+	void   SizeBar(Bar& bar);
+	void   ItemBar(Bar& bar);
+	void   OptionsBar(Bar& bar);
+	void   EditBar(Bar& bar);
+	void   LangBar(Bar& bar);
+	void   MainBar(Bar& bar);
+
+	void   Tool(Bar& bar);
+
+	void   SetBar();
+
+public:
+	static void Register(const String& classname, CtrlCreator creator);
+
+	void   LoadLayoutFile(const char *s);
+	bool   SaveLayoutFile();
+	bool   CloseLayoutFile();
+	String GetLayoutFile() const;
+	String GetFileName() const              { return filename; }
+
+	void   Execute();
+	void   OpenWindow();
+
+	LayoutDesigner();
+
+	typedef LayoutDesigner CLASSNAME;
+};
+
+template <class T>
+class CtrlClassRegistrator {
+public:
+	static Ctrl *Create()                   { return new T; }
+
+	CtrlClassRegistrator(const char *name)  { LayoutDesigner::Register(name, Create); }
+};
+
+class UrgCtrl : public Ctrl {
+public:
+	virtual void SetLabelText(const char *s);
+	virtual void Paint(Draw& w);
+
+protected:
+	String label;
+	String classname;
+
+public:
+	UrgCtrl(const String& classname) : classname(classname) { SetFrame(InsetFrame()); }
+};
+
+
+#define REGCTRLCLASS(x)  static CtrlClassRegistrator<x > MK__s (#x);
+
+void DesignLayout();
diff --git a/uppsrc2/rw/Designer.lay b/archive/uppsrc/rw/Designer.lay
similarity index 97%
rename from uppsrc2/rw/Designer.lay
rename to archive/uppsrc/rw/Designer.lay
index b5fe2ae26..12d0b5861 100644
--- a/uppsrc2/rw/Designer.lay
+++ b/archive/uppsrc/rw/Designer.lay
@@ -1,46 +1,46 @@
-#ifdef LAYOUTFILE
-
-LAYOUT(LayoutLayout, 220, 60)
-	ITEM(Label, label1, SetLabel("&Layout:").LeftPosZ(4, 46).TopPosZ(4, 20))
-	ITEM(EditString, layout, HSizePosZ(52, 4).TopPosZ(4, 19))
-	ITEM(Button, ok, SetLabel("OK").RightPosZ(88, 80).BottomPosZ(4, 22))
-	ITEM(Button, cancel, SetLabel("Cancel").RightPosZ(4, 80).BottomPosZ(4, 22))
-END_LAYOUT
-
-LAYOUT(GridLayout, 172, 64)
-	ITEM(Label, dv___0, SetLabel("&X:").LeftPosZ(4, 12).TopPosZ(4, 20))
-	ITEM(EditIntSpin, x, LeftPosZ(18, 40).TopPosZ(4, 20))
-	ITEM(Label, dv___2, SetLabel("&Y:").LeftPosZ(90, 16).TopPosZ(4, 20))
-	ITEM(EditIntSpin, y, LeftPosZ(108, 40).TopPosZ(4, 20))
-	ITEM(Button, ok, SetLabel("OK").RightPosZ(88, 80).BottomPosZ(4, 22))
-	ITEM(Button, cancel, SetLabel("Cancel").RightPosZ(4, 80).BottomPosZ(4, 22))
-END_LAYOUT
-
-LAYOUT(MatrixLayout, 202, 86)
-	ITEM(Label, dv___0, SetLabel("&Horizontal").LeftPosZ(4, 54).TopPosZ(4, 19))
-	ITEM(EditIntSpin, x, LeftPosZ(60, 42).TopPosZ(4, 19))
-	ITEM(Label, dv___2, SetLabel("&spacing").LeftPosZ(108, 50).TopPosZ(4, 19))
-	ITEM(EditIntSpin, hspace, LeftPosZ(156, 42).TopPosZ(4, 19))
-	ITEM(Label, dv___4, SetLabel("&Vertical").LeftPosZ(4, 54).TopPosZ(28, 19))
-	ITEM(EditIntSpin, y, LeftPosZ(60, 42).TopPosZ(28, 19))
-	ITEM(Label, dv___6, SetLabel("s&pacing").LeftPosZ(108, 50).TopPosZ(28, 19))
-	ITEM(EditIntSpin, vspace, LeftPosZ(156, 42).TopPosZ(28, 19))
-	ITEM(Button, ok, SetLabel("OK").RightPosZ(88, 80).BottomPosZ(4, 22))
-	ITEM(Button, cancel, SetLabel("Cancel").RightPosZ(4, 80).BottomPosZ(4, 22))
-END_LAYOUT
-
-LAYOUT(LangLayout, 212, 82)
-	ITEM(Label, label1, SetLabel("&New language:").LeftPosZ(4, 76).TopPosZ(4, 19))
-	ITEM(WithDropChoice<EditString>, language, LeftPosZ(82, 126).TopPosZ(4, 19))
-	ITEM(Option, copy, SetLabel("&Copy current language").HSizePosZ(4, 4).TopPosZ(28, 18))
-	ITEM(Button, ok, SetLabel("OK").HSizePosZ(44, 88).BottomPosZ(4, 22))
-	ITEM(Button, cancel, SetLabel("Cancel").RightPosZ(4, 80).BottomPosZ(4, 22))
-END_LAYOUT
-
-LAYOUT(AliasLayout, 400, 400)
-	ITEM(ArrayCtrl, list, HSizePosZ(4, 4).VSizePosZ(4, 34))
-	ITEM(Button, ok, SetLabel("OK").RightPosZ(88, 80).BottomPosZ(4, 22))
-	ITEM(Button, cancel, SetLabel("Cancel").RightPosZ(4, 80).BottomPosZ(4, 22))
-END_LAYOUT
-
-#endif
+#ifdef LAYOUTFILE
+
+LAYOUT(LayoutLayout, 220, 60)
+	ITEM(Label, label1, SetLabel("&Layout:").LeftPosZ(4, 46).TopPosZ(4, 20))
+	ITEM(EditString, layout, HSizePosZ(52, 4).TopPosZ(4, 19))
+	ITEM(Button, ok, SetLabel("OK").RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel("Cancel").RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(GridLayout, 172, 64)
+	ITEM(Label, dv___0, SetLabel("&X:").LeftPosZ(4, 12).TopPosZ(4, 20))
+	ITEM(EditIntSpin, x, LeftPosZ(18, 40).TopPosZ(4, 20))
+	ITEM(Label, dv___2, SetLabel("&Y:").LeftPosZ(90, 16).TopPosZ(4, 20))
+	ITEM(EditIntSpin, y, LeftPosZ(108, 40).TopPosZ(4, 20))
+	ITEM(Button, ok, SetLabel("OK").RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel("Cancel").RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(MatrixLayout, 202, 86)
+	ITEM(Label, dv___0, SetLabel("&Horizontal").LeftPosZ(4, 54).TopPosZ(4, 19))
+	ITEM(EditIntSpin, x, LeftPosZ(60, 42).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel("&spacing").LeftPosZ(108, 50).TopPosZ(4, 19))
+	ITEM(EditIntSpin, hspace, LeftPosZ(156, 42).TopPosZ(4, 19))
+	ITEM(Label, dv___4, SetLabel("&Vertical").LeftPosZ(4, 54).TopPosZ(28, 19))
+	ITEM(EditIntSpin, y, LeftPosZ(60, 42).TopPosZ(28, 19))
+	ITEM(Label, dv___6, SetLabel("s&pacing").LeftPosZ(108, 50).TopPosZ(28, 19))
+	ITEM(EditIntSpin, vspace, LeftPosZ(156, 42).TopPosZ(28, 19))
+	ITEM(Button, ok, SetLabel("OK").RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel("Cancel").RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(LangLayout, 212, 82)
+	ITEM(Label, label1, SetLabel("&New language:").LeftPosZ(4, 76).TopPosZ(4, 19))
+	ITEM(WithDropChoice<EditString>, language, LeftPosZ(82, 126).TopPosZ(4, 19))
+	ITEM(Option, copy, SetLabel("&Copy current language").HSizePosZ(4, 4).TopPosZ(28, 18))
+	ITEM(Button, ok, SetLabel("OK").HSizePosZ(44, 88).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel("Cancel").RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+LAYOUT(AliasLayout, 400, 400)
+	ITEM(ArrayCtrl, list, HSizePosZ(4, 4).VSizePosZ(4, 34))
+	ITEM(Button, ok, SetLabel("OK").RightPosZ(88, 80).BottomPosZ(4, 22))
+	ITEM(Button, cancel, SetLabel("Cancel").RightPosZ(4, 80).BottomPosZ(4, 22))
+END_LAYOUT
+
+#endif
diff --git a/uppsrc2/rw/DesignerFile.cpp b/archive/uppsrc/rw/DesignerFile.cpp
similarity index 96%
rename from uppsrc2/rw/DesignerFile.cpp
rename to archive/uppsrc/rw/DesignerFile.cpp
index 478c1e4ee..5742eca0f 100644
--- a/uppsrc2/rw/DesignerFile.cpp
+++ b/archive/uppsrc/rw/DesignerFile.cpp
@@ -1,421 +1,421 @@
-#include "Designer.h"
-
-static Point sReadAB(CParser& p) {
-	Point pt;
-	p.PassChar('(');
-	pt.x = p.ReadInt();
-	p.PassChar(',');
-	pt.y = p.ReadInt();
-	p.PassChar(')');
-	return pt;
-}
-
-static String ReadVar(CParser& p) {
-	String var;
-	for(;;) {
-		if(p.IsId())
-			var << p.ReadId();
-		else
-		if(p.IsInt())
-			var << p.ReadInt();
-		else
-		if(p.Char('.'))
-			var << '.';
-		else
-		if(p.Char('['))
-			var << '[';
-		else
-		if(p.Char(']'))
-			var << ']';
-		else
-			return var;
-	}
-}
-
-void LayoutDesigner::LoadCtrl(CParser& p, ItemInfo& ii, int li) {
-	if(p.Id("ITEM")) {
-		p.PassChar('(');
-		if(p.IsId()) ii.classname = p.ReadIdt();
-		p.PassChar(',');
-	}
-	else
-	if(p.Id("UNTYPED"))
-		p.PassChar('(');
-	else
-		p.ThrowError("Bad item.");
-	if(p.IsId()) ii.variable = ReadVar(p);
-	if(strncmp(ii.variable, "dv___", 5) == 0)
-		ii.variable.Clear();
-	p.PassChar(',');
-	LogPos pos;
-	do {
-		if(p.Id("LeftPosZ") || p.Id("LeftPos")) {
-			Point pt = sReadAB(p);
-			pos.x = PosLeft(pt.x, pt.y);
-		}
-		else
-		if(p.Id("RightPosZ") || p.Id("RightPos")) {
-			Point pt = sReadAB(p);
-			pos.x = PosRight(pt.x, pt.y);
-		}
-		else
-		if(p.Id("HSizePosZ") || p.Id("HSizePos")) {
-			Point pt = sReadAB(p);
-			pos.x = PosSize(pt.x, pt.y);
-		}
-		else
-		if(p.Id("HCenterPosZ") || p.Id("HCenterPos")) {
-			Point pt = sReadAB(p);
-			pos.x = PosCenter(pt.x, pt.y);
-		}
-		else
-		if(p.Id("TopPosZ") || p.Id("TopPos")) {
-			Point pt = sReadAB(p);
-			pos.y = PosLeft(pt.x, pt.y);
-		}
-		else
-		if(p.Id("BottomPosZ") || p.Id("BottomPos")) {
-			Point pt = sReadAB(p);
-			pos.y = PosRight(pt.x, pt.y);
-		}
-		else
-		if(p.Id("VSizePosZ") || p.Id("VSizePos")) {
-			Point pt = sReadAB(p);
-			pos.y = PosSize(pt.x, pt.y);
-		}
-		else
-		if(p.Id("VCenterPosZ") || p.Id("VCenterPos")) {
-			Point pt = sReadAB(p);
-			pos.y = PosCenter(pt.x, pt.y);
-		}
-		else
-		if(p.Id("SetLabel")) {
-			p.PassChar('(');
-			if(p.IsString())
-				ii.label.At(li) = p.ReadString();
-			else
-				ii.labelid = p.ReadId();
-			p.PassChar(')');
-		}
-		else
-		if(p.Id("HelpC") || p.Id("Help") || p.Id("Description")) {
-			p.PassChar('(');
-			if(p.IsString())
-				ii.help.At(li) = p.ReadString();
-			else
-				ii.helpid = p.ReadId();
-			p.PassChar(')');
-		}
-		else
-		if(p.Id("Hide")) {
-			p.PassChar('(');
-			p.PassChar(')');
-		}
-		else
-			p.ThrowError("Invalid item modifier.");
-	}
-	while(p.Char('.'));
-	p.PassChar(')');
-	ii.pos = pos;
-}
-
-void LayoutDesigner::LoadLayoutFile(const char *_filename) {
-	SetLayout(-1);
-	layout.Clear();
-	langlist.Clear();
-	try {
-		filename = _filename;
-		String s = LoadFile(filename);
-		CParser p(s);
-		if(p.Id("#ifdef"))
-			p.Id("LAYOUTFILE");
-		while(p.Id("LAYOUT")) {
-			p.PassChar('(');
-			String name = p.ReadId();
-			p.PassChar(',');
-			int cx = p.ReadInt();
-			p.PassChar(',');
-			int cy = p.ReadInt();
-			p.PassChar(')');
-			const char *a = p.GetPtr();
-			const char *b = a;
-			Form& l = layout.Add();
-			l.name = name;
-			l.size = Size(cx, cy);
-			while(!p.IsEof() && !p.Id("END_LAYOUT"))
-				LoadCtrl(p, l.item.Add());
-			while(*a == '\n' || *a == '\r')
-				a++;
-		}
-		p.Id("#endif");
-		while(p.Id("#if")) {
-			p.PassId("LANGUAGE");
-			p.PassChar2('=', '=');
-			String langid = p.ReadId();
-			CParser::Pos idpos = p.GetPos();
-			if(*idpos.ptr == '(')
-			{
-				const char *b = idpos.ptr;
-				while(*idpos.ptr && *idpos.ptr++ != ')')
-					;
-				langid.Cat(b, idpos.ptr - b);
-				p.SetPos(idpos);
-			}
-			langlist.Add(langlist.GetCount(), langid);
-			VectorMap<String, String> map;
-			while(p.Id("txt")) {
-				p.PassChar('(');
-				String& txt = map.Add("txt" + p.ReadId());
-				p.PassChar(',');
-				txt = p.ReadString();
-				p.PassChar(')');
-			}
-			p.PassId("#endif");
-			for(int i = 0; i < layout.GetCount(); i++) {
-				Form& l = layout[i];
-				for(int i = 0; i < l.item.GetCount(); i++) {
-					ItemInfo& ii = l.item[i];
-					ii.label.Add(map.Get(ii.labelid, String()));
-					ii.help.Add(map.Get(ii.helpid, String()));
-				}
-			}
-		}
-	}
-	catch(CParser::Error& e) {
-		Exclamation(e);
-		filename.Clear();
-	}
-	MakeCaption();
-	SetupLayoutList();
-	SetLayout(layout.GetCount() ? 0 : -1, 0);
-}
-
-String SaveText(String mod, const Vector<String>& txt, bool lang, const String& name, int ii) {
-	mod = '.' + mod +  '(';
-	if(lang) {
-		for(int i = 0; i < txt.GetCount(); i++)
-			if(!txt[i].IsEmpty())
-				return mod + name + Format("_%d", ii) + ')';
-		return String();
-	}
-	return txt.GetCount() && !txt[0].IsEmpty() ? mod + AsCString(txt[0]) + ')' : String();
-}
-
-String LayoutDesigner::SaveCtrl(const ItemInfo& ii, int i, const String& name, bool lang) const {
-	String out;
-	if(ii.classname.IsEmpty())
-		out << "\tUNTYPED(";
-	else
-		out << "\tITEM(" << ii.classname << ", ";
-	out << (ii.variable.IsEmpty() ? Format("dv___%d", i) : ii.variable) << ", ";
-	LogPos p = ii.pos;
-	const char *zfix = (qlib2_output ? "" : "Z");
-	switch(p.x.GetAlign()) {
-	case Ctrl::LEFT:   out << Format("LeftPos%s(%d, %d).", zfix, p.x.GetA(), p.x.GetB()); break;
-	case Ctrl::RIGHT:  out << Format("RightPos%s(%d, %d).", zfix, p.x.GetA(), p.x.GetB()); break;
-	case Ctrl::SIZE:   out << Format("HSizePos%s(%d, %d).", zfix, p.x.GetA(), p.x.GetB()); break;
-	case Ctrl::CENTER: out << Format("HCenterPos%s(%d, %d).", zfix, p.x.GetB(), p.x.GetA()); break;
-	}
-	switch(p.y.GetAlign()) {
-	case Ctrl::TOP:    out << Format("TopPos%s(%d, %d)", zfix, p.y.GetA(), p.y.GetB()); break;
-	case Ctrl::BOTTOM: out << Format("BottomPos%s(%d, %d)", zfix, p.y.GetA(), p.y.GetB()); break;
-	case Ctrl::SIZE:   out << Format("VSizePos%s(%d, %d)", zfix, p.y.GetA(), p.y.GetB()); break;
-	case Ctrl::CENTER: out << Format("VCenterPos%s(%d, %d)", zfix, p.y.GetB(), p.y.GetA()); break;
-	}
-	out << SaveText("SetLabel", ii.label, lang, "txt" + name, i);
-	out << SaveText(qlib2_output ? "HelpC" : "Description", ii.help, lang, "txt" + name + "_HLP", i);
-	if(IsLayoutRef(ii.classname) && ii.variable.IsEmpty())
-		out << ".Hide()";
-	out << ")\n";
-	return out;
-}
-
-String txtSave(int li, const Vector<String>& txt, int ii, String name) {
-	for(int i = 0; i < txt.GetCount(); i++)
-		if(!txt[i].IsEmpty()) {
-			String s;
-			if(li < txt.GetCount())
-				s = txt[li];
-			return "txt(" + name + Format("_%d", ii) + ", " + AsCString(s) + ")\n";
-		}
-	return String();
-}
-
-String LayoutDesigner::GetLayoutFile() const {
-	int i;
-	Vector<int> layindex;
-	layindex.SetCount(layout.GetCount());
-	for(i = 0; i < layout.GetCount(); i++)
-		layindex[i] = i;
-	int maxswaps = layout.GetCount() * layout.GetCount();
-	for(i = 0; maxswaps > 0 && i < layindex.GetCount(); i++)
-	{
-		int lx = layindex[i];
-		const Form& l = layout[lx];
-		int maxref = -1;
-		String dummy;
-		for(int c = 0; c < l.item.GetCount(); c++)
-			maxref = max(maxref, FindIndex(layindex, ParseLayoutRef(l.item[c].classname, dummy)));
-		if(maxref > i)
-		{
-			layindex.Remove(i);
-			layindex.Insert(maxref, lx);
-			i--;
-			maxswaps--;
-		}
-	}
-
-	StringStream out;
-	out << "#ifdef LAYOUTFILE\n\n";
-	for(i = 0; i < layindex.GetCount(); i++) {
-		const Form& l = layout[layindex[i]];
-		out << "LAYOUT(" << l.name << ", " << l.size.cx << ", " << l.size.cy << ")\n";
-		for(int c = 0; c < l.item.GetCount(); c++)
-			out << SaveCtrl(l.item[c], c, l.name, langlist.GetCount());
-		out << "END_LAYOUT\n\n";
-	}
-	out << "#endif\n";
-	for(int li = 0; li < langlist.GetCount(); li++) {
-		out << "\n#if LANGUAGE == " << String(langlist.GetValue(li)) << "\n\n";
-		for(int i = 0; i < layindex.GetCount(); i++) {
-			const Form& l = layout[layindex[i]];
-			for(int c = 0; c < l.item.GetCount(); c++) {
-				out << txtSave(li, l.item[c].label, c, l.name);
-				out << txtSave(li, l.item[c].help, c, l.name + "_HLP");
-			}
-			out << '\n';
-		}
-		out << "#endif\n";
-	}
-	return out;
-}
-
-bool LayoutDesigner::SaveLayoutFile() {
-	String lf = GetLayoutFile();
-	if(::LoadFile(filename) != lf && !::SaveFile(filename, lf)) {
-		Exclamation("Error storing output file " + filename);
-		return false;
-	}
-	return true;
-}
-
-const char exts[] =
-	"Layout files (*.lay)|*.lay|"
-	"All files (*.*)|*.*|"
-;
-
-void LayoutDesigner::MakeCaption() {
-	String s;
-	if(layouti >= 0) {
-		s.Cat(layout[layouti].name);
-		if(!s.IsEmpty())
-			s.Cat(" - ");
-	}
-	s.Cat(filename.IsEmpty() ? "New layout file" : filename);
-	frame.Title(s);
-}
-
-bool LayoutDesigner::DoSave() {
-	if(filename.IsEmpty()) {
-		if(!SaveLayoutFileAs()) return false;
-	}
-	else
-		if(!SaveLayoutFile()) return false;
-	return true;
-}
-
-bool LayoutDesigner::PromptSave() {
-	return layout.GetCount() == 0
-	|| (!filename.IsEmpty() && GetLayoutFile() == LoadFile(filename))
-	|| !PromptYesNo("Save current file ?") || DoSave();
-}
-
-void LayoutDesigner::NewFile() {
-	if(!PromptSave()) return;
-	SetLayout(-1);
-	layout.Clear();
-	filename.Clear();
-	frame.Refresh();
-	MakeCaption();
-	SetupLayoutList();
-}
-
-void LayoutDesigner::OpenFile() {
-	if(!PromptSave()) return;
-	if(filesel.ExecuteOpen()) {
-		LoadLayoutFile(~filesel);
-		LruList.NewEntry(filename);
-	}
-}
-
-bool LayoutDesigner::SaveLayoutFileAs() {
-	filesel = filename;
-	if(!filesel.ExecuteSaveAs(NULL)) return false;
-	filename = filesel;
-	bool r = SaveLayoutFile();
-	if(r) LruList.NewEntry(filename);
-	MakeCaption();
-	return r;
-}
-
-void LayoutDesigner::SaveFileAs() {
-	SaveLayoutFileAs();
-}
-
-void LayoutDesigner::SaveFile() {
-	DoSave();
-}
-
-void LayoutDesigner::CloseFile() {
-	if(CloseLayoutFile())
-	{
-#ifdef flagIDERW
-		SetTimeCallback(0, THISBACK(CloseDesigner), 555);
-#endif
-	}
-}
-
-bool LayoutDesigner::CloseLayoutFile() {
-	if(layout.GetCount() && (filename.IsEmpty() || LoadFile(filename) != GetLayoutFile()))
-		switch(PromptYesNoCancel("Save current file ?")) {
-		case 1:
-			if(!DoSave()) return false;
-		case 0:
-			break;
-		default:
-			return false;
-		}
-	frame.Close();
-	return true;
-}
-
-void LayoutDesigner::LruOpen(const String& s) {
-	if(!PromptSave()) return;
-	LoadLayoutFile(s);
-}
-
-void LayoutDesigner::Serialize(Stream& s) {
-	int version = 1;
-	s.Magic();
-	s / version;
-	s % filesel;
-	LruList.Serialize(s);
-	splital.Serialize(s);
-	if(version == 0) {
-		Splitter d;
-		d.Serialize(s);
-	}
-	itab.SerializeHeader(s);
-	if(version >= 1)
-		frame.SerializePlacement(s);
-	else {
-		Rect r = frame.GetRect();
-		s % r;
-		frame.SetRect(r);
-	}
-	s % grid.x % grid.y;
-	s % ignoremin;
-	s % matrix.x % matrix.y % matrix.hspace % matrix.vspace;
-	s % usegrid;
-	s.Magic();
-}
+#include "Designer.h"
+
+static Point sReadAB(CParser& p) {
+	Point pt;
+	p.PassChar('(');
+	pt.x = p.ReadInt();
+	p.PassChar(',');
+	pt.y = p.ReadInt();
+	p.PassChar(')');
+	return pt;
+}
+
+static String ReadVar(CParser& p) {
+	String var;
+	for(;;) {
+		if(p.IsId())
+			var << p.ReadId();
+		else
+		if(p.IsInt())
+			var << p.ReadInt();
+		else
+		if(p.Char('.'))
+			var << '.';
+		else
+		if(p.Char('['))
+			var << '[';
+		else
+		if(p.Char(']'))
+			var << ']';
+		else
+			return var;
+	}
+}
+
+void LayoutDesigner::LoadCtrl(CParser& p, ItemInfo& ii, int li) {
+	if(p.Id("ITEM")) {
+		p.PassChar('(');
+		if(p.IsId()) ii.classname = p.ReadIdt();
+		p.PassChar(',');
+	}
+	else
+	if(p.Id("UNTYPED"))
+		p.PassChar('(');
+	else
+		p.ThrowError("Bad item.");
+	if(p.IsId()) ii.variable = ReadVar(p);
+	if(strncmp(ii.variable, "dv___", 5) == 0)
+		ii.variable.Clear();
+	p.PassChar(',');
+	LogPos pos;
+	do {
+		if(p.Id("LeftPosZ") || p.Id("LeftPos")) {
+			Point pt = sReadAB(p);
+			pos.x = PosLeft(pt.x, pt.y);
+		}
+		else
+		if(p.Id("RightPosZ") || p.Id("RightPos")) {
+			Point pt = sReadAB(p);
+			pos.x = PosRight(pt.x, pt.y);
+		}
+		else
+		if(p.Id("HSizePosZ") || p.Id("HSizePos")) {
+			Point pt = sReadAB(p);
+			pos.x = PosSize(pt.x, pt.y);
+		}
+		else
+		if(p.Id("HCenterPosZ") || p.Id("HCenterPos")) {
+			Point pt = sReadAB(p);
+			pos.x = PosCenter(pt.x, pt.y);
+		}
+		else
+		if(p.Id("TopPosZ") || p.Id("TopPos")) {
+			Point pt = sReadAB(p);
+			pos.y = PosLeft(pt.x, pt.y);
+		}
+		else
+		if(p.Id("BottomPosZ") || p.Id("BottomPos")) {
+			Point pt = sReadAB(p);
+			pos.y = PosRight(pt.x, pt.y);
+		}
+		else
+		if(p.Id("VSizePosZ") || p.Id("VSizePos")) {
+			Point pt = sReadAB(p);
+			pos.y = PosSize(pt.x, pt.y);
+		}
+		else
+		if(p.Id("VCenterPosZ") || p.Id("VCenterPos")) {
+			Point pt = sReadAB(p);
+			pos.y = PosCenter(pt.x, pt.y);
+		}
+		else
+		if(p.Id("SetLabel")) {
+			p.PassChar('(');
+			if(p.IsString())
+				ii.label.At(li) = p.ReadString();
+			else
+				ii.labelid = p.ReadId();
+			p.PassChar(')');
+		}
+		else
+		if(p.Id("HelpC") || p.Id("Help") || p.Id("Description")) {
+			p.PassChar('(');
+			if(p.IsString())
+				ii.help.At(li) = p.ReadString();
+			else
+				ii.helpid = p.ReadId();
+			p.PassChar(')');
+		}
+		else
+		if(p.Id("Hide")) {
+			p.PassChar('(');
+			p.PassChar(')');
+		}
+		else
+			p.ThrowError("Invalid item modifier.");
+	}
+	while(p.Char('.'));
+	p.PassChar(')');
+	ii.pos = pos;
+}
+
+void LayoutDesigner::LoadLayoutFile(const char *_filename) {
+	SetLayout(-1);
+	layout.Clear();
+	langlist.Clear();
+	try {
+		filename = _filename;
+		String s = LoadFile(filename);
+		CParser p(s);
+		if(p.Id("#ifdef"))
+			p.Id("LAYOUTFILE");
+		while(p.Id("LAYOUT")) {
+			p.PassChar('(');
+			String name = p.ReadId();
+			p.PassChar(',');
+			int cx = p.ReadInt();
+			p.PassChar(',');
+			int cy = p.ReadInt();
+			p.PassChar(')');
+			const char *a = p.GetPtr();
+			const char *b = a;
+			Form& l = layout.Add();
+			l.name = name;
+			l.size = Size(cx, cy);
+			while(!p.IsEof() && !p.Id("END_LAYOUT"))
+				LoadCtrl(p, l.item.Add());
+			while(*a == '\n' || *a == '\r')
+				a++;
+		}
+		p.Id("#endif");
+		while(p.Id("#if")) {
+			p.PassId("LANGUAGE");
+			p.PassChar2('=', '=');
+			String langid = p.ReadId();
+			CParser::Pos idpos = p.GetPos();
+			if(*idpos.ptr == '(')
+			{
+				const char *b = idpos.ptr;
+				while(*idpos.ptr && *idpos.ptr++ != ')')
+					;
+				langid.Cat(b, idpos.ptr - b);
+				p.SetPos(idpos);
+			}
+			langlist.Add(langlist.GetCount(), langid);
+			VectorMap<String, String> map;
+			while(p.Id("txt")) {
+				p.PassChar('(');
+				String& txt = map.Add("txt" + p.ReadId());
+				p.PassChar(',');
+				txt = p.ReadString();
+				p.PassChar(')');
+			}
+			p.PassId("#endif");
+			for(int i = 0; i < layout.GetCount(); i++) {
+				Form& l = layout[i];
+				for(int i = 0; i < l.item.GetCount(); i++) {
+					ItemInfo& ii = l.item[i];
+					ii.label.Add(map.Get(ii.labelid, String()));
+					ii.help.Add(map.Get(ii.helpid, String()));
+				}
+			}
+		}
+	}
+	catch(CParser::Error& e) {
+		Exclamation(e);
+		filename.Clear();
+	}
+	MakeCaption();
+	SetupLayoutList();
+	SetLayout(layout.GetCount() ? 0 : -1, 0);
+}
+
+String SaveText(String mod, const Vector<String>& txt, bool lang, const String& name, int ii) {
+	mod = '.' + mod +  '(';
+	if(lang) {
+		for(int i = 0; i < txt.GetCount(); i++)
+			if(!txt[i].IsEmpty())
+				return mod + name + Format("_%d", ii) + ')';
+		return String();
+	}
+	return txt.GetCount() && !txt[0].IsEmpty() ? mod + AsCString(txt[0]) + ')' : String();
+}
+
+String LayoutDesigner::SaveCtrl(const ItemInfo& ii, int i, const String& name, bool lang) const {
+	String out;
+	if(ii.classname.IsEmpty())
+		out << "\tUNTYPED(";
+	else
+		out << "\tITEM(" << ii.classname << ", ";
+	out << (ii.variable.IsEmpty() ? Format("dv___%d", i) : ii.variable) << ", ";
+	LogPos p = ii.pos;
+	const char *zfix = (qlib2_output ? "" : "Z");
+	switch(p.x.GetAlign()) {
+	case Ctrl::LEFT:   out << Format("LeftPos%s(%d, %d).", zfix, p.x.GetA(), p.x.GetB()); break;
+	case Ctrl::RIGHT:  out << Format("RightPos%s(%d, %d).", zfix, p.x.GetA(), p.x.GetB()); break;
+	case Ctrl::SIZE:   out << Format("HSizePos%s(%d, %d).", zfix, p.x.GetA(), p.x.GetB()); break;
+	case Ctrl::CENTER: out << Format("HCenterPos%s(%d, %d).", zfix, p.x.GetB(), p.x.GetA()); break;
+	}
+	switch(p.y.GetAlign()) {
+	case Ctrl::TOP:    out << Format("TopPos%s(%d, %d)", zfix, p.y.GetA(), p.y.GetB()); break;
+	case Ctrl::BOTTOM: out << Format("BottomPos%s(%d, %d)", zfix, p.y.GetA(), p.y.GetB()); break;
+	case Ctrl::SIZE:   out << Format("VSizePos%s(%d, %d)", zfix, p.y.GetA(), p.y.GetB()); break;
+	case Ctrl::CENTER: out << Format("VCenterPos%s(%d, %d)", zfix, p.y.GetB(), p.y.GetA()); break;
+	}
+	out << SaveText("SetLabel", ii.label, lang, "txt" + name, i);
+	out << SaveText(qlib2_output ? "HelpC" : "Description", ii.help, lang, "txt" + name + "_HLP", i);
+	if(IsLayoutRef(ii.classname) && ii.variable.IsEmpty())
+		out << ".Hide()";
+	out << ")\n";
+	return out;
+}
+
+String txtSave(int li, const Vector<String>& txt, int ii, String name) {
+	for(int i = 0; i < txt.GetCount(); i++)
+		if(!txt[i].IsEmpty()) {
+			String s;
+			if(li < txt.GetCount())
+				s = txt[li];
+			return "txt(" + name + Format("_%d", ii) + ", " + AsCString(s) + ")\n";
+		}
+	return String();
+}
+
+String LayoutDesigner::GetLayoutFile() const {
+	int i;
+	Vector<int> layindex;
+	layindex.SetCount(layout.GetCount());
+	for(i = 0; i < layout.GetCount(); i++)
+		layindex[i] = i;
+	int maxswaps = layout.GetCount() * layout.GetCount();
+	for(i = 0; maxswaps > 0 && i < layindex.GetCount(); i++)
+	{
+		int lx = layindex[i];
+		const Form& l = layout[lx];
+		int maxref = -1;
+		String dummy;
+		for(int c = 0; c < l.item.GetCount(); c++)
+			maxref = max(maxref, FindIndex(layindex, ParseLayoutRef(l.item[c].classname, dummy)));
+		if(maxref > i)
+		{
+			layindex.Remove(i);
+			layindex.Insert(maxref, lx);
+			i--;
+			maxswaps--;
+		}
+	}
+
+	StringStream out;
+	out << "#ifdef LAYOUTFILE\n\n";
+	for(i = 0; i < layindex.GetCount(); i++) {
+		const Form& l = layout[layindex[i]];
+		out << "LAYOUT(" << l.name << ", " << l.size.cx << ", " << l.size.cy << ")\n";
+		for(int c = 0; c < l.item.GetCount(); c++)
+			out << SaveCtrl(l.item[c], c, l.name, langlist.GetCount());
+		out << "END_LAYOUT\n\n";
+	}
+	out << "#endif\n";
+	for(int li = 0; li < langlist.GetCount(); li++) {
+		out << "\n#if LANGUAGE == " << String(langlist.GetValue(li)) << "\n\n";
+		for(int i = 0; i < layindex.GetCount(); i++) {
+			const Form& l = layout[layindex[i]];
+			for(int c = 0; c < l.item.GetCount(); c++) {
+				out << txtSave(li, l.item[c].label, c, l.name);
+				out << txtSave(li, l.item[c].help, c, l.name + "_HLP");
+			}
+			out << '\n';
+		}
+		out << "#endif\n";
+	}
+	return out;
+}
+
+bool LayoutDesigner::SaveLayoutFile() {
+	String lf = GetLayoutFile();
+	if(::LoadFile(filename) != lf && !::SaveFile(filename, lf)) {
+		Exclamation("Error storing output file " + filename);
+		return false;
+	}
+	return true;
+}
+
+const char exts[] =
+	"Layout files (*.lay)|*.lay|"
+	"All files (*.*)|*.*|"
+;
+
+void LayoutDesigner::MakeCaption() {
+	String s;
+	if(layouti >= 0) {
+		s.Cat(layout[layouti].name);
+		if(!s.IsEmpty())
+			s.Cat(" - ");
+	}
+	s.Cat(filename.IsEmpty() ? "New layout file" : filename);
+	frame.Title(s);
+}
+
+bool LayoutDesigner::DoSave() {
+	if(filename.IsEmpty()) {
+		if(!SaveLayoutFileAs()) return false;
+	}
+	else
+		if(!SaveLayoutFile()) return false;
+	return true;
+}
+
+bool LayoutDesigner::PromptSave() {
+	return layout.GetCount() == 0
+	|| (!filename.IsEmpty() && GetLayoutFile() == LoadFile(filename))
+	|| !PromptYesNo("Save current file ?") || DoSave();
+}
+
+void LayoutDesigner::NewFile() {
+	if(!PromptSave()) return;
+	SetLayout(-1);
+	layout.Clear();
+	filename.Clear();
+	frame.Refresh();
+	MakeCaption();
+	SetupLayoutList();
+}
+
+void LayoutDesigner::OpenFile() {
+	if(!PromptSave()) return;
+	if(filesel.ExecuteOpen()) {
+		LoadLayoutFile(~filesel);
+		LruList.NewEntry(filename);
+	}
+}
+
+bool LayoutDesigner::SaveLayoutFileAs() {
+	filesel = filename;
+	if(!filesel.ExecuteSaveAs(NULL)) return false;
+	filename = filesel;
+	bool r = SaveLayoutFile();
+	if(r) LruList.NewEntry(filename);
+	MakeCaption();
+	return r;
+}
+
+void LayoutDesigner::SaveFileAs() {
+	SaveLayoutFileAs();
+}
+
+void LayoutDesigner::SaveFile() {
+	DoSave();
+}
+
+void LayoutDesigner::CloseFile() {
+	if(CloseLayoutFile())
+	{
+#ifdef flagIDERW
+		SetTimeCallback(0, THISBACK(CloseDesigner), 555);
+#endif
+	}
+}
+
+bool LayoutDesigner::CloseLayoutFile() {
+	if(layout.GetCount() && (filename.IsEmpty() || LoadFile(filename) != GetLayoutFile()))
+		switch(PromptYesNoCancel("Save current file ?")) {
+		case 1:
+			if(!DoSave()) return false;
+		case 0:
+			break;
+		default:
+			return false;
+		}
+	frame.Close();
+	return true;
+}
+
+void LayoutDesigner::LruOpen(const String& s) {
+	if(!PromptSave()) return;
+	LoadLayoutFile(s);
+}
+
+void LayoutDesigner::Serialize(Stream& s) {
+	int version = 1;
+	s.Magic();
+	s / version;
+	s % filesel;
+	LruList.Serialize(s);
+	splital.Serialize(s);
+	if(version == 0) {
+		Splitter d;
+		d.Serialize(s);
+	}
+	itab.SerializeHeader(s);
+	if(version >= 1)
+		frame.SerializePlacement(s);
+	else {
+		Rect r = frame.GetRect();
+		s % r;
+		frame.SetRect(r);
+	}
+	s % grid.x % grid.y;
+	s % ignoremin;
+	s % matrix.x % matrix.y % matrix.hspace % matrix.vspace;
+	s % usegrid;
+	s.Magic();
+}
diff --git a/uppsrc2/rw/DesignerLayt.cpp b/archive/uppsrc/rw/DesignerLayt.cpp
similarity index 95%
rename from uppsrc2/rw/DesignerLayt.cpp
rename to archive/uppsrc/rw/DesignerLayt.cpp
index 220dced5f..a3d7ae9dc 100644
--- a/uppsrc2/rw/DesignerLayt.cpp
+++ b/archive/uppsrc/rw/DesignerLayt.cpp
@@ -1,106 +1,106 @@
-#include "Designer.h"
-
-void LayoutDesigner::SetLayout(int i, int li) {
-	ClearSelection();
-	layouti = i;
-	layoutlist = i;
-	langi = li;
-	if(langlist.GetCount())
-		langlist = li;
-	itab.Clear();
-	if(layouti >= 0) {
-		Form& l = layout[layouti];
-		SetFormSize(l.size);
-		SynchronizeCtrls();
-	}
-	else {
-		ctrl.Clear();
-		ref_ctrl.Clear();
-		mnem_ctrl.Clear();
-		form.Hide();
-		itab.Clear();
-	}
-	sb = Point(0, 0);
-	form.Show(layouti >= 0);
-	MakeCaption();
-	ShowStatus();
-	langlist.Enable(langlist.GetCount());
-	SynchronizeMnemonic();
-}
-
-void LayoutDesigner::EnterLayout() {
-	SetLayout(~layoutlist, langlist.GetCount() ? langlist.GetIndex() : 0);
-}
-
-void LayoutDesigner::EnterLanguage() {
-	int i = -1;
-	if(itemi.GetCount())
-		i = itemi.Top();
-	EnterLayout();
-	SelectOneItem(i);
-}
-
-void LayoutDesigner::SetupLayoutList() {
-	layoutlist.Clear();
-	int i;
-	for(i = 0; i < layout.GetCount(); i++)
-		layoutlist.Add(i, layout[i].name);
-	layoutlist.Enable(i);
-}
-
-int FilterCid(int c) {
-	return IsAlNum(c) || c == '_' ? c : 0;
-}
-
-void LayoutDesigner::NewLayout() {
-	WithLayoutLayout<TopWindow> dlg;
-	CtrlLayoutOKCancel(dlg, "New Layout");
-	dlg.layout.SetFilter(FilterCid);
-	dlg.ActiveFocus(dlg.layout);
-	if(dlg.Run() == IDOK) {
-		int i = layout.GetCount();
-		Form& l = layout.Add();
-		l.name = dlg.layout;
-		l.size = Size(400, 200);
-		SetupLayoutList();
-		SetLayout(i);
-	}
-}
-
-void LayoutDesigner::RemoveLayout() {
-	if(layouti < 0) return;
-	if(PromptYesNo("Remove current layout ?")) {
-		int i = layouti;
-		SetLayout(-1);
-		layout.Remove(i);
-		SetupLayoutList();
-		SetLayout(min(i, layout.GetCount() - 1));
-		Refresh();
-	}
-}
-
-void LayoutDesigner::RenameLayout() {
-	if(layouti < 0) return;
-	WithLayoutLayout<TopWindow> dlg;
-	CtrlLayoutOKCancel(dlg, "Rename Layout");
-	dlg.ActiveFocus(dlg.layout);
-	dlg.layout.SetFilter(FilterCid);
-	dlg.layout = layout[layouti].name;
-	if(dlg.Run() == IDOK) {
-		layout[layouti].name = dlg.layout;
-		SetupLayoutList();
-		SetLayout(layouti);
-	}
-}
-
-void  LayoutDesigner::NextLayout() {
-	if(layoutlist.GetCount() == 0) return;
-	layoutlist.SetIndex((layoutlist.GetIndex() + 1) % layoutlist.GetCount());
-	EnterLayout();
-}
-
-void  LayoutDesigner::PrevLayout() {
-	if(layoutlist.GetCount() == 0) return;
-	layoutlist.SetIndex((layoutlist.GetIndex() + layoutlist.GetCount() - 1) % layoutlist.GetCount());
-	EnterLayout();
-}
+#include "Designer.h"
+
+void LayoutDesigner::SetLayout(int i, int li) {
+	ClearSelection();
+	layouti = i;
+	layoutlist = i;
+	langi = li;
+	if(langlist.GetCount())
+		langlist = li;
+	itab.Clear();
+	if(layouti >= 0) {
+		Form& l = layout[layouti];
+		SetFormSize(l.size);
+		SynchronizeCtrls();
+	}
+	else {
+		ctrl.Clear();
+		ref_ctrl.Clear();
+		mnem_ctrl.Clear();
+		form.Hide();
+		itab.Clear();
+	}
+	sb = Point(0, 0);
+	form.Show(layouti >= 0);
+	MakeCaption();
+	ShowStatus();
+	langlist.Enable(langlist.GetCount());
+	SynchronizeMnemonic();
+}
+
+void LayoutDesigner::EnterLayout() {
+	SetLayout(~layoutlist, langlist.GetCount() ? langlist.GetIndex() : 0);
+}
+
+void LayoutDesigner::EnterLanguage() {
+	int i = -1;
+	if(itemi.GetCount())
+		i = itemi.Top();
+	EnterLayout();
+	SelectOneItem(i);
+}
+
+void LayoutDesigner::SetupLayoutList() {
+	layoutlist.Clear();
+	int i;
+	for(i = 0; i < layout.GetCount(); i++)
+		layoutlist.Add(i, layout[i].name);
+	layoutlist.Enable(i);
+}
+
+int FilterCid(int c) {
+	return IsAlNum(c) || c == '_' ? c : 0;
+}
+
+void LayoutDesigner::NewLayout() {
+	WithLayoutLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "New Layout");
+	dlg.layout.SetFilter(FilterCid);
+	dlg.ActiveFocus(dlg.layout);
+	if(dlg.Run() == IDOK) {
+		int i = layout.GetCount();
+		Form& l = layout.Add();
+		l.name = dlg.layout;
+		l.size = Size(400, 200);
+		SetupLayoutList();
+		SetLayout(i);
+	}
+}
+
+void LayoutDesigner::RemoveLayout() {
+	if(layouti < 0) return;
+	if(PromptYesNo("Remove current layout ?")) {
+		int i = layouti;
+		SetLayout(-1);
+		layout.Remove(i);
+		SetupLayoutList();
+		SetLayout(min(i, layout.GetCount() - 1));
+		Refresh();
+	}
+}
+
+void LayoutDesigner::RenameLayout() {
+	if(layouti < 0) return;
+	WithLayoutLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "Rename Layout");
+	dlg.ActiveFocus(dlg.layout);
+	dlg.layout.SetFilter(FilterCid);
+	dlg.layout = layout[layouti].name;
+	if(dlg.Run() == IDOK) {
+		layout[layouti].name = dlg.layout;
+		SetupLayoutList();
+		SetLayout(layouti);
+	}
+}
+
+void  LayoutDesigner::NextLayout() {
+	if(layoutlist.GetCount() == 0) return;
+	layoutlist.SetIndex((layoutlist.GetIndex() + 1) % layoutlist.GetCount());
+	EnterLayout();
+}
+
+void  LayoutDesigner::PrevLayout() {
+	if(layoutlist.GetCount() == 0) return;
+	layoutlist.SetIndex((layoutlist.GetIndex() + layoutlist.GetCount() - 1) % layoutlist.GetCount());
+	EnterLayout();
+}
diff --git a/uppsrc2/rw/DesignerWin.cpp b/archive/uppsrc/rw/DesignerWin.cpp
similarity index 96%
rename from uppsrc2/rw/DesignerWin.cpp
rename to archive/uppsrc/rw/DesignerWin.cpp
index bf238209d..788f616fd 100644
--- a/uppsrc2/rw/DesignerWin.cpp
+++ b/archive/uppsrc/rw/DesignerWin.cpp
@@ -1,374 +1,374 @@
-#include "Designer.h"
-#pragma hdrstop
-#include "iderw.h"
-
-void LayoutDesigner::SetupGrid() {
-	CtrlLayoutOKCancel(grid, "Grid settings");
-	grid.x.MinMax(1, 32);
-	grid.y.MinMax(1, 32);
-	grid.Backup();
-	grid.Execute();
-}
-
-void LayoutDesigner::FileBar(Bar& bar) {
-	bar.Add("New", THISBACK(NewFile))
-		.Key(K_CTRL_N);
-	bar.Add("Open..", THISBACK(OpenFile))
-		.Key(K_CTRL_O);
-	bar.Add("Save", THISBACK(SaveFile))
-		.Key(K_CTRL_S);
-	bar.Add("Save as..", THISBACK(SaveFileAs));
-	LruList(bar);
-	bar.MenuSeparator();
-	bar.Add(
-#ifdef flagIDERW
-	"Close"
-#else
-	"Exit"
-#endif
-	, THISBACK(CloseFile));
-}
-
-void LayoutDesigner::EditBar(Bar& bar) {
-	bar.Add("Cut", CtrlImg::cut(), THISBACK(Cut))
-		.Key(K_CTRL_X);
-	bar.Add("Copy", CtrlImg::copy(), THISBACK(Copy))
-		.Key(K_CTRL_C);
-	bar.Add("Paste", CtrlImg::paste(), THISBACK(Paste))
-		.Key(K_CTRL_V);
-	bar.Add("Duplicate", THISBACK(Duplicate))
-		.Key(K_CTRL_D);
-	bar.Add("Delete", CtrlImg::remove(), THISBACK(Delete))
-		.Key(K_DELETE);
-	bar.MenuSeparator();
-	bar.Add("Select All", THISBACK(SelectAll))
-		.Key(K_CTRL_A);
-}
-
-void LayoutDesigner::LayoutBar(Bar& bar) {
-	bar.Add("New layout..", THISBACK(NewLayout));
-	bar.Add(layoutlist.GetCount(), "Remove layout", THISBACK(RemoveLayout));
-	bar.Add(layoutlist.GetCount(), "Rename layout..", THISBACK(RenameLayout));
-	if(layoutlist.GetCount() > 1) {
-		bar.Separator();
-		bar.Add("Previous layout", THISBACK(PrevLayout))
-			.Key(K_ALT_UP);
-		bar.Add("Next layout", THISBACK(NextLayout))
-			.Key(K_ALT_DOWN);
-	}
-}
-
-void LayoutDesigner::LangBar(Bar& bar) {
-	bar.Add("New language..", THISBACK(NewLanguage));
-	bar.Add(langlist.GetCount(), "Remove language", THISBACK(RemoveLanguage));
-	bar.Add(langlist.GetCount(), "Rename language..", THISBACK(RenameLanguage));
-	if(langlist.GetCount() > 1) {
-		bar.Separator();
-		bar.Add("Previous language", THISBACK(PrevLang))
-			.Key(K_ALT_LEFT);
-		bar.Add("Next language", THISBACK(NextLang))
-			.Key(K_ALT_RIGHT);
-	}
-}
-
-void LayoutDesigner::OptionsBar(Bar& bar) {
-	bar.Add("Alias map", THISBACK(SetupAlias));
-	bar.Add("Use grid", TB_GRID(), THISBACK(ToggleGrid))
-		.Check(usegrid);
-	bar.Add("Grid settings..", THISBACK(SetupGrid));
-	bar.Add("Ignore min size", THISBACK(ToggleIgnoreMin))
-		.Check(ignoremin);
-	bar.Add("QLIB2 output", THISBACK(ToggleQLIB2Output))
-		.Check(qlib2_output);
-}
-
-void LayoutDesigner::AlignBar(Bar& bar) {
-	int m = itemi.GetCount();
-	bar.Add(m, "Vertical center in layout", TB_VERTCENTER(), THISBACK(VertCenter))
-		.Key(K_CTRL_F9);
-	bar.Add(m, "Align label", TB_ALIGNLBL(), THISBACK(AlignLbl))
-		.Key(K_ALT_F9);
-	bar.Add(m, "Horizontal center in layout", TB_HORZCENTER(), THISBACK(HorzCenter))
-		.Key(K_CTRL|K_SHIFT_F9);
-	bar.Separator();
-	bar.Add(m > 1, "Left", TB_ALIGNLEFT(), THISBACK(AlignLeft))
-		.Key(K_ALT_LEFT);
-	bar.Add(m > 1, "Horizontal center", TB_ALIGNHCENTER(), THISBACK(AlignHCenter))
-		.Key(K_SHIFT_F9);
-	bar.Add(m > 1, "Right", TB_ALIGNRIGHT(), THISBACK(AlignRight))
-		.Key(K_ALT_RIGHT);
-	bar.Separator();
-	bar.Add(m > 1, "Top", TB_ALIGNTOP(), THISBACK(AlignTop))
-		.Key(K_ALT_UP);
-	bar.Add(m > 1, "Vertical center", TB_ALIGNVCENTER(), THISBACK(AlignVCenter))
-		.Key(K_F9);
-	bar.Add(m > 1, "Bottom", TB_ALIGNBOTTOM(), THISBACK(AlignBottom))
-		.Key(K_ALT_DOWN);
-}
-
-void LayoutDesigner::SizeBar(Bar& bar) {
-	int m = itemi.GetCount();
-	bar.Add(m > 1, "Same width", TB_SAMEWIDTH(), THISBACK(SameWidth))
-		.Key(K_SHIFT_F8);
-	bar.Add(m > 1, "Same height", TB_SAMEHEIGHT(), THISBACK(SameHeight))
-		.Key(K_CTRL_F8);
-	bar.Add(m > 1, "Same size", TB_SAMESIZE(), THISBACK(SameSize))
-		.Key(K_F8);
-	bar.Add(m, "Minimal width", TB_MINWIDTH(), THISBACK(MinWidth))
-		.Key(K_SHIFT_F7);
-	bar.Add(m, "Minimal height", TB_MINHEIGHT(), THISBACK(MinHeight))
-		.Key(K_CTRL_F7);
-}
-
-void LayoutDesigner::SpringsBar(Bar& bar) {
-	bool m = !itemi.IsEmpty();
-	int im = GetItemPosMask();
-	bar.Add(m, "Left", TB_SPRINGLEFT(), THISBACK1(ItemPos, MAKELONG(POS_LEFT, POS_NONE)))
-		.Check(im & MAKELONG(1 << POS_LEFT, 0));
-	bar.Add(m, "Right", TB_SPRINGRIGHT(), THISBACK1(ItemPos, MAKELONG(POS_RIGHT, POS_NONE)))
-		.Check(im & MAKELONG(1 << POS_RIGHT, 0));
-	bar.Add(m, "Horz size", TB_SPRINGHSIZE(), THISBACK1(ItemPos, MAKELONG(POS_SIZE, POS_NONE)))
-		.Check(im & MAKELONG(1 << POS_SIZE, 0));
-	bar.Add(m, "Horz center", TB_SPRINGHCENTER(), THISBACK1(ItemPos, MAKELONG(POS_CENTER, POS_NONE)))
-		.Check(im & MAKELONG(1 << POS_CENTER, 0));
-	bar.Separator();
-	bar.Add(m, "Top", TB_SPRINGTOP(), THISBACK1(ItemPos, MAKELONG(POS_NONE, POS_TOP)))
-		.Check(im & MAKELONG(0, 1 << POS_TOP));
-	bar.Add(m, "Bottom", TB_SPRINGBOTTOM(), THISBACK1(ItemPos, MAKELONG(POS_NONE, POS_BOTTOM)))
-		.Check(im & MAKELONG(0, 1 << POS_BOTTOM));
-	bar.Add(m, "Vert size", TB_SPRINGVSIZE(), THISBACK1(ItemPos, MAKELONG(POS_NONE, POS_SIZE)))
-		.Check(im & MAKELONG(0, 1 << POS_SIZE));
-	bar.Add(m, "Vert center", TB_SPRINGVCENTER(), THISBACK1(ItemPos, MAKELONG(POS_NONE, POS_CENTER)))
-		.Check(im & MAKELONG(0, 1 << POS_CENTER));
-	bar.Separator();
-	bar.Add(m, "Auto springs", TB_SPRINGAUTO(), THISBACK1(ItemPos, MAKELONG(POS_AUTO, POS_AUTO)))
-		.Key(K_CTRL_R);
-	bar.Add(m, "Topleft springs", TB_SPRINGTOPLEFT(), THISBACK1(ItemPos, MAKELONG(POS_LEFT, POS_TOP)))
-		.Key(im == MAKELONG(1 << POS_LEFT, 1 << POS_TOP));
-}
-
-void LayoutDesigner::ItemBar(Bar& bar) {
-	int m = itemi.GetCount();
-	bar.Add(layouti >= 0, "New item", THISBACK(AddItem))
-		.Key(K_ENTER);
-	bar.Add(m, "Remove item", THISBACK(Delete))
-		.Key(K_DELETE);
-	bar.Add(m, "Move item up", THISBACK(MoveUp))
-		.Key(K_CTRL_UP);
-	bar.Add(m, "Move item down", THISBACK(MoveDown))
-		.Key(K_CTRL_DOWN);
-	bar.MenuSeparator();
-	bar.Add("Alignment", THISBACK(AlignBar));
-	bar.Add("Size", THISBACK(SizeBar));
-	bar.Add("Springs", THISBACK(SpringsBar));
-	bar.MenuSeparator();
-	bar.Add(m, "Matrix..", THISBACK(Matrix))
-		.Key(K_CTRL_M);
-}
-
-void LayoutDesigner::MainBar(Bar& bar) {
-	bar.Add("File", THISBACK(FileBar));
-	bar.Add("Edit", THISBACK(EditBar));
-	bar.Add("Layout", THISBACK(LayoutBar));
-	bar.Add("Language", THISBACK(LangBar));
-	bar.Add("Item", THISBACK(ItemBar));
-	bar.Add("Options", THISBACK(OptionsBar));
-}
-
-void LayoutDesigner::Tool(Bar& bar) {
-	EditBar(bar);
-//	bar.Separator();
-	ItemBar(bar);
-	bar.Separator();
-	OptionsBar(bar);
-	bar.Break();
-	bar.Add(layoutlist, 200);
-	bar.Gap();
-	bar.Add(langlist, 100);
-}
-
-void LayoutDesigner::OpenWindow() {
-	if(!frame.IsOpen()) {
-		alias_map_file = AliasMap::StdFileName();
-		alias_map.Load(alias_map_file);
-		if(alias_map.IsEmpty())
-			alias_map.SetDefault();
-		UpdateClassList();
-		frame.OpenMain();
-		MakeCaption();
-	}
-}
-
-void LayoutDesigner::Execute() {
-//	frame.SetRect(100, 100, 700, 500);
-#ifndef flagIDERW
-	LoadFromFile(*this);
-#endif
-	OpenWindow();
-	frame.Run();
-#ifndef flagIDERW
-	StoreToFile(*this);
-#endif
-	if(!alias_map.Save(alias_map_file))
-		Exclamation(NFormat("Error updating alias file [* \1%s\1].", alias_map_file));
-}
-
-void LayoutDesigner::UpdateClassList() {
-	Vector<String> avail_classes;
-	Append(avail_classes, ClassMap().GetKeys());
-	Append(avail_classes, alias_map.obj_source);
-	Sort(avail_classes, StdLess<String>());
-	classname.ClearList();
-	for(int i = 0; i < avail_classes.GetCount(); i++)
-		classname.AddList(avail_classes[i]);
-}
-
-void LayoutDesigner::SetBar()
-{
-	toolbar.Set(THISBACK(Tool));
-}
-
-LayoutDesigner::LayoutDesigner() {
-	int ehg = EditField::GetStdHeight();
-	VSizePos(0, 0).HSizePos(0, 0);
-	form.IgnoreMouse();
-	form.ld = this;
-	Add(form);
-	apaint.VSizePos(0, 0).HSizePos(0, 0).Transparent().IgnoreMouse();
-	apaint.ld = this;
-	itab.NoWantFocus();
-	itab.AddColumn("class");
-	itab.AddColumn("var / label").SetDisplay(VarLblDisplay(false)).Add(2);
-	itab.AddIndex();
-	itab.WhenLeftClick = THISBACK(WhenITab);
-	props.Vert(itab, label_help_split);
-	props.SetPos(6000);
-	class_var_lbl.NoWantFocus().Transparent();
-	class_var_lbl.Add(classname.TopPos(0, ehg).HSizePos(0, 88));
-	class_var_lbl.Add(variable.TopPos(0, ehg).RightPos(0, 80));
-	class_var_lbl.Add(label.VSizePos(ehg + 4, 0).HSizePos());
-	label_help_split.Vert(class_var_lbl, help);
-//	props.Add(itab.VSizePos(0, ehg + 8 + 60 + 8 + 60 + 8).HSizePos());
-//	props.Add(classname.BottomPos(60 + 8 + 60 + 8, STDSIZE).HSizePos(0, 88));
-//	props.Add(variable.BottomPos(60 + 8 + 60 + 8, STDSIZE).RightPos(0, 80));
-//	props.Add(label.BottomPos(60 + 8, 60).HSizePos());
-//	props.Add(help.BottomPos(0, 60).HSizePos());
-	classname.WhenAction = THISBACK(NewClass);
-	classname.SetDropLines(24);
-	variable.WhenAction = THISBACK(NewVariable);
-	variable.ClickSelect();
-	label.WhenAction = THISBACK(NewLabel);
-	help.WhenAction = THISBACK(NewHelp);
-	classset = THISBACK(NewCtrl);
-	layoutlist.WhenAction = THISBACK(EnterLayout);
-	layoutlist.SizePos();
-//	layoutlist.LeftPos(0, 150).TopPos(ehg + 11, ehg);
-	layouti = -1;
-
-	langlist.WhenAction = THISBACK(EnterLanguage);
-	langlist.SizePos();
-//	langlist.LeftPos(150, 150).TopPos(ehg + 11, ehg);
-	langi = 0;
-
-	form.Hide();
-	sb.WhenScroll = THISBACK(Scroll);
-//	menubar.TopPos(0, ehg + 4).HSizePos(0, 0);
-//	toolbar.HSizePos(300, 0).TopPos(ehg + 8, 24).SetFrame(NullFrame());
-	frame.ld = this;
-	frame.Sizeable().Zoomable().Icon(RwIconSmall(), RwIconLarge()); //.HelpBox(); // todo? or not to do?
-	frame.AddFrame(menubar);
-	frame.AddFrame(toolbar);
-	frame.WhenClose = THISBACK(CloseFile);
-//	status.TopPos(0, ehg + 4).HSizePos(0, 0);
-	status.NoTransparent();
-	menubar.AddFrame(status);
-	SetBar();
-	menubar.Set(THISBACK(MainBar));
-	design.SetFrame(InsetFrame());
-	design.AddFrame(sb);
-	design.Add(*this);
-	design.Add(apaint);
-//	splital.VSizePos(2 * EditField::GetStdHeight() + 16, 0);
-	splital.Horz(props, design);
-	splital.SetPos(3000);
-	frame.Add(splital.SizePos());
-	SetLayout(-1);
-	LruList.WhenSelect = THISBACK(LruOpen);
-	grid.x <<= grid.y <<= 2;
-	matrix.x <<= matrix.y <<= 1;
-	matrix.vspace <<= matrix.hspace <<= 0;
-	CtrlLayoutOKCancel(matrix, "Matrix duplication");
-	matrix.x.MinMax(1, 10);
-	matrix.y.MinMax(1, 10);
-	ignoremin = false;
-	qlib2_output = false;
-	moved = false;
-	usegrid = true;
-//	frame.HelpBox().CommentBox(); // todo? or not to do?
-	filesel.Type("Layout files (*.lay)", "*.lay").Type("All files (*.*)", "*.*")
-		   .DefaultExt("lay");
-	layoutlist.Disable();
-}
-
-static Array<LayoutDesigner>& GetDesigners() {
-	static Array<LayoutDesigner> list;
-	return list;
-}
-
-#ifdef flagIDERW
-void LayoutDesigner::CloseDesigner() {
-	Array<LayoutDesigner>& list = GetDesigners();
-	for(int i = 0; i < list.GetCount(); i++)
-		if(&list[i] == this)
-		{
-			list.Remove(i);
-			return;
-		}
-}
-#endif
-
-bool CloseDesignLayout() {
-	Array<LayoutDesigner>& list = GetDesigners();
-	while(!list.IsEmpty())
-	{
-		if(!list[0].CloseLayoutFile())
-			return false;
-		list.Remove(0);
-	}
-	return true;
-}
-
-bool SaveDesignLayout() {
-	Array<LayoutDesigner>& list = GetDesigners();
-	bool is_ok = true;
-	for(int i = 0; i < list.GetCount(); i++)
-		if(!list[i].SaveLayoutFile())
-			is_ok = false;
-	return is_ok;
-}
-
-void DesignLayout(String open_file) {
-	Array<LayoutDesigner>& list = GetDesigners();
-	for(int i = 0; i < list.GetCount(); i++)
-		if(!CompareNoCase(list[i].GetFileName(), open_file))
-		{
-			list[i].SetWantFocus();
-			return;
-		}
-	LayoutDesigner& ld = list.Add();
-	ld.OpenWindow();
-	ld.LoadLayoutFile(open_file);
-}
-
-Image GetRwIcon() {
-	return RwIconSmall();
-}
-
-#ifndef flagIDERW
-void AppMain()
-{
-	SetDefaultCharset(CHARSET_WIN1250);
-	LayoutDesigner ld;
-	ld.Execute();
-}
-#endif//flagIDERW
+#include "Designer.h"
+#pragma hdrstop
+#include "iderw.h"
+
+void LayoutDesigner::SetupGrid() {
+	CtrlLayoutOKCancel(grid, "Grid settings");
+	grid.x.MinMax(1, 32);
+	grid.y.MinMax(1, 32);
+	grid.Backup();
+	grid.Execute();
+}
+
+void LayoutDesigner::FileBar(Bar& bar) {
+	bar.Add("New", THISBACK(NewFile))
+		.Key(K_CTRL_N);
+	bar.Add("Open..", THISBACK(OpenFile))
+		.Key(K_CTRL_O);
+	bar.Add("Save", THISBACK(SaveFile))
+		.Key(K_CTRL_S);
+	bar.Add("Save as..", THISBACK(SaveFileAs));
+	LruList(bar);
+	bar.MenuSeparator();
+	bar.Add(
+#ifdef flagIDERW
+	"Close"
+#else
+	"Exit"
+#endif
+	, THISBACK(CloseFile));
+}
+
+void LayoutDesigner::EditBar(Bar& bar) {
+	bar.Add("Cut", CtrlImg::cut(), THISBACK(Cut))
+		.Key(K_CTRL_X);
+	bar.Add("Copy", CtrlImg::copy(), THISBACK(Copy))
+		.Key(K_CTRL_C);
+	bar.Add("Paste", CtrlImg::paste(), THISBACK(Paste))
+		.Key(K_CTRL_V);
+	bar.Add("Duplicate", THISBACK(Duplicate))
+		.Key(K_CTRL_D);
+	bar.Add("Delete", CtrlImg::remove(), THISBACK(Delete))
+		.Key(K_DELETE);
+	bar.MenuSeparator();
+	bar.Add("Select All", THISBACK(SelectAll))
+		.Key(K_CTRL_A);
+}
+
+void LayoutDesigner::LayoutBar(Bar& bar) {
+	bar.Add("New layout..", THISBACK(NewLayout));
+	bar.Add(layoutlist.GetCount(), "Remove layout", THISBACK(RemoveLayout));
+	bar.Add(layoutlist.GetCount(), "Rename layout..", THISBACK(RenameLayout));
+	if(layoutlist.GetCount() > 1) {
+		bar.Separator();
+		bar.Add("Previous layout", THISBACK(PrevLayout))
+			.Key(K_ALT_UP);
+		bar.Add("Next layout", THISBACK(NextLayout))
+			.Key(K_ALT_DOWN);
+	}
+}
+
+void LayoutDesigner::LangBar(Bar& bar) {
+	bar.Add("New language..", THISBACK(NewLanguage));
+	bar.Add(langlist.GetCount(), "Remove language", THISBACK(RemoveLanguage));
+	bar.Add(langlist.GetCount(), "Rename language..", THISBACK(RenameLanguage));
+	if(langlist.GetCount() > 1) {
+		bar.Separator();
+		bar.Add("Previous language", THISBACK(PrevLang))
+			.Key(K_ALT_LEFT);
+		bar.Add("Next language", THISBACK(NextLang))
+			.Key(K_ALT_RIGHT);
+	}
+}
+
+void LayoutDesigner::OptionsBar(Bar& bar) {
+	bar.Add("Alias map", THISBACK(SetupAlias));
+	bar.Add("Use grid", TB_GRID(), THISBACK(ToggleGrid))
+		.Check(usegrid);
+	bar.Add("Grid settings..", THISBACK(SetupGrid));
+	bar.Add("Ignore min size", THISBACK(ToggleIgnoreMin))
+		.Check(ignoremin);
+	bar.Add("QLIB2 output", THISBACK(ToggleQLIB2Output))
+		.Check(qlib2_output);
+}
+
+void LayoutDesigner::AlignBar(Bar& bar) {
+	int m = itemi.GetCount();
+	bar.Add(m, "Vertical center in layout", TB_VERTCENTER(), THISBACK(VertCenter))
+		.Key(K_CTRL_F9);
+	bar.Add(m, "Align label", TB_ALIGNLBL(), THISBACK(AlignLbl))
+		.Key(K_ALT_F9);
+	bar.Add(m, "Horizontal center in layout", TB_HORZCENTER(), THISBACK(HorzCenter))
+		.Key(K_CTRL|K_SHIFT_F9);
+	bar.Separator();
+	bar.Add(m > 1, "Left", TB_ALIGNLEFT(), THISBACK(AlignLeft))
+		.Key(K_ALT_LEFT);
+	bar.Add(m > 1, "Horizontal center", TB_ALIGNHCENTER(), THISBACK(AlignHCenter))
+		.Key(K_SHIFT_F9);
+	bar.Add(m > 1, "Right", TB_ALIGNRIGHT(), THISBACK(AlignRight))
+		.Key(K_ALT_RIGHT);
+	bar.Separator();
+	bar.Add(m > 1, "Top", TB_ALIGNTOP(), THISBACK(AlignTop))
+		.Key(K_ALT_UP);
+	bar.Add(m > 1, "Vertical center", TB_ALIGNVCENTER(), THISBACK(AlignVCenter))
+		.Key(K_F9);
+	bar.Add(m > 1, "Bottom", TB_ALIGNBOTTOM(), THISBACK(AlignBottom))
+		.Key(K_ALT_DOWN);
+}
+
+void LayoutDesigner::SizeBar(Bar& bar) {
+	int m = itemi.GetCount();
+	bar.Add(m > 1, "Same width", TB_SAMEWIDTH(), THISBACK(SameWidth))
+		.Key(K_SHIFT_F8);
+	bar.Add(m > 1, "Same height", TB_SAMEHEIGHT(), THISBACK(SameHeight))
+		.Key(K_CTRL_F8);
+	bar.Add(m > 1, "Same size", TB_SAMESIZE(), THISBACK(SameSize))
+		.Key(K_F8);
+	bar.Add(m, "Minimal width", TB_MINWIDTH(), THISBACK(MinWidth))
+		.Key(K_SHIFT_F7);
+	bar.Add(m, "Minimal height", TB_MINHEIGHT(), THISBACK(MinHeight))
+		.Key(K_CTRL_F7);
+}
+
+void LayoutDesigner::SpringsBar(Bar& bar) {
+	bool m = !itemi.IsEmpty();
+	int im = GetItemPosMask();
+	bar.Add(m, "Left", TB_SPRINGLEFT(), THISBACK1(ItemPos, MAKELONG(POS_LEFT, POS_NONE)))
+		.Check(im & MAKELONG(1 << POS_LEFT, 0));
+	bar.Add(m, "Right", TB_SPRINGRIGHT(), THISBACK1(ItemPos, MAKELONG(POS_RIGHT, POS_NONE)))
+		.Check(im & MAKELONG(1 << POS_RIGHT, 0));
+	bar.Add(m, "Horz size", TB_SPRINGHSIZE(), THISBACK1(ItemPos, MAKELONG(POS_SIZE, POS_NONE)))
+		.Check(im & MAKELONG(1 << POS_SIZE, 0));
+	bar.Add(m, "Horz center", TB_SPRINGHCENTER(), THISBACK1(ItemPos, MAKELONG(POS_CENTER, POS_NONE)))
+		.Check(im & MAKELONG(1 << POS_CENTER, 0));
+	bar.Separator();
+	bar.Add(m, "Top", TB_SPRINGTOP(), THISBACK1(ItemPos, MAKELONG(POS_NONE, POS_TOP)))
+		.Check(im & MAKELONG(0, 1 << POS_TOP));
+	bar.Add(m, "Bottom", TB_SPRINGBOTTOM(), THISBACK1(ItemPos, MAKELONG(POS_NONE, POS_BOTTOM)))
+		.Check(im & MAKELONG(0, 1 << POS_BOTTOM));
+	bar.Add(m, "Vert size", TB_SPRINGVSIZE(), THISBACK1(ItemPos, MAKELONG(POS_NONE, POS_SIZE)))
+		.Check(im & MAKELONG(0, 1 << POS_SIZE));
+	bar.Add(m, "Vert center", TB_SPRINGVCENTER(), THISBACK1(ItemPos, MAKELONG(POS_NONE, POS_CENTER)))
+		.Check(im & MAKELONG(0, 1 << POS_CENTER));
+	bar.Separator();
+	bar.Add(m, "Auto springs", TB_SPRINGAUTO(), THISBACK1(ItemPos, MAKELONG(POS_AUTO, POS_AUTO)))
+		.Key(K_CTRL_R);
+	bar.Add(m, "Topleft springs", TB_SPRINGTOPLEFT(), THISBACK1(ItemPos, MAKELONG(POS_LEFT, POS_TOP)))
+		.Key(im == MAKELONG(1 << POS_LEFT, 1 << POS_TOP));
+}
+
+void LayoutDesigner::ItemBar(Bar& bar) {
+	int m = itemi.GetCount();
+	bar.Add(layouti >= 0, "New item", THISBACK(AddItem))
+		.Key(K_ENTER);
+	bar.Add(m, "Remove item", THISBACK(Delete))
+		.Key(K_DELETE);
+	bar.Add(m, "Move item up", THISBACK(MoveUp))
+		.Key(K_CTRL_UP);
+	bar.Add(m, "Move item down", THISBACK(MoveDown))
+		.Key(K_CTRL_DOWN);
+	bar.MenuSeparator();
+	bar.Add("Alignment", THISBACK(AlignBar));
+	bar.Add("Size", THISBACK(SizeBar));
+	bar.Add("Springs", THISBACK(SpringsBar));
+	bar.MenuSeparator();
+	bar.Add(m, "Matrix..", THISBACK(Matrix))
+		.Key(K_CTRL_M);
+}
+
+void LayoutDesigner::MainBar(Bar& bar) {
+	bar.Add("File", THISBACK(FileBar));
+	bar.Add("Edit", THISBACK(EditBar));
+	bar.Add("Layout", THISBACK(LayoutBar));
+	bar.Add("Language", THISBACK(LangBar));
+	bar.Add("Item", THISBACK(ItemBar));
+	bar.Add("Options", THISBACK(OptionsBar));
+}
+
+void LayoutDesigner::Tool(Bar& bar) {
+	EditBar(bar);
+//	bar.Separator();
+	ItemBar(bar);
+	bar.Separator();
+	OptionsBar(bar);
+	bar.Break();
+	bar.Add(layoutlist, 200);
+	bar.Gap();
+	bar.Add(langlist, 100);
+}
+
+void LayoutDesigner::OpenWindow() {
+	if(!frame.IsOpen()) {
+		alias_map_file = AliasMap::StdFileName();
+		alias_map.Load(alias_map_file);
+		if(alias_map.IsEmpty())
+			alias_map.SetDefault();
+		UpdateClassList();
+		frame.OpenMain();
+		MakeCaption();
+	}
+}
+
+void LayoutDesigner::Execute() {
+//	frame.SetRect(100, 100, 700, 500);
+#ifndef flagIDERW
+	LoadFromFile(*this);
+#endif
+	OpenWindow();
+	frame.Run();
+#ifndef flagIDERW
+	StoreToFile(*this);
+#endif
+	if(!alias_map.Save(alias_map_file))
+		Exclamation(NFormat("Error updating alias file [* \1%s\1].", alias_map_file));
+}
+
+void LayoutDesigner::UpdateClassList() {
+	Vector<String> avail_classes;
+	Append(avail_classes, ClassMap().GetKeys());
+	Append(avail_classes, alias_map.obj_source);
+	Sort(avail_classes, StdLess<String>());
+	classname.ClearList();
+	for(int i = 0; i < avail_classes.GetCount(); i++)
+		classname.AddList(avail_classes[i]);
+}
+
+void LayoutDesigner::SetBar()
+{
+	toolbar.Set(THISBACK(Tool));
+}
+
+LayoutDesigner::LayoutDesigner() {
+	int ehg = EditField::GetStdHeight();
+	VSizePos(0, 0).HSizePos(0, 0);
+	form.IgnoreMouse();
+	form.ld = this;
+	Add(form);
+	apaint.VSizePos(0, 0).HSizePos(0, 0).Transparent().IgnoreMouse();
+	apaint.ld = this;
+	itab.NoWantFocus();
+	itab.AddColumn("class");
+	itab.AddColumn("var / label").SetDisplay(VarLblDisplay(false)).Add(2);
+	itab.AddIndex();
+	itab.WhenLeftClick = THISBACK(WhenITab);
+	props.Vert(itab, label_help_split);
+	props.SetPos(6000);
+	class_var_lbl.NoWantFocus().Transparent();
+	class_var_lbl.Add(classname.TopPos(0, ehg).HSizePos(0, 88));
+	class_var_lbl.Add(variable.TopPos(0, ehg).RightPos(0, 80));
+	class_var_lbl.Add(label.VSizePos(ehg + 4, 0).HSizePos());
+	label_help_split.Vert(class_var_lbl, help);
+//	props.Add(itab.VSizePos(0, ehg + 8 + 60 + 8 + 60 + 8).HSizePos());
+//	props.Add(classname.BottomPos(60 + 8 + 60 + 8, STDSIZE).HSizePos(0, 88));
+//	props.Add(variable.BottomPos(60 + 8 + 60 + 8, STDSIZE).RightPos(0, 80));
+//	props.Add(label.BottomPos(60 + 8, 60).HSizePos());
+//	props.Add(help.BottomPos(0, 60).HSizePos());
+	classname.WhenAction = THISBACK(NewClass);
+	classname.SetDropLines(24);
+	variable.WhenAction = THISBACK(NewVariable);
+	variable.ClickSelect();
+	label.WhenAction = THISBACK(NewLabel);
+	help.WhenAction = THISBACK(NewHelp);
+	classset = THISBACK(NewCtrl);
+	layoutlist.WhenAction = THISBACK(EnterLayout);
+	layoutlist.SizePos();
+//	layoutlist.LeftPos(0, 150).TopPos(ehg + 11, ehg);
+	layouti = -1;
+
+	langlist.WhenAction = THISBACK(EnterLanguage);
+	langlist.SizePos();
+//	langlist.LeftPos(150, 150).TopPos(ehg + 11, ehg);
+	langi = 0;
+
+	form.Hide();
+	sb.WhenScroll = THISBACK(Scroll);
+//	menubar.TopPos(0, ehg + 4).HSizePos(0, 0);
+//	toolbar.HSizePos(300, 0).TopPos(ehg + 8, 24).SetFrame(NullFrame());
+	frame.ld = this;
+	frame.Sizeable().Zoomable().Icon(RwIconSmall(), RwIconLarge()); //.HelpBox(); // todo? or not to do?
+	frame.AddFrame(menubar);
+	frame.AddFrame(toolbar);
+	frame.WhenClose = THISBACK(CloseFile);
+//	status.TopPos(0, ehg + 4).HSizePos(0, 0);
+	status.NoTransparent();
+	menubar.AddFrame(status);
+	SetBar();
+	menubar.Set(THISBACK(MainBar));
+	design.SetFrame(InsetFrame());
+	design.AddFrame(sb);
+	design.Add(*this);
+	design.Add(apaint);
+//	splital.VSizePos(2 * EditField::GetStdHeight() + 16, 0);
+	splital.Horz(props, design);
+	splital.SetPos(3000);
+	frame.Add(splital.SizePos());
+	SetLayout(-1);
+	LruList.WhenSelect = THISBACK(LruOpen);
+	grid.x <<= grid.y <<= 2;
+	matrix.x <<= matrix.y <<= 1;
+	matrix.vspace <<= matrix.hspace <<= 0;
+	CtrlLayoutOKCancel(matrix, "Matrix duplication");
+	matrix.x.MinMax(1, 10);
+	matrix.y.MinMax(1, 10);
+	ignoremin = false;
+	qlib2_output = false;
+	moved = false;
+	usegrid = true;
+//	frame.HelpBox().CommentBox(); // todo? or not to do?
+	filesel.Type("Layout files (*.lay)", "*.lay").Type("All files (*.*)", "*.*")
+		   .DefaultExt("lay");
+	layoutlist.Disable();
+}
+
+static Array<LayoutDesigner>& GetDesigners() {
+	static Array<LayoutDesigner> list;
+	return list;
+}
+
+#ifdef flagIDERW
+void LayoutDesigner::CloseDesigner() {
+	Array<LayoutDesigner>& list = GetDesigners();
+	for(int i = 0; i < list.GetCount(); i++)
+		if(&list[i] == this)
+		{
+			list.Remove(i);
+			return;
+		}
+}
+#endif
+
+bool CloseDesignLayout() {
+	Array<LayoutDesigner>& list = GetDesigners();
+	while(!list.IsEmpty())
+	{
+		if(!list[0].CloseLayoutFile())
+			return false;
+		list.Remove(0);
+	}
+	return true;
+}
+
+bool SaveDesignLayout() {
+	Array<LayoutDesigner>& list = GetDesigners();
+	bool is_ok = true;
+	for(int i = 0; i < list.GetCount(); i++)
+		if(!list[i].SaveLayoutFile())
+			is_ok = false;
+	return is_ok;
+}
+
+void DesignLayout(String open_file) {
+	Array<LayoutDesigner>& list = GetDesigners();
+	for(int i = 0; i < list.GetCount(); i++)
+		if(!CompareNoCase(list[i].GetFileName(), open_file))
+		{
+			list[i].SetWantFocus();
+			return;
+		}
+	LayoutDesigner& ld = list.Add();
+	ld.OpenWindow();
+	ld.LoadLayoutFile(open_file);
+}
+
+Image GetRwIcon() {
+	return RwIconSmall();
+}
+
+#ifndef flagIDERW
+void AppMain()
+{
+	SetDefaultCharset(CHARSET_WIN1250);
+	LayoutDesigner ld;
+	ld.Execute();
+}
+#endif//flagIDERW
diff --git a/uppsrc2/rw/ItemCtrl.cpp b/archive/uppsrc/rw/ItemCtrl.cpp
similarity index 95%
rename from uppsrc2/rw/ItemCtrl.cpp
rename to archive/uppsrc/rw/ItemCtrl.cpp
index 2230bb29d..114dd347a 100644
--- a/uppsrc2/rw/ItemCtrl.cpp
+++ b/archive/uppsrc/rw/ItemCtrl.cpp
@@ -1,295 +1,295 @@
-#include "Designer.h"
-//#include <TCtrlLib/TCtrlLib.h>
-
-typedef VectorMap<String, CtrlCreator> CtrlCreatorMap;
-GLOBAL_VAR(CtrlCreatorMap, LayoutDesigner::ClassMap);
-
-void LayoutDesigner::Register(const String& classname, CtrlCreator creator) {
-	ClassMap().GetAdd(classname) = creator;
-}
-
-String    LayoutDesigner::Lng(const Vector<String>& x) const {
-	return langi < x.GetCount() ? x[langi] : String();
-}
-
-String&   LayoutDesigner::ItemLabel(int i) {
-	return Lng(Item(i).label);
-}
-
-String    LayoutDesigner::ItemLabel(int i) const {
-	return Lng(Item(i).label);
-}
-
-String&   LayoutDesigner::Help(int i) {
-	return Lng(Item(i).help);
-}
-
-String    LayoutDesigner::Help(int i) const {
-	return Lng(Item(i).help);
-}
-
-void LayoutDesigner::SynchronizeCtrl(int im) {
-	const ItemInfo& ii = Item(im);
-	SynchronizeCtrl(ctrl[im], ii);
-	itab.Set(im, 0, ii.classname);
-	itab.Set(im, 1, ii.variable);
-	itab.Set(im, 2, (langi < ii.label.GetCount() ? ii.label[langi] : String()));
-}
-
-void LayoutDesigner::SynchronizeCtrl(Ctrl& q, const ItemInfo& ii)
-{
-	q.SetLabel(Lng(ii.label));
-//	q.Help(Help(im));
-	q.Tip(Lng(ii.help));
-	q.DesignMode();
-	q.SetPos(ii.pos);
-}
-
-void LayoutDesigner::SynchronizeCtrl() {
-	SynchronizeCtrl(itemi.Top());
-}
-
-void LayoutDesigner::SynchronizeCtrls() {
-	mnem_ctrl.Clear();
-	ref_ctrl.Clear();
-	ctrl.Clear();
-	for(int i = 0; i < ItemCount(); i++) {
-		ItemInfo& ii = Item(i);
-		Ctrl& q = ctrl.Add(CreateCtrl(ii.classname));
-		form.Add(q);
-		SynchronizeCtrl(i);
-	}
-	ShowHideLayouts();
-}
-
-int LayoutDesigner::ParseLayoutRef(String cls, String& base) const
-{
-	const char *p = cls;
-	if(p[0] != 'W' || p[1] != 'i' || p[2] != 't' || p[3] != 'h')
-		return -1;
-	const char *b = (p += 4);
-	while(IsAlNum(*p) || *p == '_')
-		p++;
-	if(p <= b)
-		return -1;
-	String layoutid(b, p);
-	int fi = FindFieldIndex(layout, &Form::name, layoutid);
-	if(fi < 0)
-		return -1;
-	while(*p && (byte)*p <= ' ')
-		p++;
-	if(*p++ != '<')
-		return -1;
-	while(*p && (byte)*p <= ' ')
-		p++;
-	const char *e = cls.End();
-	while(e > p && (byte)e[-1] <= ' ')
-		e--;
-	if(e > p && e[-1] == '>')
-		e--;
-	while(e > p && (byte)e[-1] <= ' ')
-		e--;
-	base = String(p, e);
-	return fi;
-}
-
-Ctrl *LayoutDesigner::CreateLayoutCtrl(String classname, Index<String>& recursed)
-{
-	String base;
-	int fi = ParseLayoutRef(classname, base);
-	if(fi < 0 || recursed.Find(layout[fi].name) >= 0 || recursed.Find(base) >= 0)
-		return NULL;
-	recursed.Add(layout[fi].name);
-	recursed.Add(base);
-	Ctrl *ctrl = CreateCtrl(base, recursed);
-	if(!ctrl)
-	{
-		ctrl = new Ctrl();
-		ctrl->Transparent();
-	}
-	const Form& form = layout[fi];
-	for(int i = 0; i < form.item.GetCount(); i++) {
-		const ItemInfo& ii = form.item[i];
-		Ctrl *q = CreateCtrl(ii.classname, recursed);
-		if(!q)
-		{
-			q = new UrgCtrl(ii.classname);
-			q->DesignMode();
-		}
-		ref_ctrl.Add(q);
-		ctrl -> Add(*q);
-		SynchronizeCtrl(*q, ii);
-	}
-	recursed.Drop();
-	recursed.Drop();
-	return ctrl;
-}
-
-Ctrl *LayoutDesigner::CreateCtrl(const String& classname, Index<String>& recursed)
-{
-	Ctrl *q = CreateLayoutCtrl(classname, recursed);
-	if(q)
-		return q;
-	int ci = ClassMap().Find(alias_map.Convert(classname));
-	if(ci >= 0)
-	{
-		q = ClassMap()[ci]();
-		q->DesignMode();
-	}
-	return q;
-}
-
-Ctrl *LayoutDesigner::CreateCtrl(const String& classname) {
-	Index<String> temp;
-	Ctrl *q = CreateCtrl(classname, temp);
-	if(!q)
-	{
-		q = new UrgCtrl(~classname);
-		q->DesignMode();
-	}
-	return q;
-}
-
-void LayoutDesigner::AddCtrl(const String& cls, const String& var, const String& lbl,
-							 const String& help) {
-	int imi = ctrl.GetCount();
-	ItemInfo& ii = ActualForm().item.Add();
-	ii.classname = cls;
-	ii.variable = var;
-	Lng(ii.label) = lbl;
-	Lng(ii.help) = help;
-	Ctrl& q = ctrl.Add(CreateCtrl(cls));
-	q.TopPos(0, max(10, q.GetStdSize().cy)).LeftPos(0, 50);
-	ii.pos = q.GetPos();
-	q.SetLabel(lbl);
-//	q.Help(help);
-	q.Tip(help);
-	q.DesignMode();
-	form.Add(q);
-	Refresh();
-	itab.Add(cls, var, lbl);
-	SelectOneItem(imi);
-}
-
-class MnemCtrl : public Ctrl
-{
-public:
-	MnemCtrl(char letter, Font font) : letter(letter), font(font) {}
-
-public:
-	virtual void Paint(Draw& draw)
-	{
-		draw.DrawRect(draw.GetClip(), LtRed);
-		draw.DrawText(1, 0, &letter, font, SBlack, 1);
-	}
-
-private:
-	char letter;
-	Font font;
-};
-
-static void AddMnemonic(VectorMap< int, Vector<Ctrl *> >& out, Array<Ctrl>& in)
-{
-	for(int i = in.GetCount(); --i >= 0;)
-	{
-		Ctrl& c = in[i];
-		int m;
-		if(c.GetParent() && c.GetParent() -> IsShown() && (m = c.GetMnemonic()) != 0)
-			out.GetAdd(ToUpper(m)).Add(&c);
-	}
-}
-
-void LayoutDesigner::SynchronizeMnemonic()
-{
-	mnem_ctrl.Clear();
-
-	VectorMap< int, Vector<Ctrl *> > mnemonic;
-	AddMnemonic(mnemonic, ctrl);
-	AddMnemonic(mnemonic, ref_ctrl);
-	Point p = sb;
-	Size shift = Point(10, 10) - p;
-	Font mfont = StdFont().Bold();
-	FontInfo minfo = ScreenInfo().GetFontInfo(mfont);
-	int mht = minfo.GetHeight();
-	for(int m = 0; m < mnemonic.GetCount(); m++)
-		if(mnemonic[m].GetCount() >= 2)
-		{
-			const Vector<Ctrl *>& mdup = mnemonic[m];
-			for(int c = 0; c < mdup.GetCount(); c++)
-			{
-				char mnem = mnemonic.GetKey(m);
-				int mwd = minfo[(byte)mnem];
-				Ctrl& mctrl = mnem_ctrl.Add(new MnemCtrl(mnem, mfont));
-				mdup[c] -> Add(mctrl.RightPos(0, mwd + 2).BottomPos(0, mht));
-			}
-		}
-}
-
-void LayoutDesigner::CleanRefCtrl()
-{
-	for(int i = ref_ctrl.GetCount(); --i >= 0;)
-		if(!ref_ctrl[i].GetParent())
-			ref_ctrl.Remove(i);
-}
-
-void LayoutDesigner::SetClass(int im) {
-	Ctrl& q = ctrl.Set(im, CreateCtrl(Item(im).classname));
-	CleanRefCtrl();
-	form.Add(q);
-	SynchronizeCtrl(im);
-}
-
-void LayoutDesigner::Swap(int i1, int i2) {
-	ActualForm().item.Swap(i1, i2);
-	SetClass(i1);
-	SetClass(i2);
-}
-
-REGCTRLCLASS(Button)
-REGCTRLCLASS(EditField)
-REGCTRLCLASS(EditInt)
-REGCTRLCLASS(EditDouble)
-REGCTRLCLASS(EditDate)
-//REGCTRLCLASS(EditTime)
-REGCTRLCLASS(EditIntNotNull)
-REGCTRLCLASS(EditDoubleNotNull)
-REGCTRLCLASS(EditDateNotNull)
-REGCTRLCLASS(EditIntSpin)
-REGCTRLCLASS(EditString)
-REGCTRLCLASS(EditStringNotNull)
-//REGCTRLCLASS(TableArray)
-REGCTRLCLASS(ArrayCtrl)
-REGCTRLCLASS(Option)
-REGCTRLCLASS(Switch)
-REGCTRLCLASS(Label)
-REGCTRLCLASS(LabelBox)
-REGCTRLCLASS(WithDropChoice<EditString>)
-REGCTRLCLASS(DropList)
-REGCTRLCLASS(ScrollBar)
-REGCTRLCLASS(DocEdit)
-REGCTRLCLASS(QtfCtrl)
-REGCTRLCLASS(StaticRect)
-REGCTRLCLASS(Icon)
-REGCTRLCLASS(ProgressIndicator)
-/*
-REGCTRLCLASS(Picture)
-REGCTRLCLASS(SqlTable)
-REGCTRLCLASS(SqlArray)
-REGCTRLCLASS(SqlOption)
-*/
-REGCTRLCLASS(ToolBar)
-REGCTRLCLASS(MenuBar)
-//REGCTRLCLASS(InfoBar)
-/*
-REGCTRLCLASS(TableCheck)
-REGCTRLCLASS(ValueOption)
-REGCTRLCLASS(FileCtrl)
-REGCTRLCLASS(MenuButton)
-REGCTRLCLASS(DragDropCtrl)
-REGCTRLCLASS(ScrollTable)
-REGCTRLCLASS(StaticCtrl)
-*/
-REGCTRLCLASS(DataPusher)
-//REGCTRLCLASS(ColorCtrl)
-REGCTRLCLASS(TabCtrl)
-//REGCTRLCLASS(OldTreeCtrl)
+#include "Designer.h"
+//#include <TCtrlLib/TCtrlLib.h>
+
+typedef VectorMap<String, CtrlCreator> CtrlCreatorMap;
+GLOBAL_VAR(CtrlCreatorMap, LayoutDesigner::ClassMap);
+
+void LayoutDesigner::Register(const String& classname, CtrlCreator creator) {
+	ClassMap().GetAdd(classname) = creator;
+}
+
+String    LayoutDesigner::Lng(const Vector<String>& x) const {
+	return langi < x.GetCount() ? x[langi] : String();
+}
+
+String&   LayoutDesigner::ItemLabel(int i) {
+	return Lng(Item(i).label);
+}
+
+String    LayoutDesigner::ItemLabel(int i) const {
+	return Lng(Item(i).label);
+}
+
+String&   LayoutDesigner::Help(int i) {
+	return Lng(Item(i).help);
+}
+
+String    LayoutDesigner::Help(int i) const {
+	return Lng(Item(i).help);
+}
+
+void LayoutDesigner::SynchronizeCtrl(int im) {
+	const ItemInfo& ii = Item(im);
+	SynchronizeCtrl(ctrl[im], ii);
+	itab.Set(im, 0, ii.classname);
+	itab.Set(im, 1, ii.variable);
+	itab.Set(im, 2, (langi < ii.label.GetCount() ? ii.label[langi] : String()));
+}
+
+void LayoutDesigner::SynchronizeCtrl(Ctrl& q, const ItemInfo& ii)
+{
+	q.SetLabel(Lng(ii.label));
+//	q.Help(Help(im));
+	q.Tip(Lng(ii.help));
+	q.DesignMode();
+	q.SetPos(ii.pos);
+}
+
+void LayoutDesigner::SynchronizeCtrl() {
+	SynchronizeCtrl(itemi.Top());
+}
+
+void LayoutDesigner::SynchronizeCtrls() {
+	mnem_ctrl.Clear();
+	ref_ctrl.Clear();
+	ctrl.Clear();
+	for(int i = 0; i < ItemCount(); i++) {
+		ItemInfo& ii = Item(i);
+		Ctrl& q = ctrl.Add(CreateCtrl(ii.classname));
+		form.Add(q);
+		SynchronizeCtrl(i);
+	}
+	ShowHideLayouts();
+}
+
+int LayoutDesigner::ParseLayoutRef(String cls, String& base) const
+{
+	const char *p = cls;
+	if(p[0] != 'W' || p[1] != 'i' || p[2] != 't' || p[3] != 'h')
+		return -1;
+	const char *b = (p += 4);
+	while(IsAlNum(*p) || *p == '_')
+		p++;
+	if(p <= b)
+		return -1;
+	String layoutid(b, p);
+	int fi = FindFieldIndex(layout, &Form::name, layoutid);
+	if(fi < 0)
+		return -1;
+	while(*p && (byte)*p <= ' ')
+		p++;
+	if(*p++ != '<')
+		return -1;
+	while(*p && (byte)*p <= ' ')
+		p++;
+	const char *e = cls.End();
+	while(e > p && (byte)e[-1] <= ' ')
+		e--;
+	if(e > p && e[-1] == '>')
+		e--;
+	while(e > p && (byte)e[-1] <= ' ')
+		e--;
+	base = String(p, e);
+	return fi;
+}
+
+Ctrl *LayoutDesigner::CreateLayoutCtrl(String classname, Index<String>& recursed)
+{
+	String base;
+	int fi = ParseLayoutRef(classname, base);
+	if(fi < 0 || recursed.Find(layout[fi].name) >= 0 || recursed.Find(base) >= 0)
+		return NULL;
+	recursed.Add(layout[fi].name);
+	recursed.Add(base);
+	Ctrl *ctrl = CreateCtrl(base, recursed);
+	if(!ctrl)
+	{
+		ctrl = new Ctrl();
+		ctrl->Transparent();
+	}
+	const Form& form = layout[fi];
+	for(int i = 0; i < form.item.GetCount(); i++) {
+		const ItemInfo& ii = form.item[i];
+		Ctrl *q = CreateCtrl(ii.classname, recursed);
+		if(!q)
+		{
+			q = new UrgCtrl(ii.classname);
+			q->DesignMode();
+		}
+		ref_ctrl.Add(q);
+		ctrl -> Add(*q);
+		SynchronizeCtrl(*q, ii);
+	}
+	recursed.Drop();
+	recursed.Drop();
+	return ctrl;
+}
+
+Ctrl *LayoutDesigner::CreateCtrl(const String& classname, Index<String>& recursed)
+{
+	Ctrl *q = CreateLayoutCtrl(classname, recursed);
+	if(q)
+		return q;
+	int ci = ClassMap().Find(alias_map.Convert(classname));
+	if(ci >= 0)
+	{
+		q = ClassMap()[ci]();
+		q->DesignMode();
+	}
+	return q;
+}
+
+Ctrl *LayoutDesigner::CreateCtrl(const String& classname) {
+	Index<String> temp;
+	Ctrl *q = CreateCtrl(classname, temp);
+	if(!q)
+	{
+		q = new UrgCtrl(~classname);
+		q->DesignMode();
+	}
+	return q;
+}
+
+void LayoutDesigner::AddCtrl(const String& cls, const String& var, const String& lbl,
+							 const String& help) {
+	int imi = ctrl.GetCount();
+	ItemInfo& ii = ActualForm().item.Add();
+	ii.classname = cls;
+	ii.variable = var;
+	Lng(ii.label) = lbl;
+	Lng(ii.help) = help;
+	Ctrl& q = ctrl.Add(CreateCtrl(cls));
+	q.TopPos(0, max(10, q.GetStdSize().cy)).LeftPos(0, 50);
+	ii.pos = q.GetPos();
+	q.SetLabel(lbl);
+//	q.Help(help);
+	q.Tip(help);
+	q.DesignMode();
+	form.Add(q);
+	Refresh();
+	itab.Add(cls, var, lbl);
+	SelectOneItem(imi);
+}
+
+class MnemCtrl : public Ctrl
+{
+public:
+	MnemCtrl(char letter, Font font) : letter(letter), font(font) {}
+
+public:
+	virtual void Paint(Draw& draw)
+	{
+		draw.DrawRect(draw.GetClip(), LtRed);
+		draw.DrawText(1, 0, &letter, font, SBlack, 1);
+	}
+
+private:
+	char letter;
+	Font font;
+};
+
+static void AddMnemonic(VectorMap< int, Vector<Ctrl *> >& out, Array<Ctrl>& in)
+{
+	for(int i = in.GetCount(); --i >= 0;)
+	{
+		Ctrl& c = in[i];
+		int m;
+		if(c.GetParent() && c.GetParent() -> IsShown() && (m = c.GetMnemonic()) != 0)
+			out.GetAdd(ToUpper(m)).Add(&c);
+	}
+}
+
+void LayoutDesigner::SynchronizeMnemonic()
+{
+	mnem_ctrl.Clear();
+
+	VectorMap< int, Vector<Ctrl *> > mnemonic;
+	AddMnemonic(mnemonic, ctrl);
+	AddMnemonic(mnemonic, ref_ctrl);
+	Point p = sb;
+	Size shift = Point(10, 10) - p;
+	Font mfont = StdFont().Bold();
+	FontInfo minfo = ScreenInfo().GetFontInfo(mfont);
+	int mht = minfo.GetHeight();
+	for(int m = 0; m < mnemonic.GetCount(); m++)
+		if(mnemonic[m].GetCount() >= 2)
+		{
+			const Vector<Ctrl *>& mdup = mnemonic[m];
+			for(int c = 0; c < mdup.GetCount(); c++)
+			{
+				char mnem = mnemonic.GetKey(m);
+				int mwd = minfo[(byte)mnem];
+				Ctrl& mctrl = mnem_ctrl.Add(new MnemCtrl(mnem, mfont));
+				mdup[c] -> Add(mctrl.RightPos(0, mwd + 2).BottomPos(0, mht));
+			}
+		}
+}
+
+void LayoutDesigner::CleanRefCtrl()
+{
+	for(int i = ref_ctrl.GetCount(); --i >= 0;)
+		if(!ref_ctrl[i].GetParent())
+			ref_ctrl.Remove(i);
+}
+
+void LayoutDesigner::SetClass(int im) {
+	Ctrl& q = ctrl.Set(im, CreateCtrl(Item(im).classname));
+	CleanRefCtrl();
+	form.Add(q);
+	SynchronizeCtrl(im);
+}
+
+void LayoutDesigner::Swap(int i1, int i2) {
+	ActualForm().item.Swap(i1, i2);
+	SetClass(i1);
+	SetClass(i2);
+}
+
+REGCTRLCLASS(Button)
+REGCTRLCLASS(EditField)
+REGCTRLCLASS(EditInt)
+REGCTRLCLASS(EditDouble)
+REGCTRLCLASS(EditDate)
+//REGCTRLCLASS(EditTime)
+REGCTRLCLASS(EditIntNotNull)
+REGCTRLCLASS(EditDoubleNotNull)
+REGCTRLCLASS(EditDateNotNull)
+REGCTRLCLASS(EditIntSpin)
+REGCTRLCLASS(EditString)
+REGCTRLCLASS(EditStringNotNull)
+//REGCTRLCLASS(TableArray)
+REGCTRLCLASS(ArrayCtrl)
+REGCTRLCLASS(Option)
+REGCTRLCLASS(Switch)
+REGCTRLCLASS(Label)
+REGCTRLCLASS(LabelBox)
+REGCTRLCLASS(WithDropChoice<EditString>)
+REGCTRLCLASS(DropList)
+REGCTRLCLASS(ScrollBar)
+REGCTRLCLASS(DocEdit)
+REGCTRLCLASS(QtfCtrl)
+REGCTRLCLASS(StaticRect)
+REGCTRLCLASS(Icon)
+REGCTRLCLASS(ProgressIndicator)
+/*
+REGCTRLCLASS(Picture)
+REGCTRLCLASS(SqlTable)
+REGCTRLCLASS(SqlArray)
+REGCTRLCLASS(SqlOption)
+*/
+REGCTRLCLASS(ToolBar)
+REGCTRLCLASS(MenuBar)
+//REGCTRLCLASS(InfoBar)
+/*
+REGCTRLCLASS(TableCheck)
+REGCTRLCLASS(ValueOption)
+REGCTRLCLASS(FileCtrl)
+REGCTRLCLASS(MenuButton)
+REGCTRLCLASS(DragDropCtrl)
+REGCTRLCLASS(ScrollTable)
+REGCTRLCLASS(StaticCtrl)
+*/
+REGCTRLCLASS(DataPusher)
+//REGCTRLCLASS(ColorCtrl)
+REGCTRLCLASS(TabCtrl)
+//REGCTRLCLASS(OldTreeCtrl)
diff --git a/uppsrc2/rw/Lang.cpp b/archive/uppsrc/rw/Lang.cpp
similarity index 96%
rename from uppsrc2/rw/Lang.cpp
rename to archive/uppsrc/rw/Lang.cpp
index 6f63c54e2..aa82ee072 100644
--- a/uppsrc2/rw/Lang.cpp
+++ b/archive/uppsrc/rw/Lang.cpp
@@ -1,117 +1,117 @@
-#include "Designer.h"
-
-int FindDlIndex(const DropList& d, const Value& val) {
-	for(int i = 0; i < d.GetCount(); i++)
-		if(d.GetValue(i) == val) return i;
-	return -1;
-}
-
-Vector<String> LayoutDesigner::CoreLangs() {
-	Vector<String> r;
-	return r;
-}
-
-void LayoutDesigner::AddLang(const String& lang, bool copy) {
-	int li = langlist.GetCount();
-	langlist.Add(li, lang);
-	if(copy)
-		for(int i = 0; i < layout.GetCount(); i++) {
-			Form& l = layout[i];
-			for(int i = 0; i < l.item.GetCount(); i++) {
-				String s = l.item[i].label.At(langi);
-				l.item[i].label.At(li) = s;
-				s = l.item[i].help.At(langi);
-				l.item[i].help.At(li) = s;
-			}
-		}
-	SetLayout(~layoutlist, li);
-}
-
-void  LayoutDesigner::NewLanguage() {
-	WithLangLayout<TopWindow> dlg;
-	CtrlLayoutOKCancel(dlg, "New language");
-	dlg.copy = true;
-	Vector<String> cl = CoreLangs();
-	dlg.language.AddList("LNG_ALBANIAN");
-	dlg.language.AddList("LNG_BELARUSIAN");
-	dlg.language.AddList("LNG_BULGARIAN");
-	dlg.language.AddList("LNG_CROATIAN");
-	dlg.language.AddList("LNG_CZECH");
-	dlg.language.AddList("LNG_DANISH");
-	dlg.language.AddList("LNG_DUTCH");
-	dlg.language.AddList("LNG_ENGLISH");
-	dlg.language.AddList("LNG_ESTONIAN");
-	dlg.language.AddList("LNG_FINNISH");
-	dlg.language.AddList("LNG_FRENCH");
-	dlg.language.AddList("LNG_GERMAN");
-	dlg.language.AddList("LNG_GREEK");
-	dlg.language.AddList("LNG_HUNGARIAN");
-	dlg.language.AddList("LNG_ICELANDIC");
-	dlg.language.AddList("LNG_ITALIAN");
-	dlg.language.AddList("LNG_LATVIAN");
-	dlg.language.AddList("LNG_LITHUANIAN");
-	dlg.language.AddList("LNG_MACEDONIAN");
-	dlg.language.AddList("LNG_NORWEGIAN");
-	dlg.language.AddList("LNG_POLISH");
-	dlg.language.AddList("LNG_PORTUGUESE");
-	dlg.language.AddList("LNG_ROMANIAN");
-	dlg.language.AddList("LNG_RUSSIAN");
-	dlg.language.AddList("LNG_SERBIAN");
-	dlg.language.AddList("LNG_SLOVAK");
-	dlg.language.AddList("LNG_SLOVENIAN");
-	dlg.language.AddList("LNG_SPANISH");
-	dlg.language.AddList("LNG_SWEDISH");
-	dlg.language.AddList("LNG_TURKISH");
-	dlg.language.AddList("LNG_UKRAINIAN");
-	if(dlg.Run() != IDOK) return;
-	AddLang(dlg.language, dlg.copy);
-}
-
-void  LayoutDesigner::RenameLanguage() {
-	if(langlist.GetCount() == 0) return;
-	String s = langlist.GetValue();
-	if(!EditText(s, "Pøejmenovat jazyk", "Nový jazyk")) return;
-	langlist.SetValue(s);
-}
-
-void  LayoutDesigner::RemoveLanguage() {
-	if(langlist.GetCount() == 0) return;
-	if(!PromptYesNo("Remove current language ?")) return;
-	int i;
-	Vector<String> s;
-	for(i = 0; i < langlist.GetCount(); i++)
-		if(i != langi)
-			s.Add(langlist.GetValue(i));
-	if(langlist.GetCount() > 1)
-		for(i = 0; i < layout.GetCount(); i++) {
-			Form& l = layout[i];
-			for(int i = 0; i < l.item.GetCount(); i++) {
-				l.item[i].label.Remove(langi);
-				l.item[i].help.Remove(langi);
-			}
-		}
-	langlist.Clear();
-	for(i = 0; i < s.GetCount(); i++)
-		langlist.Add(i, s[i]);
-	SetLayout(~layoutlist, 0);
-}
-
-void  LayoutDesigner::AddCoreLanguages() {
-	int id = PromptYesNoCancel("Copy current language ?");
-	if(id == IDCANCEL) return;
-	Vector<String> cl = CoreLangs();
-	for(int i = 0; i < cl.GetCount(); i++)
-		AddLang(cl[i], id == IDYES);
-}
-
-void  LayoutDesigner::PrevLang() {
-	if(langlist.GetCount() == 0) return;
-	langlist.SetIndex((langlist.GetIndex() + 1) % langlist.GetCount());
-	EnterLanguage();
-}
-
-void  LayoutDesigner::NextLang() {
-	if(langlist.GetCount() == 0) return;
-	langlist.SetIndex((langlist.GetIndex() + langlist.GetCount() - 1) % langlist.GetCount());
-	EnterLanguage();
-}
+#include "Designer.h"
+
+int FindDlIndex(const DropList& d, const Value& val) {
+	for(int i = 0; i < d.GetCount(); i++)
+		if(d.GetValue(i) == val) return i;
+	return -1;
+}
+
+Vector<String> LayoutDesigner::CoreLangs() {
+	Vector<String> r;
+	return r;
+}
+
+void LayoutDesigner::AddLang(const String& lang, bool copy) {
+	int li = langlist.GetCount();
+	langlist.Add(li, lang);
+	if(copy)
+		for(int i = 0; i < layout.GetCount(); i++) {
+			Form& l = layout[i];
+			for(int i = 0; i < l.item.GetCount(); i++) {
+				String s = l.item[i].label.At(langi);
+				l.item[i].label.At(li) = s;
+				s = l.item[i].help.At(langi);
+				l.item[i].help.At(li) = s;
+			}
+		}
+	SetLayout(~layoutlist, li);
+}
+
+void  LayoutDesigner::NewLanguage() {
+	WithLangLayout<TopWindow> dlg;
+	CtrlLayoutOKCancel(dlg, "New language");
+	dlg.copy = true;
+	Vector<String> cl = CoreLangs();
+	dlg.language.AddList("LNG_ALBANIAN");
+	dlg.language.AddList("LNG_BELARUSIAN");
+	dlg.language.AddList("LNG_BULGARIAN");
+	dlg.language.AddList("LNG_CROATIAN");
+	dlg.language.AddList("LNG_CZECH");
+	dlg.language.AddList("LNG_DANISH");
+	dlg.language.AddList("LNG_DUTCH");
+	dlg.language.AddList("LNG_ENGLISH");
+	dlg.language.AddList("LNG_ESTONIAN");
+	dlg.language.AddList("LNG_FINNISH");
+	dlg.language.AddList("LNG_FRENCH");
+	dlg.language.AddList("LNG_GERMAN");
+	dlg.language.AddList("LNG_GREEK");
+	dlg.language.AddList("LNG_HUNGARIAN");
+	dlg.language.AddList("LNG_ICELANDIC");
+	dlg.language.AddList("LNG_ITALIAN");
+	dlg.language.AddList("LNG_LATVIAN");
+	dlg.language.AddList("LNG_LITHUANIAN");
+	dlg.language.AddList("LNG_MACEDONIAN");
+	dlg.language.AddList("LNG_NORWEGIAN");
+	dlg.language.AddList("LNG_POLISH");
+	dlg.language.AddList("LNG_PORTUGUESE");
+	dlg.language.AddList("LNG_ROMANIAN");
+	dlg.language.AddList("LNG_RUSSIAN");
+	dlg.language.AddList("LNG_SERBIAN");
+	dlg.language.AddList("LNG_SLOVAK");
+	dlg.language.AddList("LNG_SLOVENIAN");
+	dlg.language.AddList("LNG_SPANISH");
+	dlg.language.AddList("LNG_SWEDISH");
+	dlg.language.AddList("LNG_TURKISH");
+	dlg.language.AddList("LNG_UKRAINIAN");
+	if(dlg.Run() != IDOK) return;
+	AddLang(dlg.language, dlg.copy);
+}
+
+void  LayoutDesigner::RenameLanguage() {
+	if(langlist.GetCount() == 0) return;
+	String s = langlist.GetValue();
+	if(!EditText(s, "Pøejmenovat jazyk", "Nový jazyk")) return;
+	langlist.SetValue(s);
+}
+
+void  LayoutDesigner::RemoveLanguage() {
+	if(langlist.GetCount() == 0) return;
+	if(!PromptYesNo("Remove current language ?")) return;
+	int i;
+	Vector<String> s;
+	for(i = 0; i < langlist.GetCount(); i++)
+		if(i != langi)
+			s.Add(langlist.GetValue(i));
+	if(langlist.GetCount() > 1)
+		for(i = 0; i < layout.GetCount(); i++) {
+			Form& l = layout[i];
+			for(int i = 0; i < l.item.GetCount(); i++) {
+				l.item[i].label.Remove(langi);
+				l.item[i].help.Remove(langi);
+			}
+		}
+	langlist.Clear();
+	for(i = 0; i < s.GetCount(); i++)
+		langlist.Add(i, s[i]);
+	SetLayout(~layoutlist, 0);
+}
+
+void  LayoutDesigner::AddCoreLanguages() {
+	int id = PromptYesNoCancel("Copy current language ?");
+	if(id == IDCANCEL) return;
+	Vector<String> cl = CoreLangs();
+	for(int i = 0; i < cl.GetCount(); i++)
+		AddLang(cl[i], id == IDYES);
+}
+
+void  LayoutDesigner::PrevLang() {
+	if(langlist.GetCount() == 0) return;
+	langlist.SetIndex((langlist.GetIndex() + 1) % langlist.GetCount());
+	EnterLanguage();
+}
+
+void  LayoutDesigner::NextLang() {
+	if(langlist.GetCount() == 0) return;
+	langlist.SetIndex((langlist.GetIndex() + langlist.GetCount() - 1) % langlist.GetCount());
+	EnterLanguage();
+}
diff --git a/uppsrc2/rw/StdCtrls.cpp b/archive/uppsrc/rw/StdCtrls.cpp
similarity index 95%
rename from uppsrc2/rw/StdCtrls.cpp
rename to archive/uppsrc/rw/StdCtrls.cpp
index 2b9d23e81..fd5b2b7b9 100644
--- a/uppsrc2/rw/StdCtrls.cpp
+++ b/archive/uppsrc/rw/StdCtrls.cpp
@@ -1 +1 @@
-#include "Designer.h"
+#include "Designer.h"
diff --git a/uppsrc2/rw/Util.cpp b/archive/uppsrc/rw/Util.cpp
similarity index 96%
rename from uppsrc2/rw/Util.cpp
rename to archive/uppsrc/rw/Util.cpp
index 509e989ec..efaaa1cac 100644
--- a/uppsrc2/rw/Util.cpp
+++ b/archive/uppsrc/rw/Util.cpp
@@ -1,61 +1,61 @@
-#include "Designer.h"
-
-struct VarLblDisplayCls : public Display
-{
-	VarLblDisplayCls(bool selected) : selected(selected) {}
-
-	virtual void Paint(Draw& draw, const Rect& rc, const Value& value, Color i, Color p, dword style) const
-	{
-		ValueArray va(value);
-		if(selected && !(style & CURSOR))
-			i = SLtBlue;
-		if(va.GetCount() <= 1 || !IsNull(va[0]))
-			StdDisplay().Paint(draw, rc, va[0], i, p, style);
-		else
-		{
-			if(!(style & CURSOR))
-				i = Color(64, 160, selected ? 255 : 64);
-			StdDisplay().Paint(draw, rc, va[1], i, p, style);
-		}
-	}
-
-	bool selected;
-};
-
-const Display& VarLblDisplay(bool selected)
-{
-	if(selected)
-	{
-		static VarLblDisplayCls vls(true);
-		return vls;
-	}
-	else
-	{
-		static VarLblDisplayCls vln(false);
-		return vln;
-	}
-}
-
-void SelectedDisplay::Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper,
-		                    dword style) const {
-	w.DrawRect(r, paper);
-	DrawSmartText(w, r.left, r.top, r.Width(),
-	              IsString(q) ? String(q) : StdFormat(q), StdFont(),
-	              (style & CURSOR) ? ink : SLtBlue);
-}
-
-const SelectedDisplay SelDisplay;
-
-void UrgCtrl::SetLabelText(const char *s) {
-	label = s;
-	Refresh();
-}
-
-void UrgCtrl::Paint(Draw& w) {
-	Size sz = GetSize();
-	w.DrawRect(0, 0, sz.cx, sz.cy, SLtCyan);
-	DrawSmartText(w, 0, 0, sz.cx, label);
-	Size tsz = w.GetTextSize(classname, Arial(11));
-	w.DrawRect(sz.cx - tsz.cx, sz.cy - tsz.cy, tsz.cx, tsz.cy, SBlue);
-	w.DrawText(sz.cx - tsz.cx, sz.cy - tsz.cy, classname, Arial(11), SYellow);
-}
+#include "Designer.h"
+
+struct VarLblDisplayCls : public Display
+{
+	VarLblDisplayCls(bool selected) : selected(selected) {}
+
+	virtual void Paint(Draw& draw, const Rect& rc, const Value& value, Color i, Color p, dword style) const
+	{
+		ValueArray va(value);
+		if(selected && !(style & CURSOR))
+			i = SLtBlue;
+		if(va.GetCount() <= 1 || !IsNull(va[0]))
+			StdDisplay().Paint(draw, rc, va[0], i, p, style);
+		else
+		{
+			if(!(style & CURSOR))
+				i = Color(64, 160, selected ? 255 : 64);
+			StdDisplay().Paint(draw, rc, va[1], i, p, style);
+		}
+	}
+
+	bool selected;
+};
+
+const Display& VarLblDisplay(bool selected)
+{
+	if(selected)
+	{
+		static VarLblDisplayCls vls(true);
+		return vls;
+	}
+	else
+	{
+		static VarLblDisplayCls vln(false);
+		return vln;
+	}
+}
+
+void SelectedDisplay::Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper,
+		                    dword style) const {
+	w.DrawRect(r, paper);
+	DrawSmartText(w, r.left, r.top, r.Width(),
+	              IsString(q) ? String(q) : StdFormat(q), StdFont(),
+	              (style & CURSOR) ? ink : SLtBlue);
+}
+
+const SelectedDisplay SelDisplay;
+
+void UrgCtrl::SetLabelText(const char *s) {
+	label = s;
+	Refresh();
+}
+
+void UrgCtrl::Paint(Draw& w) {
+	Size sz = GetSize();
+	w.DrawRect(0, 0, sz.cx, sz.cy, SLtCyan);
+	DrawSmartText(w, 0, 0, sz.cx, label);
+	Size tsz = w.GetTextSize(classname, Arial(11));
+	w.DrawRect(sz.cx - tsz.cx, sz.cy - tsz.cy, tsz.cx, tsz.cy, SBlue);
+	w.DrawText(sz.cx - tsz.cx, sz.cy - tsz.cy, classname, Arial(11), SYellow);
+}
diff --git a/uppsrc2/rw/doc.dpp/AppDoc_RW_NewFeatures_EN-US.dpp b/archive/uppsrc/rw/doc.dpp/AppDoc_RW_NewFeatures_EN-US.dpp
similarity index 96%
rename from uppsrc2/rw/doc.dpp/AppDoc_RW_NewFeatures_EN-US.dpp
rename to archive/uppsrc/rw/doc.dpp/AppDoc_RW_NewFeatures_EN-US.dpp
index f98cb4b09..3fced3cd4 100644
--- a/uppsrc2/rw/doc.dpp/AppDoc_RW_NewFeatures_EN-US.dpp
+++ b/archive/uppsrc/rw/doc.dpp/AppDoc_RW_NewFeatures_EN-US.dpp
@@ -1,23 +1,23 @@
-ITEM("AppDoc", "RW", "NewFeatures", "EN-US") EXTERNAL
-TEXT("[{_} ")
-TEXT("[s0; [*2 May 27, 2003]]")
-TEXT("&")
-TEXT("[s0;2 ]")
-TEXT("&")
-TEXT("[s0; [* Graphical warnings on duplicate ][*_ m][* ne][*_ m][* on")
-TEXT("ic ")
-TEXT("keys]]")
-TEXT("&")
-TEXT("[s0;2 ]")
-TEXT("&")
-TEXT("[s0; [2 Layout editor displays a ][/2 red block with letter][2  ")
-TEXT("in ")
-TEXT("the bottomright corner of each set of layout controls sharing ")
-TEXT("the same mnemonic hotkey (underlined letter marked by `& in the ")
-TEXT("label text string). This helps the designer catch situations ")
-TEXT("in which multiple controls are assigned the same hotkey which ")
-TEXT("is annoying to the end application user.]]")
-TEXT("&")
-TEXT("[s0;2 ]")
-TEXT("]")
-END_ITEM
+ITEM("AppDoc", "RW", "NewFeatures", "EN-US") EXTERNAL
+TEXT("[{_} ")
+TEXT("[s0; [*2 May 27, 2003]]")
+TEXT("&")
+TEXT("[s0;2 ]")
+TEXT("&")
+TEXT("[s0; [* Graphical warnings on duplicate ][*_ m][* ne][*_ m][* on")
+TEXT("ic ")
+TEXT("keys]]")
+TEXT("&")
+TEXT("[s0;2 ]")
+TEXT("&")
+TEXT("[s0; [2 Layout editor displays a ][/2 red block with letter][2  ")
+TEXT("in ")
+TEXT("the bottomright corner of each set of layout controls sharing ")
+TEXT("the same mnemonic hotkey (underlined letter marked by `& in the ")
+TEXT("label text string). This helps the designer catch situations ")
+TEXT("in which multiple controls are assigned the same hotkey which ")
+TEXT("is annoying to the end application user.]]")
+TEXT("&")
+TEXT("[s0;2 ]")
+TEXT("]")
+END_ITEM
diff --git a/uppsrc2/rw/doc.dpp/links b/archive/uppsrc/rw/doc.dpp/links
similarity index 100%
rename from uppsrc2/rw/doc.dpp/links
rename to archive/uppsrc/rw/doc.dpp/links
diff --git a/uppsrc2/rw/iderw.h b/archive/uppsrc/rw/iderw.h
similarity index 96%
rename from uppsrc2/rw/iderw.h
rename to archive/uppsrc/rw/iderw.h
index 42c2c0550..f989d23da 100644
--- a/uppsrc2/rw/iderw.h
+++ b/archive/uppsrc/rw/iderw.h
@@ -1,4 +1,4 @@
-bool  CloseDesignLayout();
-bool  SaveDesignLayout();
-void  DesignLayout(String open_file);
-Image GetRwIcon();
+bool  CloseDesignLayout();
+bool  SaveDesignLayout();
+void  DesignLayout(String open_file);
+Image GetRwIcon();
diff --git a/uppsrc2/rw/rw.ico b/archive/uppsrc/rw/rw.ico
similarity index 100%
rename from uppsrc2/rw/rw.ico
rename to archive/uppsrc/rw/rw.ico
diff --git a/uppsrc2/rw/rw.iml b/archive/uppsrc/rw/rw.iml
similarity index 97%
rename from uppsrc2/rw/rw.iml
rename to archive/uppsrc/rw/rw.iml
index 04e3b4dbb..dc9bfadff 100644
--- a/uppsrc2/rw/rw.iml
+++ b/archive/uppsrc/rw/rw.iml
@@ -1,497 +1,497 @@
-IMAGE_BEGIN(CrossCursor)
-	IMAGE_SCAN("Ä\1\0\0\0")
-	IMAGE_SCAN("Ä\1\0\0\0")
-	IMAGE_SCAN("Ä\1\0\0\0")
-	IMAGE_SCAN("Ä\1\0\0\0")
-	IMAGE_SCAN("‰\0\0\0")
-	IMAGE_SCAN("Ä\1\0\0\0")
-	IMAGE_SCAN("Ä\1\0\0\0")
-	IMAGE_SCAN("Ä\1\0\0\0")
-	IMAGE_SCAN("Ä\1\0\0\0")
-IMAGE_PACKED(CrossCursor, "\2\20\0\0\0\20\0\0\0\4\0\0\0\4\0\0\0\0\0\0\0")
-IMAGE_BEGIN(RwIconSmall)
-	IMAGE_SCAN("")
-	IMAGE_SCAN("�€€€")
-	IMAGE_SCAN("\1€€€�\377\0\0\1€€€")
-	IMAGE_SCAN("\1€€€�\377\0\0\1€€€")
-	IMAGE_SCAN("\1€€€�ÀÀÀ\1€€€")
-	IMAGE_SCAN("\2€€€ÀÀÀ‚\377\377\377\1\0\0\0…\377\377\377„ÀÀÀ\1€€€")
-	IMAGE_SCAN("\2€€€ÀÀÀ‚\377\377\377‚\0\0\0„\377\377\377„ÀÀÀ\1€€€")
-	IMAGE_SCAN("\1€€€ƒÀÀÀ\3\0\0\0003×\377\0\0\0‡ÀÀÀ\1€€€")
-	IMAGE_SCAN("\1€€€ƒÀÀÀ\1\0\0\0‚3×\377\1\0\0\0†ÀÀÀ\1€€€")
-	IMAGE_SCAN("\1€€€ƒÀÀÀ\1\0\0\0ƒ3×\377\1\0\0\0…ÀÀÀ\1€€€")
-	IMAGE_SCAN("\1€€€ƒÀÀÀ\1\0\0\0ƒ3×\377‚\0\0\0…€€€")
-	IMAGE_SCAN("\1€€€ƒÀÀÀ\1\0\0\0‚3×\377\1\0\0\0‚ÀÀÀ\1€€€‚ÀÀÀ‚€€€")
-	IMAGE_SCAN("\1€€€ƒÀÀÀ\6\0\0\0hhh\0\0\0003×\377\0\0\0ÀÀÀ…€€€")
-	IMAGE_SCAN("„€€€\5\0\0\0€€€\0\0\0003×\377\0\0\0†€€€")
-	IMAGE_SCAN("Ç\3\0\0\0003×\377\0\0\0")
-	IMAGE_SCAN("Ç\1€€€‚\0\0\0")
-IMAGE_PACKED(RwIconSmall, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(RwIconLarge)
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("Áž€€€")
-	IMAGE_SCAN("Á\1€€€œ\377\0\0\1€€€")
-	IMAGE_SCAN("Á\4€€€\377\0\0\377\377\377\377\0\0‚\377\377\377\1°°°‚\377\0\0\3\377\377\377\377\0\0\377\377\377‘\377\0\0\1€€€")
-	IMAGE_SCAN("Á\3€€€\377\0\0\377\377\377‚\377\0\0\6\377\377\377°°°\377\377\377\377\0\0\377\377\377\377\0\0‚\377\377\377�\377\0\0\1€€€")
-	IMAGE_SCAN("Á\1€€€œ\377\0\0\1€€€")
-	IMAGE_SCAN("Á\1€€€œÀÀÀ\1€€€")
-	IMAGE_SCAN("Á\1€€€œÀÀÀ\1€€€")
-	IMAGE_SCAN("Á\1€€€‚ÀÀÀŽ   ŒÀÀÀ\1€€€")
-	IMAGE_SCAN("Á\1€€€‚ÀÀÀ\1   �\377\377\377\1ÞÞÞ‹ÀÀÀ\1€€€")
-	IMAGE_SCAN("Á\1€€€‚ÀÀÀ\1   �\377\377\377\1ÞÞÞ‹ÀÀÀ\1€€€")
-	IMAGE_SCAN("Á\1€€€ƒÀÀÀŽÞÞÞ‹ÀÀÀ\1€€€")
-	IMAGE_SCAN("Á\1€€€œÀÀÀ\1€€€")
-	IMAGE_SCAN("Á\1€€€œÀÀÀ\1€€€")
-	IMAGE_SCAN("Á\1€€€‚ÀÀÀ‚NNN‚ÀÀÀ\2   ÀÀÀ‚\0\0\0’ÀÀÀ\1€€€")
-	IMAGE_SCAN("Á\1€€€‚ÀÀÀ\3NNNÞÞÞÀÀÀ‚   \4ÀÀÀ\0\0\0003×\377\0\0\0‘ÀÀÀ\1€€€")
-	IMAGE_SCAN("Á\1€€€ˆÀÀÀ\1\0\0\0‚3×\377\1\0\0\0�ÀÀÀ\1€€€")
-	IMAGE_SCAN("Á\1€€€ˆÀÀÀ\1\0\0\0ƒ3×\377\1\0\0\0�ÀÀÀ\1€€€")
-	IMAGE_SCAN("Á\1€€€ˆÀÀÀ\1\0\0\0„3×\377\1\0\0\0ŽÀÀÀ\1€€€")
-	IMAGE_SCAN("Á\1€€€ˆÀÀÀ\1\0\0\0…3×\377\1\0\0\0�ÀÀÀ\1€€€")
-	IMAGE_SCAN("Á\1€€€ˆÀÀÀ\1\0\0\0†3×\377\1\0\0\0ŒÀÀÀ\1€€€")
-	IMAGE_SCAN("Á\1€€€ˆÀÀÀ\1\0\0\0„3×\377„\0\0\0‹ÀÀÀ\1€€€")
-	IMAGE_SCAN("Á\1€€€ˆÀÀÀ\1\0\0\0‚3×\377\3\0\0\0003×\377\0\0\0ƒÀÀÀ‰ÞÞÞ‚ÀÀÀ\1€€€")
-	IMAGE_SCAN("Á\1€€€ˆÀÀÀ\2\0\0\0003×\377‚\0\0\0‚3×\377\1\0\0\0‚ÀÀÀ\3ÞÞÞÀÀÀ   ‚ÀÀÀ‚   ‚ÀÀÀ\3   ÀÀÀ€€€")
-	IMAGE_SCAN("Á\1€€€ˆÀÀÀ‚\0\0\0\2ÀÀÀ\0\0\0‚3×\377\1\0\0\0‚ÀÀÀ\2ÞÞÞÀÀÀ‚   \2ÀÀÀ   ƒÀÀÀ\3   ÀÀÀ€€€")
-	IMAGE_SCAN("Á\1€€€ˆÀÀÀ\1\0\0\0ƒÀÀÀ\1\0\0\0‚3×\377\1\0\0\0‚ÀÀÀ‰   \2ÀÀÀ€€€")
-	IMAGE_SCAN("Á\1€€€ŒÀÀÀ\1\0\0\0‚3×\377\1\0\0\0ŒÀÀÀ\1€€€")
-	IMAGE_SCAN("Á�\0\0\0\0013×\377Ž\0\0\0")
-	IMAGE_SCAN("Ð\1\0\0\0")
-IMAGE_PACKED(RwIconLarge, "\2 \0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_ALIGNLEFT)
-	IMAGE_SCAN("\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Á‡\0\0\0Ã\1€\0\0")
-	IMAGE_SCAN("\1\0\0\0Á\7\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0‚€\0\0")
-	IMAGE_SCAN("\1\0\0\0Á\7\0\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\0\0\0Á…€\0\0")
-	IMAGE_SCAN("\1\0\0\0Á\7\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0‚€\0\0")
-	IMAGE_SCAN("\1\0\0\0Á‡\0\0\0Ã\1€\0\0")
-	IMAGE_SCAN("\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0ƒ\0\0\0Ä\1€\0\0")
-	IMAGE_SCAN("\1\0\0\0Á\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0‚€\0\0")
-	IMAGE_SCAN("\1\0\0\0Á\5\0\0\0ÀÀÀ\377\377\377ÀÀÀ\0\0\0Á‡€\0\0")
-	IMAGE_SCAN("\1\0\0\0Á\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0‚€\0\0")
-	IMAGE_SCAN("\1\0\0\0ƒ\0\0\0Ä\1€\0\0")
-	IMAGE_SCAN("\1\0\0\0")
-IMAGE_PACKED(TB_ALIGNLEFT, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_ALIGNRIGHT)
-	IMAGE_SCAN("Î\1\0\0\0")
-	IMAGE_SCAN("Î\1\0\0\0")
-	IMAGE_SCAN("Â\1€\0\0Ç\0\0\0Á\1\0\0\0")
-	IMAGE_SCAN("‚€\0\0Â\7\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0Á\1\0\0\0")
-	IMAGE_SCAN("…€\0\0Á\7\0\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\0\0\0Á\1\0\0\0")
-	IMAGE_SCAN("‚€\0\0Â\7\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0Á\1\0\0\0")
-	IMAGE_SCAN("Â\1€\0\0Ç\0\0\0Á\1\0\0\0")
-	IMAGE_SCAN("Î\1\0\0\0")
-	IMAGE_SCAN("Î\1\0\0\0")
-	IMAGE_SCAN("Ä\1€\0\0ă\0\0\0Â\1\0\0\0")
-	IMAGE_SCAN("Ä‚€\0\0Â\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0Á\1\0\0\0")
-	IMAGE_SCAN("‡€\0\0Á\5\0\0\0ÀÀÀ\377\377\377ÀÀÀ\0\0\0Á\1\0\0\0")
-	IMAGE_SCAN("Ä‚€\0\0Â\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0Á\1\0\0\0")
-	IMAGE_SCAN("Ä\1€\0\0ă\0\0\0Â\1\0\0\0")
-	IMAGE_SCAN("Î\1\0\0\0")
-IMAGE_PACKED(TB_ALIGNRIGHT, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_ALIGNTOP)
-	IMAGE_SCAN("�\0\0\0")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("ƒ\0\0\0‡\0\0\0")
-	IMAGE_SCAN("Á\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0Á\7\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
-	IMAGE_SCAN("Á\5\0\0\0ÀÀÀ\377\377\377ÀÀÀ\0\0\0Á\7\0\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
-	IMAGE_SCAN("Á\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0Á\7\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
-	IMAGE_SCAN("ƒ\0\0\0‡\0\0\0")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("Ã\1€\0\0Æ\1€\0\0")
-	IMAGE_SCAN("ƒ€\0\0ă€\0\0")
-	IMAGE_SCAN("Á…€\0\0Â…€\0\0")
-	IMAGE_SCAN("Ã\1€\0\0Æ\1€\0\0")
-	IMAGE_SCAN("Ã\1€\0\0Æ\1€\0\0")
-	IMAGE_SCAN("Ã\1€\0\0Æ\1€\0\0")
-	IMAGE_SCAN("Ã\1€\0\0Æ\1€\0\0")
-IMAGE_PACKED(TB_ALIGNTOP, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_ALIGNBOTTOM)
-	IMAGE_SCAN("Ã\1€\0\0Ç\1€\0\0")
-	IMAGE_SCAN("Ã\1€\0\0Ç\1€\0\0")
-	IMAGE_SCAN("Ã\1€\0\0Ç\1€\0\0")
-	IMAGE_SCAN("Ã\1€\0\0Ç\1€\0\0")
-	IMAGE_SCAN("Á…€\0\0Ã…€\0\0")
-	IMAGE_SCAN("ƒ€\0\0Ń€\0\0")
-	IMAGE_SCAN("Ã\1€\0\0Ç\1€\0\0")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("ƒ\0\0\0Ç\0\0\0")
-	IMAGE_SCAN("Á\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0Â\7\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
-	IMAGE_SCAN("Á\5\0\0\0ÀÀÀ\377\377\377ÀÀÀ\0\0\0Â\7\0\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
-	IMAGE_SCAN("Á\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0Â\7\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
-	IMAGE_SCAN("ƒ\0\0\0Ç\0\0\0")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("�\0\0\0")
-IMAGE_PACKED(TB_ALIGNBOTTOM, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_VERTCENTER)
-	IMAGE_SCAN("�\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Ç\1€\0\0Æ\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Å…€\0\0Ä\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0ƃ€\0\0Å\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Ç\1€\0\0Æ\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Š\0\0\0Â\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Â\12\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\0\0\0Â\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Â\12\0\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0Â\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Š\0\0\0Â\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Ç\1€\0\0Æ\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0ƃ€\0\0Å\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Å…€\0\0Ä\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Ç\1€\0\0Æ\1\0\0\0")
-	IMAGE_SCAN("�\0\0\0")
-IMAGE_PACKED(TB_VERTCENTER, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_HORZCENTER)
-	IMAGE_SCAN("�\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Î\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Å„\0\0\0Å\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Å\4\0\0\0\377\377\377ÀÀÀ\0\0\0Å\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Å\4\0\0\0ÀÀÀ\377\377\377\0\0\0Å\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Â\1€\0\0Â\4\0\0\0\377\377\377ÀÀÀ\0\0\0Â\1€\0\0Â\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0‚€\0\0Á\4\0\0\0ÀÀÀ\377\377\377\0\0\0Á‚€\0\0Â\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0…€\0\0\4\0\0\0\377\377\377ÀÀÀ\0\0\0…€\0\0\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0‚€\0\0Á\4\0\0\0ÀÀÀ\377\377\377\0\0\0Á‚€\0\0Â\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Â\1€\0\0Â\4\0\0\0\377\377\377ÀÀÀ\0\0\0Â\1€\0\0Â\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Å\4\0\0\0ÀÀÀ\377\377\377\0\0\0Å\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Å„\0\0\0Å\1\0\0\0")
-	IMAGE_SCAN("\1\0\0\0Î\1\0\0\0")
-	IMAGE_SCAN("�\0\0\0")
-IMAGE_PACKED(TB_HORZCENTER, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_ESPACEHORZ)
-	IMAGE_SCAN("")
-	IMAGE_SCAN("ƒ\0\0\0Ƀ\0\0\0")
-	IMAGE_SCAN("\3\377\377\377ÀÀÀ\0\0\0É\3\0\0\0\377\377\377ÀÀÀ")
-	IMAGE_SCAN("\3ÀÀÀ\377\377\377\0\0\0É\3\0\0\0ÀÀÀ\377\377\377")
-	IMAGE_SCAN("\3\377\377\377ÀÀÀ\0\0\0É\3\0\0\0\377\377\377ÀÀÀ")
-	IMAGE_SCAN("\3ÀÀÀ\377\377\377\0\0\0Â\1€\0\0Ã\1€\0\0Â\3\0\0\0ÀÀÀ\377\377\377")
-	IMAGE_SCAN("\3\377\377\377ÀÀÀ\0\0\0Á‚€\0\0€\0\0Á\3\0\0\0\377\377\377ÀÀÀ")
-	IMAGE_SCAN("\3ÀÀÀ\377\377\377\0\0\0‰€\0\0\3\0\0\0ÀÀÀ\377\377\377")
-	IMAGE_SCAN("\3\377\377\377ÀÀÀ\0\0\0Á‚€\0\0€\0\0Á\3\0\0\0\377\377\377ÀÀÀ")
-	IMAGE_SCAN("\3ÀÀÀ\377\377\377\0\0\0Â\1€\0\0Ã\1€\0\0Â\3\0\0\0ÀÀÀ\377\377\377")
-	IMAGE_SCAN("\3\377\377\377ÀÀÀ\0\0\0É\3\0\0\0\377\377\377ÀÀÀ")
-	IMAGE_SCAN("\3ÀÀÀ\377\377\377\0\0\0É\3\0\0\0ÀÀÀ\377\377\377")
-	IMAGE_SCAN("ƒ\0\0\0Ƀ\0\0\0")
-IMAGE_PACKED(TB_ESPACEHORZ, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_ESPACEVERT)
-	IMAGE_SCAN("\14\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
-	IMAGE_SCAN("\14\0\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
-	IMAGE_SCAN("Œ\0\0\0")
-	IMAGE_SCAN("Æ\1€\0\0")
-	IMAGE_SCAN("Ń€\0\0")
-	IMAGE_SCAN("Ä…€\0\0")
-	IMAGE_SCAN("Æ\1€\0\0")
-	IMAGE_SCAN("Æ\1€\0\0")
-	IMAGE_SCAN("Æ\1€\0\0")
-	IMAGE_SCAN("Ä…€\0\0")
-	IMAGE_SCAN("Ń€\0\0")
-	IMAGE_SCAN("Æ\1€\0\0")
-	IMAGE_SCAN("Œ\0\0\0")
-	IMAGE_SCAN("\14\0\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
-	IMAGE_SCAN("\14\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
-IMAGE_PACKED(TB_ESPACEVERT, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_SAMEWIDTH)
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("�\0\0\0")
-	IMAGE_SCAN("\17\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
-	IMAGE_SCAN("\17\0\0\0ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\0\0\0")
-	IMAGE_SCAN("\2\0\0\0\377\377\377‚€\0\0\7ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ‚€\0\0\2\377\377\377\0\0\0")
-	IMAGE_SCAN("\1\0\0\0�€\0\0\1\0\0\0")
-	IMAGE_SCAN("\2\0\0\0\377\377\377‚€\0\0\7ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ‚€\0\0\2\377\377\377\0\0\0")
-	IMAGE_SCAN("\17\0\0\0ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\0\0\0")
-	IMAGE_SCAN("\17\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
-	IMAGE_SCAN("�\0\0\0")
-IMAGE_PACKED(TB_SAMEWIDTH, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_SAMEHEIGHT)
-	IMAGE_SCAN("")
-	IMAGE_SCAN("É\0\0\0")
-	IMAGE_SCAN("Ã\11\0\0\0\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0")
-	IMAGE_SCAN("Ã\3\0\0\0ÀÀÀ\377\377\377ƒ€\0\0\3\377\377\377ÀÀÀ\0\0\0")
-	IMAGE_SCAN("Ã\2\0\0\0\377\377\377…€\0\0\2\377\377\377\0\0\0")
-	IMAGE_SCAN("Ã\11\0\0\0ÀÀÀ\377\377\377ÀÀÀ€\0\0ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
-	IMAGE_SCAN("Ã\11\0\0\0\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0")
-	IMAGE_SCAN("Ã\11\0\0\0ÀÀÀ\377\377\377ÀÀÀ€\0\0ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
-	IMAGE_SCAN("Ã\11\0\0\0\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0")
-	IMAGE_SCAN("Ã\11\0\0\0ÀÀÀ\377\377\377ÀÀÀ€\0\0ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
-	IMAGE_SCAN("Ã\2\0\0\0\377\377\377…€\0\0\2\377\377\377\0\0\0")
-	IMAGE_SCAN("Ã\3\0\0\0ÀÀÀ\377\377\377ƒ€\0\0\3\377\377\377ÀÀÀ\0\0\0")
-	IMAGE_SCAN("Ã\11\0\0\0\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0")
-	IMAGE_SCAN("É\0\0\0")
-IMAGE_PACKED(TB_SAMEHEIGHT, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_SAMESIZE)
-	IMAGE_SCAN("")
-	IMAGE_SCAN("�\0\0\0")
-	IMAGE_SCAN("\17\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ€\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
-	IMAGE_SCAN("\6\0\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀƒ€\0\0\6ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
-	IMAGE_SCAN("\5\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ…€\0\0\5ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
-	IMAGE_SCAN("\17\0\0\0ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\0\0\0")
-	IMAGE_SCAN("\2\0\0\0\377\377\377‚€\0\0\7ÀÀÀ\377\377\377ÀÀÀ€\0\0ÀÀÀ\377\377\377ÀÀÀ‚€\0\0\2\377\377\377\0\0\0")
-	IMAGE_SCAN("\1\0\0\0�€\0\0\1\0\0\0")
-	IMAGE_SCAN("\2\0\0\0\377\377\377‚€\0\0\7ÀÀÀ\377\377\377ÀÀÀ€\0\0ÀÀÀ\377\377\377ÀÀÀ‚€\0\0\2\377\377\377\0\0\0")
-	IMAGE_SCAN("\17\0\0\0ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\0\0\0")
-	IMAGE_SCAN("\5\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ…€\0\0\5ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
-	IMAGE_SCAN("\6\0\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀƒ€\0\0\6ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
-	IMAGE_SCAN("\17\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ€\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
-	IMAGE_SCAN("�\0\0\0")
-IMAGE_PACKED(TB_SAMESIZE, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_GRID)
-	IMAGE_SCAN("")
-	IMAGE_SCAN("\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0")
-IMAGE_PACKED(TB_GRID, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_ALIGNHCENTER)
-	IMAGE_SCAN("Ç\1\0\0\0")
-	IMAGE_SCAN("Ç\1\0\0\0")
-	IMAGE_SCAN("Á\1€\0\0‡\0\0\0Â\1€\0\0")
-	IMAGE_SCAN("Á‚€\0\0Á\7\0\0\0\377\377\377ÀÀÀ\0\0\0ÀÀÀ\377\377\377\0\0\0Á‚€\0\0")
-	IMAGE_SCAN("„€\0\0\7\0\0\0ÀÀÀ\377\377\377\0\0\0\377\377\377ÀÀÀ\0\0\0„€\0\0")
-	IMAGE_SCAN("Á‚€\0\0Á\7\0\0\0\377\377\377ÀÀÀ\0\0\0ÀÀÀ\377\377\377\0\0\0Á‚€\0\0")
-	IMAGE_SCAN("Á\1€\0\0‡\0\0\0Â\1€\0\0")
-	IMAGE_SCAN("Ç\1\0\0\0")
-	IMAGE_SCAN("Ç\1\0\0\0")
-	IMAGE_SCAN("Â\1€\0\0Ã\0\0\0Ã\1€\0\0")
-	IMAGE_SCAN("‚€\0\0Á\5\0\0\0\377\377\377\0\0\0\377\377\377\0\0\0Á‚€\0\0")
-	IMAGE_SCAN("…€\0\0\5\0\0\0ÀÀÀ\0\0\0ÀÀÀ\0\0\0…€\0\0")
-	IMAGE_SCAN("‚€\0\0Á\5\0\0\0\377\377\377\0\0\0\377\377\377\0\0\0Á‚€\0\0")
-	IMAGE_SCAN("Â\1€\0\0Ã\0\0\0Ã\1€\0\0")
-	IMAGE_SCAN("Ç\1\0\0\0")
-IMAGE_PACKED(TB_ALIGNHCENTER, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_ALIGNVCENTER)
-	IMAGE_SCAN("Ä\1€\0\0Æ\1€\0\0")
-	IMAGE_SCAN("Ä\1€\0\0Ä…€\0\0")
-	IMAGE_SCAN("Â…€\0\0À\0\0")
-	IMAGE_SCAN("À\0\0Å\1€\0\0")
-	IMAGE_SCAN("Ä\1€\0\0Ä…\0\0\0")
-	IMAGE_SCAN("Ã\0\0\0Ã\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0")
-	IMAGE_SCAN("Â\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0Â\5\0\0\0ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
-	IMAGE_SCAN("Á�\0\0\0")
-	IMAGE_SCAN("Â\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0Â\5\0\0\0ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
-	IMAGE_SCAN("Ã\0\0\0Ã\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0")
-	IMAGE_SCAN("Ä\1€\0\0Ä…\0\0\0")
-	IMAGE_SCAN("À\0\0Å\1€\0\0")
-	IMAGE_SCAN("Â…€\0\0À\0\0")
-	IMAGE_SCAN("Ä\1€\0\0Ä…€\0\0")
-	IMAGE_SCAN("Ä\1€\0\0Æ\1€\0\0")
-IMAGE_PACKED(TB_ALIGNVCENTER, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_MINHEIGHT)
-	IMAGE_SCAN("")
-	IMAGE_SCAN("Ç\1€\0\0")
-	IMAGE_SCAN("Ç\1€\0\0")
-	IMAGE_SCAN("Å…€\0\0")
-	IMAGE_SCAN("ƃ€\0\0")
-	IMAGE_SCAN("Ç\1€\0\0")
-	IMAGE_SCAN("Á�\0\0\0")
-	IMAGE_SCAN("Á\1\0\0\0‹\0\0\377\1\0\0\0")
-	IMAGE_SCAN("Á�\0\0\0")
-	IMAGE_SCAN("Ç\1€\0\0")
-	IMAGE_SCAN("ƃ€\0\0")
-	IMAGE_SCAN("Å…€\0\0")
-	IMAGE_SCAN("Ç\1€\0\0")
-	IMAGE_SCAN("Ç\1€\0\0")
-IMAGE_PACKED(TB_MINHEIGHT, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_MINWIDTH)
-	IMAGE_SCAN("")
-	IMAGE_SCAN("ƃ\0\0\0")
-	IMAGE_SCAN("Æ\3\0\0\0\0\0\377\0\0\0")
-	IMAGE_SCAN("Æ\3\0\0\0\0\0\377\0\0\0")
-	IMAGE_SCAN("Æ\3\0\0\0\0\0\377\0\0\0")
-	IMAGE_SCAN("Ã\1€\0\0Â\3\0\0\0\0\0\377\0\0\0Â\1€\0\0")
-	IMAGE_SCAN("€\0\0Á\3\0\0\0\0\0\377\0\0\0Á‚€\0\0")
-	IMAGE_SCAN("Á…€\0\0\3\0\0\0\0\0\377\0\0\0…€\0\0")
-	IMAGE_SCAN("€\0\0Á\3\0\0\0\0\0\377\0\0\0Á‚€\0\0")
-	IMAGE_SCAN("Ã\1€\0\0Â\3\0\0\0\0\0\377\0\0\0Â\1€\0\0")
-	IMAGE_SCAN("Æ\3\0\0\0\0\0\377\0\0\0")
-	IMAGE_SCAN("Æ\3\0\0\0\0\0\377\0\0\0")
-	IMAGE_SCAN("Æ\3\0\0\0\0\0\377\0\0\0")
-	IMAGE_SCAN("ƃ\0\0\0")
-IMAGE_PACKED(TB_MINWIDTH, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_ALIGNLBL)
-	IMAGE_SCAN("")
-	IMAGE_SCAN("Ì\1€\0\0")
-	IMAGE_SCAN("˃€\0\0")
-	IMAGE_SCAN("Ê…€\0\0")
-	IMAGE_SCAN("\1\0\0\0‚\0\0\0Â\1\0\0\0Ä\1€\0\0")
-	IMAGE_SCAN("\1\0\0\0Â\1\0\0\0Á\1\0\0\0Á\1\0\0\0Ä\1€\0\0")
-	IMAGE_SCAN("\1\0\0\0Â\1\0\0\0Á\1\0\0\0Á\1\0\0\0Ä\1€\0\0")
-	IMAGE_SCAN("\1\0\0\0‚\0\0\0Â\1\0\0\0Á†\377\0\0")
-	IMAGE_SCAN("\1\0\0\0Â\1\0\0\0Á\1\0\0\0Á\1\0\0\0Ä\1€\0\0")
-	IMAGE_SCAN("\1\0\0\0Â\1\0\0\0Á\1\0\0\0Á\1\0\0\0Ä\1€\0\0")
-	IMAGE_SCAN("‚\0\0\0Á‚\0\0\0‚\0\0\0Ã\1€\0\0")
-	IMAGE_SCAN("Ê…€\0\0")
-	IMAGE_SCAN("˃€\0\0")
-	IMAGE_SCAN("Ì\1€\0\0")
-IMAGE_PACKED(TB_ALIGNLBL, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_SPRINGLEFT)
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("Ì\1\377\0\0")
-	IMAGE_SCAN("\1\377\0\0‡\0\0\0Â\1\377\0\0")
-	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0…\377\377\377\1\0\0\0Áƒ\377\0\0")
-	IMAGE_SCAN("ƒ\377\0\0\1\0\0\0…\377\377\377\1\0\0\0‚\377\0\0Á\1\377\0\0Á\1\377\0\0")
-	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0…\377\377\377\1\0\0\0Ã\377\0\0")
-	IMAGE_SCAN("\1\377\0\0‡\0\0\0Ä\1\377\0\0")
-	IMAGE_SCAN("Î\1\377\0\0")
-IMAGE_PACKED(TB_SPRINGLEFT, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_SPRINGHSIZE)
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("\1\377\0\0Š\0\0\0Â\1\377\0\0")
-	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0ˆ\377\377\377\1\0\0\0Â\1\377\0\0")
-	IMAGE_SCAN("ƒ\377\0\0\1\0\0\0ˆ\377\377\377\1\0\0\0ƒ\377\0\0")
-	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0ˆ\377\377\377\1\0\0\0Â\1\377\0\0")
-	IMAGE_SCAN("\1\377\0\0Š\0\0\0Â\1\377\0\0")
-IMAGE_PACKED(TB_SPRINGHSIZE, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_SPRINGHCENTER)
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("Ã\1\377\0\0Ê\1\377\0\0")
-	IMAGE_SCAN("Ã\1\377\0\0Á†\0\0\0Ã\1\377\0\0")
-	IMAGE_SCAN("ƒ\377\0\0\1\0\0\0„\377\377\377\1\0\0\0ƒ\377\0\0")
-	IMAGE_SCAN("\1\377\0\0Á\1\377\0\0Á\2\377\0\0\0\0\0„\377\377\377\2\0\0\0\377\0\0Á\1\377\0\0Á\1\377\0\0")
-	IMAGE_SCAN("ƒ\377\0\0Â\1\0\0\0„\377\377\377\1\0\0\0ƒ\377\0\0")
-	IMAGE_SCAN("Á\1\377\0\0Æ\0\0\0Á\1\377\0\0")
-	IMAGE_SCAN("Á\1\377\0\0Ê\1\377\0\0")
-IMAGE_PACKED(TB_SPRINGHCENTER, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_SPRINGRIGHT)
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("")
-	IMAGE_SCAN("Ã\1\377\0\0")
-	IMAGE_SCAN("Ã\1\377\0\0‡\0\0\0Â\1\377\0\0")
-	IMAGE_SCAN("ƒ\377\0\0Á\1\0\0\0…\377\377\377\1\0\0\0Â\1\377\0\0")
-	IMAGE_SCAN("\1\377\0\0Á\1\377\0\0Á‚\377\0\0\1\0\0\0…\377\377\377\1\0\0\0ƒ\377\0\0")
-	IMAGE_SCAN("ƒ\377\0\0Ã\1\0\0\0…\377\377\377\1\0\0\0Â\1\377\0\0")
-	IMAGE_SCAN("Á\1\377\0\0ć\0\0\0Â\1\377\0\0")
-	IMAGE_SCAN("Á\1\377\0\0")
-IMAGE_PACKED(TB_SPRINGRIGHT, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_SPRINGTOP)
-	IMAGE_SCAN("Å…\377\0\0")
-	IMAGE_SCAN("Ç\1\377\0\0")
-	IMAGE_SCAN("Ç\1\377\0\0")
-	IMAGE_SCAN("Å…\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å…\0\0\0")
-	IMAGE_SCAN("Ç\1\377\0\0")
-	IMAGE_SCAN("Ç‚\377\0\0")
-	IMAGE_SCAN("ȃ\377\0\0")
-	IMAGE_SCAN("ƃ\377\0\0")
-	IMAGE_SCAN("ă\377\0\0")
-	IMAGE_SCAN("Æ‚\377\0\0")
-IMAGE_PACKED(TB_SPRINGTOP, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_SPRINGVSIZE)
-	IMAGE_SCAN("Å…\377\0\0")
-	IMAGE_SCAN("Ç\1\377\0\0")
-	IMAGE_SCAN("Ç\1\377\0\0")
-	IMAGE_SCAN("Å…\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å…\0\0\0")
-	IMAGE_SCAN("Ç\1\377\0\0")
-	IMAGE_SCAN("Ç\1\377\0\0")
-	IMAGE_SCAN("Å…\377\0\0")
-IMAGE_PACKED(TB_SPRINGVSIZE, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_SPRINGVCENTER)
-	IMAGE_SCAN("Æ‚\377\0\0")
-	IMAGE_SCAN("ă\377\0\0")
-	IMAGE_SCAN("ƃ\377\0\0")
-	IMAGE_SCAN("ȃ\377\0\0")
-	IMAGE_SCAN("Ç‚\377\0\0")
-	IMAGE_SCAN("Å…\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å…\0\0\0")
-	IMAGE_SCAN("Æ‚\377\0\0")
-	IMAGE_SCAN("ă\377\0\0")
-	IMAGE_SCAN("ƃ\377\0\0")
-	IMAGE_SCAN("ȃ\377\0\0")
-	IMAGE_SCAN("Ç‚\377\0\0")
-IMAGE_PACKED(TB_SPRINGVCENTER, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_SPRINGBOTTOM)
-	IMAGE_SCAN("Æ‚\377\0\0")
-	IMAGE_SCAN("ă\377\0\0")
-	IMAGE_SCAN("ƃ\377\0\0")
-	IMAGE_SCAN("ȃ\377\0\0")
-	IMAGE_SCAN("Ç‚\377\0\0")
-	IMAGE_SCAN("Ç\1\377\0\0")
-	IMAGE_SCAN("Å…\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
-	IMAGE_SCAN("Å…\0\0\0")
-	IMAGE_SCAN("Ç\1\377\0\0")
-	IMAGE_SCAN("Ç\1\377\0\0")
-	IMAGE_SCAN("Å…\377\0\0")
-IMAGE_PACKED(TB_SPRINGBOTTOM, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_SPRINGTOPLEFT)
-	IMAGE_SCAN("Ä…\377\0\0")
-	IMAGE_SCAN("Æ\1\377\0\0")
-	IMAGE_SCAN("Æ\1\377\0\0")
-	IMAGE_SCAN("Ç\0\0\0Â\1\377\0\0")
-	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0…\377\377\377\1\0\0\0Â\1\377\0\0")
-	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0…\377\377\377\1\0\0\0Áƒ\377\0\0")
-	IMAGE_SCAN("ƒ\377\0\0\1\0\0\0…\377\377\377\1\0\0\0‚\377\0\0Á\1\377\0\0Á\1\377\0\0")
-	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0…\377\377\377\1\0\0\0Ã\377\0\0")
-	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0…\377\377\377\1\0\0\0Ä\1\377\0\0")
-	IMAGE_SCAN("Ç\0\0\0Ä\1\377\0\0")
-	IMAGE_SCAN("Æ\1\377\0\0")
-	IMAGE_SCAN("Æ‚\377\0\0")
-	IMAGE_SCAN("ǃ\377\0\0")
-	IMAGE_SCAN("Ń\377\0\0")
-	IMAGE_SCAN("Ã\377\0\0")
-	IMAGE_SCAN("Å‚\377\0\0")
-IMAGE_PACKED(TB_SPRINGTOPLEFT, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
-IMAGE_BEGIN(TB_SPRINGAUTO)
-	IMAGE_SCAN("Ã…\377\0\0")
-	IMAGE_SCAN("Å\1\377\0\0")
-	IMAGE_SCAN("Å\1\377\0\0")
-	IMAGE_SCAN("\1\377\0\0Â…\0\0\0")
-	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0ƒ\377\377\377\1\0\0\0Â\1\377\0\0Ã\1\377\0\0")
-	IMAGE_SCAN("ƒ\377\0\0\1\0\0\0ƒ\377\377\377\1\0\0\0‚\377\0\0Á\1\377\0\0Á\1\377\0\0Á\1\377\0\0")
-	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0ƒ\377\377\377\1\0\0\0Ä\1\377\0\0")
-	IMAGE_SCAN("\1\377\0\0Â…\0\0\0")
-	IMAGE_SCAN("È…\0\0\0Â\1\377\0\0")
-	IMAGE_SCAN("Á\1\377\0\0Ã\1\377\0\0Â\1\0\0\0ƒ\377\377\377\1\0\0\0Â\1\377\0\0")
-	IMAGE_SCAN("\1\377\0\0Á\1\377\0\0Á\1\377\0\0Á‚\377\0\0\1\0\0\0ƒ\377\377\377\1\0\0\0ƒ\377\0\0")
-	IMAGE_SCAN("Ã\1\377\0\0Ä\1\0\0\0ƒ\377\377\377\1\0\0\0Â\1\377\0\0")
-	IMAGE_SCAN("È…\0\0\0Â\1\377\0\0")
-	IMAGE_SCAN("Ê\1\377\0\0")
-	IMAGE_SCAN("Ê\1\377\0\0")
-	IMAGE_SCAN("È…\377\0\0")
-IMAGE_PACKED(TB_SPRINGAUTO, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(CrossCursor)
+	IMAGE_SCAN("Ä\1\0\0\0")
+	IMAGE_SCAN("Ä\1\0\0\0")
+	IMAGE_SCAN("Ä\1\0\0\0")
+	IMAGE_SCAN("Ä\1\0\0\0")
+	IMAGE_SCAN("‰\0\0\0")
+	IMAGE_SCAN("Ä\1\0\0\0")
+	IMAGE_SCAN("Ä\1\0\0\0")
+	IMAGE_SCAN("Ä\1\0\0\0")
+	IMAGE_SCAN("Ä\1\0\0\0")
+IMAGE_PACKED(CrossCursor, "\2\20\0\0\0\20\0\0\0\4\0\0\0\4\0\0\0\0\0\0\0")
+IMAGE_BEGIN(RwIconSmall)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�€€€")
+	IMAGE_SCAN("\1€€€�\377\0\0\1€€€")
+	IMAGE_SCAN("\1€€€�\377\0\0\1€€€")
+	IMAGE_SCAN("\1€€€�ÀÀÀ\1€€€")
+	IMAGE_SCAN("\2€€€ÀÀÀ‚\377\377\377\1\0\0\0…\377\377\377„ÀÀÀ\1€€€")
+	IMAGE_SCAN("\2€€€ÀÀÀ‚\377\377\377‚\0\0\0„\377\377\377„ÀÀÀ\1€€€")
+	IMAGE_SCAN("\1€€€ƒÀÀÀ\3\0\0\0003×\377\0\0\0‡ÀÀÀ\1€€€")
+	IMAGE_SCAN("\1€€€ƒÀÀÀ\1\0\0\0‚3×\377\1\0\0\0†ÀÀÀ\1€€€")
+	IMAGE_SCAN("\1€€€ƒÀÀÀ\1\0\0\0ƒ3×\377\1\0\0\0…ÀÀÀ\1€€€")
+	IMAGE_SCAN("\1€€€ƒÀÀÀ\1\0\0\0ƒ3×\377‚\0\0\0…€€€")
+	IMAGE_SCAN("\1€€€ƒÀÀÀ\1\0\0\0‚3×\377\1\0\0\0‚ÀÀÀ\1€€€‚ÀÀÀ‚€€€")
+	IMAGE_SCAN("\1€€€ƒÀÀÀ\6\0\0\0hhh\0\0\0003×\377\0\0\0ÀÀÀ…€€€")
+	IMAGE_SCAN("„€€€\5\0\0\0€€€\0\0\0003×\377\0\0\0†€€€")
+	IMAGE_SCAN("Ç\3\0\0\0003×\377\0\0\0")
+	IMAGE_SCAN("Ç\1€€€‚\0\0\0")
+IMAGE_PACKED(RwIconSmall, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(RwIconLarge)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("Áž€€€")
+	IMAGE_SCAN("Á\1€€€œ\377\0\0\1€€€")
+	IMAGE_SCAN("Á\4€€€\377\0\0\377\377\377\377\0\0‚\377\377\377\1°°°‚\377\0\0\3\377\377\377\377\0\0\377\377\377‘\377\0\0\1€€€")
+	IMAGE_SCAN("Á\3€€€\377\0\0\377\377\377‚\377\0\0\6\377\377\377°°°\377\377\377\377\0\0\377\377\377\377\0\0‚\377\377\377�\377\0\0\1€€€")
+	IMAGE_SCAN("Á\1€€€œ\377\0\0\1€€€")
+	IMAGE_SCAN("Á\1€€€œÀÀÀ\1€€€")
+	IMAGE_SCAN("Á\1€€€œÀÀÀ\1€€€")
+	IMAGE_SCAN("Á\1€€€‚ÀÀÀŽ   ŒÀÀÀ\1€€€")
+	IMAGE_SCAN("Á\1€€€‚ÀÀÀ\1   �\377\377\377\1ÞÞÞ‹ÀÀÀ\1€€€")
+	IMAGE_SCAN("Á\1€€€‚ÀÀÀ\1   �\377\377\377\1ÞÞÞ‹ÀÀÀ\1€€€")
+	IMAGE_SCAN("Á\1€€€ƒÀÀÀŽÞÞÞ‹ÀÀÀ\1€€€")
+	IMAGE_SCAN("Á\1€€€œÀÀÀ\1€€€")
+	IMAGE_SCAN("Á\1€€€œÀÀÀ\1€€€")
+	IMAGE_SCAN("Á\1€€€‚ÀÀÀ‚NNN‚ÀÀÀ\2   ÀÀÀ‚\0\0\0’ÀÀÀ\1€€€")
+	IMAGE_SCAN("Á\1€€€‚ÀÀÀ\3NNNÞÞÞÀÀÀ‚   \4ÀÀÀ\0\0\0003×\377\0\0\0‘ÀÀÀ\1€€€")
+	IMAGE_SCAN("Á\1€€€ˆÀÀÀ\1\0\0\0‚3×\377\1\0\0\0�ÀÀÀ\1€€€")
+	IMAGE_SCAN("Á\1€€€ˆÀÀÀ\1\0\0\0ƒ3×\377\1\0\0\0�ÀÀÀ\1€€€")
+	IMAGE_SCAN("Á\1€€€ˆÀÀÀ\1\0\0\0„3×\377\1\0\0\0ŽÀÀÀ\1€€€")
+	IMAGE_SCAN("Á\1€€€ˆÀÀÀ\1\0\0\0…3×\377\1\0\0\0�ÀÀÀ\1€€€")
+	IMAGE_SCAN("Á\1€€€ˆÀÀÀ\1\0\0\0†3×\377\1\0\0\0ŒÀÀÀ\1€€€")
+	IMAGE_SCAN("Á\1€€€ˆÀÀÀ\1\0\0\0„3×\377„\0\0\0‹ÀÀÀ\1€€€")
+	IMAGE_SCAN("Á\1€€€ˆÀÀÀ\1\0\0\0‚3×\377\3\0\0\0003×\377\0\0\0ƒÀÀÀ‰ÞÞÞ‚ÀÀÀ\1€€€")
+	IMAGE_SCAN("Á\1€€€ˆÀÀÀ\2\0\0\0003×\377‚\0\0\0‚3×\377\1\0\0\0‚ÀÀÀ\3ÞÞÞÀÀÀ   ‚ÀÀÀ‚   ‚ÀÀÀ\3   ÀÀÀ€€€")
+	IMAGE_SCAN("Á\1€€€ˆÀÀÀ‚\0\0\0\2ÀÀÀ\0\0\0‚3×\377\1\0\0\0‚ÀÀÀ\2ÞÞÞÀÀÀ‚   \2ÀÀÀ   ƒÀÀÀ\3   ÀÀÀ€€€")
+	IMAGE_SCAN("Á\1€€€ˆÀÀÀ\1\0\0\0ƒÀÀÀ\1\0\0\0‚3×\377\1\0\0\0‚ÀÀÀ‰   \2ÀÀÀ€€€")
+	IMAGE_SCAN("Á\1€€€ŒÀÀÀ\1\0\0\0‚3×\377\1\0\0\0ŒÀÀÀ\1€€€")
+	IMAGE_SCAN("Á�\0\0\0\0013×\377Ž\0\0\0")
+	IMAGE_SCAN("Ð\1\0\0\0")
+IMAGE_PACKED(RwIconLarge, "\2 \0\0\0 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_ALIGNLEFT)
+	IMAGE_SCAN("\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Á‡\0\0\0Ã\1€\0\0")
+	IMAGE_SCAN("\1\0\0\0Á\7\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0‚€\0\0")
+	IMAGE_SCAN("\1\0\0\0Á\7\0\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\0\0\0Á…€\0\0")
+	IMAGE_SCAN("\1\0\0\0Á\7\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0‚€\0\0")
+	IMAGE_SCAN("\1\0\0\0Á‡\0\0\0Ã\1€\0\0")
+	IMAGE_SCAN("\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ƒ\0\0\0Ä\1€\0\0")
+	IMAGE_SCAN("\1\0\0\0Á\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0‚€\0\0")
+	IMAGE_SCAN("\1\0\0\0Á\5\0\0\0ÀÀÀ\377\377\377ÀÀÀ\0\0\0Á‡€\0\0")
+	IMAGE_SCAN("\1\0\0\0Á\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0‚€\0\0")
+	IMAGE_SCAN("\1\0\0\0ƒ\0\0\0Ä\1€\0\0")
+	IMAGE_SCAN("\1\0\0\0")
+IMAGE_PACKED(TB_ALIGNLEFT, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_ALIGNRIGHT)
+	IMAGE_SCAN("Î\1\0\0\0")
+	IMAGE_SCAN("Î\1\0\0\0")
+	IMAGE_SCAN("Â\1€\0\0Ç\0\0\0Á\1\0\0\0")
+	IMAGE_SCAN("‚€\0\0Â\7\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0Á\1\0\0\0")
+	IMAGE_SCAN("…€\0\0Á\7\0\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\0\0\0Á\1\0\0\0")
+	IMAGE_SCAN("‚€\0\0Â\7\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0Á\1\0\0\0")
+	IMAGE_SCAN("Â\1€\0\0Ç\0\0\0Á\1\0\0\0")
+	IMAGE_SCAN("Î\1\0\0\0")
+	IMAGE_SCAN("Î\1\0\0\0")
+	IMAGE_SCAN("Ä\1€\0\0ă\0\0\0Â\1\0\0\0")
+	IMAGE_SCAN("Ä‚€\0\0Â\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0Á\1\0\0\0")
+	IMAGE_SCAN("‡€\0\0Á\5\0\0\0ÀÀÀ\377\377\377ÀÀÀ\0\0\0Á\1\0\0\0")
+	IMAGE_SCAN("Ä‚€\0\0Â\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0Á\1\0\0\0")
+	IMAGE_SCAN("Ä\1€\0\0ă\0\0\0Â\1\0\0\0")
+	IMAGE_SCAN("Î\1\0\0\0")
+IMAGE_PACKED(TB_ALIGNRIGHT, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_ALIGNTOP)
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ƒ\0\0\0‡\0\0\0")
+	IMAGE_SCAN("Á\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0Á\7\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
+	IMAGE_SCAN("Á\5\0\0\0ÀÀÀ\377\377\377ÀÀÀ\0\0\0Á\7\0\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
+	IMAGE_SCAN("Á\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0Á\7\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
+	IMAGE_SCAN("ƒ\0\0\0‡\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("Ã\1€\0\0Æ\1€\0\0")
+	IMAGE_SCAN("ƒ€\0\0ă€\0\0")
+	IMAGE_SCAN("Á…€\0\0Â…€\0\0")
+	IMAGE_SCAN("Ã\1€\0\0Æ\1€\0\0")
+	IMAGE_SCAN("Ã\1€\0\0Æ\1€\0\0")
+	IMAGE_SCAN("Ã\1€\0\0Æ\1€\0\0")
+	IMAGE_SCAN("Ã\1€\0\0Æ\1€\0\0")
+IMAGE_PACKED(TB_ALIGNTOP, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_ALIGNBOTTOM)
+	IMAGE_SCAN("Ã\1€\0\0Ç\1€\0\0")
+	IMAGE_SCAN("Ã\1€\0\0Ç\1€\0\0")
+	IMAGE_SCAN("Ã\1€\0\0Ç\1€\0\0")
+	IMAGE_SCAN("Ã\1€\0\0Ç\1€\0\0")
+	IMAGE_SCAN("Á…€\0\0Ã…€\0\0")
+	IMAGE_SCAN("ƒ€\0\0Ń€\0\0")
+	IMAGE_SCAN("Ã\1€\0\0Ç\1€\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ƒ\0\0\0Ç\0\0\0")
+	IMAGE_SCAN("Á\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0Â\7\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
+	IMAGE_SCAN("Á\5\0\0\0ÀÀÀ\377\377\377ÀÀÀ\0\0\0Â\7\0\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
+	IMAGE_SCAN("Á\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0Â\7\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
+	IMAGE_SCAN("ƒ\0\0\0Ç\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(TB_ALIGNBOTTOM, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_VERTCENTER)
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Ç\1€\0\0Æ\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Å…€\0\0Ä\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ƃ€\0\0Å\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Ç\1€\0\0Æ\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Š\0\0\0Â\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Â\12\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\0\0\0Â\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Â\12\0\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0Â\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Š\0\0\0Â\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Ç\1€\0\0Æ\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0ƃ€\0\0Å\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Å…€\0\0Ä\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Ç\1€\0\0Æ\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(TB_VERTCENTER, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_HORZCENTER)
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Î\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Å„\0\0\0Å\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Å\4\0\0\0\377\377\377ÀÀÀ\0\0\0Å\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Å\4\0\0\0ÀÀÀ\377\377\377\0\0\0Å\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Â\1€\0\0Â\4\0\0\0\377\377\377ÀÀÀ\0\0\0Â\1€\0\0Â\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0‚€\0\0Á\4\0\0\0ÀÀÀ\377\377\377\0\0\0Á‚€\0\0Â\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0…€\0\0\4\0\0\0\377\377\377ÀÀÀ\0\0\0…€\0\0\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0‚€\0\0Á\4\0\0\0ÀÀÀ\377\377\377\0\0\0Á‚€\0\0Â\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Â\1€\0\0Â\4\0\0\0\377\377\377ÀÀÀ\0\0\0Â\1€\0\0Â\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Å\4\0\0\0ÀÀÀ\377\377\377\0\0\0Å\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Å„\0\0\0Å\1\0\0\0")
+	IMAGE_SCAN("\1\0\0\0Î\1\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(TB_HORZCENTER, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_ESPACEHORZ)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ƒ\0\0\0Ƀ\0\0\0")
+	IMAGE_SCAN("\3\377\377\377ÀÀÀ\0\0\0É\3\0\0\0\377\377\377ÀÀÀ")
+	IMAGE_SCAN("\3ÀÀÀ\377\377\377\0\0\0É\3\0\0\0ÀÀÀ\377\377\377")
+	IMAGE_SCAN("\3\377\377\377ÀÀÀ\0\0\0É\3\0\0\0\377\377\377ÀÀÀ")
+	IMAGE_SCAN("\3ÀÀÀ\377\377\377\0\0\0Â\1€\0\0Ã\1€\0\0Â\3\0\0\0ÀÀÀ\377\377\377")
+	IMAGE_SCAN("\3\377\377\377ÀÀÀ\0\0\0Á‚€\0\0€\0\0Á\3\0\0\0\377\377\377ÀÀÀ")
+	IMAGE_SCAN("\3ÀÀÀ\377\377\377\0\0\0‰€\0\0\3\0\0\0ÀÀÀ\377\377\377")
+	IMAGE_SCAN("\3\377\377\377ÀÀÀ\0\0\0Á‚€\0\0€\0\0Á\3\0\0\0\377\377\377ÀÀÀ")
+	IMAGE_SCAN("\3ÀÀÀ\377\377\377\0\0\0Â\1€\0\0Ã\1€\0\0Â\3\0\0\0ÀÀÀ\377\377\377")
+	IMAGE_SCAN("\3\377\377\377ÀÀÀ\0\0\0É\3\0\0\0\377\377\377ÀÀÀ")
+	IMAGE_SCAN("\3ÀÀÀ\377\377\377\0\0\0É\3\0\0\0ÀÀÀ\377\377\377")
+	IMAGE_SCAN("ƒ\0\0\0Ƀ\0\0\0")
+IMAGE_PACKED(TB_ESPACEHORZ, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_ESPACEVERT)
+	IMAGE_SCAN("\14\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
+	IMAGE_SCAN("\14\0\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
+	IMAGE_SCAN("Œ\0\0\0")
+	IMAGE_SCAN("Æ\1€\0\0")
+	IMAGE_SCAN("Ń€\0\0")
+	IMAGE_SCAN("Ä…€\0\0")
+	IMAGE_SCAN("Æ\1€\0\0")
+	IMAGE_SCAN("Æ\1€\0\0")
+	IMAGE_SCAN("Æ\1€\0\0")
+	IMAGE_SCAN("Ä…€\0\0")
+	IMAGE_SCAN("Ń€\0\0")
+	IMAGE_SCAN("Æ\1€\0\0")
+	IMAGE_SCAN("Œ\0\0\0")
+	IMAGE_SCAN("\14\0\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
+	IMAGE_SCAN("\14\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
+IMAGE_PACKED(TB_ESPACEVERT, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SAMEWIDTH)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\17\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
+	IMAGE_SCAN("\17\0\0\0ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\0\0\0")
+	IMAGE_SCAN("\2\0\0\0\377\377\377‚€\0\0\7ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ‚€\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�€\0\0\1\0\0\0")
+	IMAGE_SCAN("\2\0\0\0\377\377\377‚€\0\0\7ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ‚€\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("\17\0\0\0ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\0\0\0")
+	IMAGE_SCAN("\17\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(TB_SAMEWIDTH, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SAMEHEIGHT)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("É\0\0\0")
+	IMAGE_SCAN("Ã\11\0\0\0\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0")
+	IMAGE_SCAN("Ã\3\0\0\0ÀÀÀ\377\377\377ƒ€\0\0\3\377\377\377ÀÀÀ\0\0\0")
+	IMAGE_SCAN("Ã\2\0\0\0\377\377\377…€\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("Ã\11\0\0\0ÀÀÀ\377\377\377ÀÀÀ€\0\0ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
+	IMAGE_SCAN("Ã\11\0\0\0\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0")
+	IMAGE_SCAN("Ã\11\0\0\0ÀÀÀ\377\377\377ÀÀÀ€\0\0ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
+	IMAGE_SCAN("Ã\11\0\0\0\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0")
+	IMAGE_SCAN("Ã\11\0\0\0ÀÀÀ\377\377\377ÀÀÀ€\0\0ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
+	IMAGE_SCAN("Ã\2\0\0\0\377\377\377…€\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("Ã\3\0\0\0ÀÀÀ\377\377\377ƒ€\0\0\3\377\377\377ÀÀÀ\0\0\0")
+	IMAGE_SCAN("Ã\11\0\0\0\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0")
+	IMAGE_SCAN("É\0\0\0")
+IMAGE_PACKED(TB_SAMEHEIGHT, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SAMESIZE)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("�\0\0\0")
+	IMAGE_SCAN("\17\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ€\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
+	IMAGE_SCAN("\6\0\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀƒ€\0\0\6ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
+	IMAGE_SCAN("\5\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ…€\0\0\5ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
+	IMAGE_SCAN("\17\0\0\0ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\0\0\0")
+	IMAGE_SCAN("\2\0\0\0\377\377\377‚€\0\0\7ÀÀÀ\377\377\377ÀÀÀ€\0\0ÀÀÀ\377\377\377ÀÀÀ‚€\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("\1\0\0\0�€\0\0\1\0\0\0")
+	IMAGE_SCAN("\2\0\0\0\377\377\377‚€\0\0\7ÀÀÀ\377\377\377ÀÀÀ€\0\0ÀÀÀ\377\377\377ÀÀÀ‚€\0\0\2\377\377\377\0\0\0")
+	IMAGE_SCAN("\17\0\0\0ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\377\377\377€\0\0\377\377\377ÀÀÀ\0\0\0")
+	IMAGE_SCAN("\5\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ…€\0\0\5ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
+	IMAGE_SCAN("\6\0\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀƒ€\0\0\6ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
+	IMAGE_SCAN("\17\0\0\0\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ€\0\0ÀÀÀ\377\377\377ÀÀÀ\377\377\377ÀÀÀ\377\377\377\0\0\0")
+	IMAGE_SCAN("�\0\0\0")
+IMAGE_PACKED(TB_SAMESIZE, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_GRID)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0Â\1\0\0\0")
+IMAGE_PACKED(TB_GRID, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_ALIGNHCENTER)
+	IMAGE_SCAN("Ç\1\0\0\0")
+	IMAGE_SCAN("Ç\1\0\0\0")
+	IMAGE_SCAN("Á\1€\0\0‡\0\0\0Â\1€\0\0")
+	IMAGE_SCAN("Á‚€\0\0Á\7\0\0\0\377\377\377ÀÀÀ\0\0\0ÀÀÀ\377\377\377\0\0\0Á‚€\0\0")
+	IMAGE_SCAN("„€\0\0\7\0\0\0ÀÀÀ\377\377\377\0\0\0\377\377\377ÀÀÀ\0\0\0„€\0\0")
+	IMAGE_SCAN("Á‚€\0\0Á\7\0\0\0\377\377\377ÀÀÀ\0\0\0ÀÀÀ\377\377\377\0\0\0Á‚€\0\0")
+	IMAGE_SCAN("Á\1€\0\0‡\0\0\0Â\1€\0\0")
+	IMAGE_SCAN("Ç\1\0\0\0")
+	IMAGE_SCAN("Ç\1\0\0\0")
+	IMAGE_SCAN("Â\1€\0\0Ã\0\0\0Ã\1€\0\0")
+	IMAGE_SCAN("‚€\0\0Á\5\0\0\0\377\377\377\0\0\0\377\377\377\0\0\0Á‚€\0\0")
+	IMAGE_SCAN("…€\0\0\5\0\0\0ÀÀÀ\0\0\0ÀÀÀ\0\0\0…€\0\0")
+	IMAGE_SCAN("‚€\0\0Á\5\0\0\0\377\377\377\0\0\0\377\377\377\0\0\0Á‚€\0\0")
+	IMAGE_SCAN("Â\1€\0\0Ã\0\0\0Ã\1€\0\0")
+	IMAGE_SCAN("Ç\1\0\0\0")
+IMAGE_PACKED(TB_ALIGNHCENTER, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_ALIGNVCENTER)
+	IMAGE_SCAN("Ä\1€\0\0Æ\1€\0\0")
+	IMAGE_SCAN("Ä\1€\0\0Ä…€\0\0")
+	IMAGE_SCAN("Â…€\0\0À\0\0")
+	IMAGE_SCAN("À\0\0Å\1€\0\0")
+	IMAGE_SCAN("Ä\1€\0\0Ä…\0\0\0")
+	IMAGE_SCAN("Ã\0\0\0Ã\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0")
+	IMAGE_SCAN("Â\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0Â\5\0\0\0ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
+	IMAGE_SCAN("Á�\0\0\0")
+	IMAGE_SCAN("Â\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0Â\5\0\0\0ÀÀÀ\377\377\377ÀÀÀ\0\0\0")
+	IMAGE_SCAN("Ã\0\0\0Ã\5\0\0\0\377\377\377ÀÀÀ\377\377\377\0\0\0")
+	IMAGE_SCAN("Ä\1€\0\0Ä…\0\0\0")
+	IMAGE_SCAN("À\0\0Å\1€\0\0")
+	IMAGE_SCAN("Â…€\0\0À\0\0")
+	IMAGE_SCAN("Ä\1€\0\0Ä…€\0\0")
+	IMAGE_SCAN("Ä\1€\0\0Æ\1€\0\0")
+IMAGE_PACKED(TB_ALIGNVCENTER, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_MINHEIGHT)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("Ç\1€\0\0")
+	IMAGE_SCAN("Ç\1€\0\0")
+	IMAGE_SCAN("Å…€\0\0")
+	IMAGE_SCAN("ƃ€\0\0")
+	IMAGE_SCAN("Ç\1€\0\0")
+	IMAGE_SCAN("Á�\0\0\0")
+	IMAGE_SCAN("Á\1\0\0\0‹\0\0\377\1\0\0\0")
+	IMAGE_SCAN("Á�\0\0\0")
+	IMAGE_SCAN("Ç\1€\0\0")
+	IMAGE_SCAN("ƃ€\0\0")
+	IMAGE_SCAN("Å…€\0\0")
+	IMAGE_SCAN("Ç\1€\0\0")
+	IMAGE_SCAN("Ç\1€\0\0")
+IMAGE_PACKED(TB_MINHEIGHT, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_MINWIDTH)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("ƃ\0\0\0")
+	IMAGE_SCAN("Æ\3\0\0\0\0\0\377\0\0\0")
+	IMAGE_SCAN("Æ\3\0\0\0\0\0\377\0\0\0")
+	IMAGE_SCAN("Æ\3\0\0\0\0\0\377\0\0\0")
+	IMAGE_SCAN("Ã\1€\0\0Â\3\0\0\0\0\0\377\0\0\0Â\1€\0\0")
+	IMAGE_SCAN("€\0\0Á\3\0\0\0\0\0\377\0\0\0Á‚€\0\0")
+	IMAGE_SCAN("Á…€\0\0\3\0\0\0\0\0\377\0\0\0…€\0\0")
+	IMAGE_SCAN("€\0\0Á\3\0\0\0\0\0\377\0\0\0Á‚€\0\0")
+	IMAGE_SCAN("Ã\1€\0\0Â\3\0\0\0\0\0\377\0\0\0Â\1€\0\0")
+	IMAGE_SCAN("Æ\3\0\0\0\0\0\377\0\0\0")
+	IMAGE_SCAN("Æ\3\0\0\0\0\0\377\0\0\0")
+	IMAGE_SCAN("Æ\3\0\0\0\0\0\377\0\0\0")
+	IMAGE_SCAN("ƃ\0\0\0")
+IMAGE_PACKED(TB_MINWIDTH, "\2\20\0\0\0\20\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_ALIGNLBL)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("Ì\1€\0\0")
+	IMAGE_SCAN("˃€\0\0")
+	IMAGE_SCAN("Ê…€\0\0")
+	IMAGE_SCAN("\1\0\0\0‚\0\0\0Â\1\0\0\0Ä\1€\0\0")
+	IMAGE_SCAN("\1\0\0\0Â\1\0\0\0Á\1\0\0\0Á\1\0\0\0Ä\1€\0\0")
+	IMAGE_SCAN("\1\0\0\0Â\1\0\0\0Á\1\0\0\0Á\1\0\0\0Ä\1€\0\0")
+	IMAGE_SCAN("\1\0\0\0‚\0\0\0Â\1\0\0\0Á†\377\0\0")
+	IMAGE_SCAN("\1\0\0\0Â\1\0\0\0Á\1\0\0\0Á\1\0\0\0Ä\1€\0\0")
+	IMAGE_SCAN("\1\0\0\0Â\1\0\0\0Á\1\0\0\0Á\1\0\0\0Ä\1€\0\0")
+	IMAGE_SCAN("‚\0\0\0Á‚\0\0\0‚\0\0\0Ã\1€\0\0")
+	IMAGE_SCAN("Ê…€\0\0")
+	IMAGE_SCAN("˃€\0\0")
+	IMAGE_SCAN("Ì\1€\0\0")
+IMAGE_PACKED(TB_ALIGNLBL, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGLEFT)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("Ì\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0‡\0\0\0Â\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0…\377\377\377\1\0\0\0Áƒ\377\0\0")
+	IMAGE_SCAN("ƒ\377\0\0\1\0\0\0…\377\377\377\1\0\0\0‚\377\0\0Á\1\377\0\0Á\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0…\377\377\377\1\0\0\0Ã\377\0\0")
+	IMAGE_SCAN("\1\377\0\0‡\0\0\0Ä\1\377\0\0")
+	IMAGE_SCAN("Î\1\377\0\0")
+IMAGE_PACKED(TB_SPRINGLEFT, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGHSIZE)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("\1\377\0\0Š\0\0\0Â\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0ˆ\377\377\377\1\0\0\0Â\1\377\0\0")
+	IMAGE_SCAN("ƒ\377\0\0\1\0\0\0ˆ\377\377\377\1\0\0\0ƒ\377\0\0")
+	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0ˆ\377\377\377\1\0\0\0Â\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0Š\0\0\0Â\1\377\0\0")
+IMAGE_PACKED(TB_SPRINGHSIZE, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGHCENTER)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("Ã\1\377\0\0Ê\1\377\0\0")
+	IMAGE_SCAN("Ã\1\377\0\0Á†\0\0\0Ã\1\377\0\0")
+	IMAGE_SCAN("ƒ\377\0\0\1\0\0\0„\377\377\377\1\0\0\0ƒ\377\0\0")
+	IMAGE_SCAN("\1\377\0\0Á\1\377\0\0Á\2\377\0\0\0\0\0„\377\377\377\2\0\0\0\377\0\0Á\1\377\0\0Á\1\377\0\0")
+	IMAGE_SCAN("ƒ\377\0\0Â\1\0\0\0„\377\377\377\1\0\0\0ƒ\377\0\0")
+	IMAGE_SCAN("Á\1\377\0\0Æ\0\0\0Á\1\377\0\0")
+	IMAGE_SCAN("Á\1\377\0\0Ê\1\377\0\0")
+IMAGE_PACKED(TB_SPRINGHCENTER, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGRIGHT)
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("")
+	IMAGE_SCAN("Ã\1\377\0\0")
+	IMAGE_SCAN("Ã\1\377\0\0‡\0\0\0Â\1\377\0\0")
+	IMAGE_SCAN("ƒ\377\0\0Á\1\0\0\0…\377\377\377\1\0\0\0Â\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0Á\1\377\0\0Á‚\377\0\0\1\0\0\0…\377\377\377\1\0\0\0ƒ\377\0\0")
+	IMAGE_SCAN("ƒ\377\0\0Ã\1\0\0\0…\377\377\377\1\0\0\0Â\1\377\0\0")
+	IMAGE_SCAN("Á\1\377\0\0ć\0\0\0Â\1\377\0\0")
+	IMAGE_SCAN("Á\1\377\0\0")
+IMAGE_PACKED(TB_SPRINGRIGHT, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGTOP)
+	IMAGE_SCAN("Å…\377\0\0")
+	IMAGE_SCAN("Ç\1\377\0\0")
+	IMAGE_SCAN("Ç\1\377\0\0")
+	IMAGE_SCAN("Å…\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å…\0\0\0")
+	IMAGE_SCAN("Ç\1\377\0\0")
+	IMAGE_SCAN("Ç‚\377\0\0")
+	IMAGE_SCAN("ȃ\377\0\0")
+	IMAGE_SCAN("ƃ\377\0\0")
+	IMAGE_SCAN("ă\377\0\0")
+	IMAGE_SCAN("Æ‚\377\0\0")
+IMAGE_PACKED(TB_SPRINGTOP, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGVSIZE)
+	IMAGE_SCAN("Å…\377\0\0")
+	IMAGE_SCAN("Ç\1\377\0\0")
+	IMAGE_SCAN("Ç\1\377\0\0")
+	IMAGE_SCAN("Å…\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å…\0\0\0")
+	IMAGE_SCAN("Ç\1\377\0\0")
+	IMAGE_SCAN("Ç\1\377\0\0")
+	IMAGE_SCAN("Å…\377\0\0")
+IMAGE_PACKED(TB_SPRINGVSIZE, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGVCENTER)
+	IMAGE_SCAN("Æ‚\377\0\0")
+	IMAGE_SCAN("ă\377\0\0")
+	IMAGE_SCAN("ƃ\377\0\0")
+	IMAGE_SCAN("ȃ\377\0\0")
+	IMAGE_SCAN("Ç‚\377\0\0")
+	IMAGE_SCAN("Å…\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å…\0\0\0")
+	IMAGE_SCAN("Æ‚\377\0\0")
+	IMAGE_SCAN("ă\377\0\0")
+	IMAGE_SCAN("ƃ\377\0\0")
+	IMAGE_SCAN("ȃ\377\0\0")
+	IMAGE_SCAN("Ç‚\377\0\0")
+IMAGE_PACKED(TB_SPRINGVCENTER, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGBOTTOM)
+	IMAGE_SCAN("Æ‚\377\0\0")
+	IMAGE_SCAN("ă\377\0\0")
+	IMAGE_SCAN("ƃ\377\0\0")
+	IMAGE_SCAN("ȃ\377\0\0")
+	IMAGE_SCAN("Ç‚\377\0\0")
+	IMAGE_SCAN("Ç\1\377\0\0")
+	IMAGE_SCAN("Å…\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å\1\0\0\0ƒ\377\377\377\1\0\0\0")
+	IMAGE_SCAN("Å…\0\0\0")
+	IMAGE_SCAN("Ç\1\377\0\0")
+	IMAGE_SCAN("Ç\1\377\0\0")
+	IMAGE_SCAN("Å…\377\0\0")
+IMAGE_PACKED(TB_SPRINGBOTTOM, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGTOPLEFT)
+	IMAGE_SCAN("Ä…\377\0\0")
+	IMAGE_SCAN("Æ\1\377\0\0")
+	IMAGE_SCAN("Æ\1\377\0\0")
+	IMAGE_SCAN("Ç\0\0\0Â\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0…\377\377\377\1\0\0\0Â\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0…\377\377\377\1\0\0\0Áƒ\377\0\0")
+	IMAGE_SCAN("ƒ\377\0\0\1\0\0\0…\377\377\377\1\0\0\0‚\377\0\0Á\1\377\0\0Á\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0…\377\377\377\1\0\0\0Ã\377\0\0")
+	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0…\377\377\377\1\0\0\0Ä\1\377\0\0")
+	IMAGE_SCAN("Ç\0\0\0Ä\1\377\0\0")
+	IMAGE_SCAN("Æ\1\377\0\0")
+	IMAGE_SCAN("Æ‚\377\0\0")
+	IMAGE_SCAN("ǃ\377\0\0")
+	IMAGE_SCAN("Ń\377\0\0")
+	IMAGE_SCAN("Ã\377\0\0")
+	IMAGE_SCAN("Å‚\377\0\0")
+IMAGE_PACKED(TB_SPRINGTOPLEFT, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
+IMAGE_BEGIN(TB_SPRINGAUTO)
+	IMAGE_SCAN("Ã…\377\0\0")
+	IMAGE_SCAN("Å\1\377\0\0")
+	IMAGE_SCAN("Å\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0Â…\0\0\0")
+	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0ƒ\377\377\377\1\0\0\0Â\1\377\0\0Ã\1\377\0\0")
+	IMAGE_SCAN("ƒ\377\0\0\1\0\0\0ƒ\377\377\377\1\0\0\0‚\377\0\0Á\1\377\0\0Á\1\377\0\0Á\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0Â\1\0\0\0ƒ\377\377\377\1\0\0\0Ä\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0Â…\0\0\0")
+	IMAGE_SCAN("È…\0\0\0Â\1\377\0\0")
+	IMAGE_SCAN("Á\1\377\0\0Ã\1\377\0\0Â\1\0\0\0ƒ\377\377\377\1\0\0\0Â\1\377\0\0")
+	IMAGE_SCAN("\1\377\0\0Á\1\377\0\0Á\1\377\0\0Á‚\377\0\0\1\0\0\0ƒ\377\377\377\1\0\0\0ƒ\377\0\0")
+	IMAGE_SCAN("Ã\1\377\0\0Ä\1\0\0\0ƒ\377\377\377\1\0\0\0Â\1\377\0\0")
+	IMAGE_SCAN("È…\0\0\0Â\1\377\0\0")
+	IMAGE_SCAN("Ê\1\377\0\0")
+	IMAGE_SCAN("Ê\1\377\0\0")
+	IMAGE_SCAN("È…\377\0\0")
+IMAGE_PACKED(TB_SPRINGAUTO, "\2\20\0\0\0\20\0\0\0\377\377\377\377\0\0\0\0\0\0\0\0")
diff --git a/uppsrc2/rw/rw.rc b/archive/uppsrc/rw/rw.rc
similarity index 100%
rename from uppsrc2/rw/rw.rc
rename to archive/uppsrc/rw/rw.rc
diff --git a/uppsrc2/rw/rw.upp b/archive/uppsrc/rw/rw.upp
similarity index 91%
rename from uppsrc2/rw/rw.upp
rename to archive/uppsrc/rw/rw.upp
index 6ae2b2397..e5c299818 100644
--- a/uppsrc2/rw/rw.upp
+++ b/archive/uppsrc/rw/rw.upp
@@ -1,27 +1,27 @@
-acceptflags
-	IDERW;
-
-uses
-	CtrlLib;
-
-file
-	Designer.h,
-	Designer.lay,
-	Designer.cpp,
-	DesignerFile.cpp,
-	DesignerLayt.cpp,
-	DesignerWin.cpp,
-	iderw.h,
-	Alias.cpp,
-	ItemCtrl.cpp,
-	Lang.cpp,
-	StdCtrls.cpp,
-	Util.cpp,
-	rw.iml,
-	rw.rc,
-	Info readonly separator,
-	Copying;
-
-mainconfig
-	"" = "";
-
+acceptflags
+	IDERW;
+
+uses
+	CtrlLib;
+
+file
+	Designer.h,
+	Designer.lay,
+	Designer.cpp,
+	DesignerFile.cpp,
+	DesignerLayt.cpp,
+	DesignerWin.cpp,
+	iderw.h,
+	Alias.cpp,
+	ItemCtrl.cpp,
+	Lang.cpp,
+	StdCtrls.cpp,
+	Util.cpp,
+	rw.iml,
+	rw.rc,
+	Info readonly separator,
+	Copying;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/CoWorkLoop/CoWorkLoop.cpp b/reference/CoWorkLoop/CoWorkLoop.cpp
new file mode 100644
index 000000000..e6e4e33e6
--- /dev/null
+++ b/reference/CoWorkLoop/CoWorkLoop.cpp
@@ -0,0 +1,37 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+force_inline double Sum(const String& s)
+{
+	CParser p(s);
+	double sum = 0;
+	while(!p.IsEof())
+		sum += p.ReadDouble();
+	return sum;
+}
+
+CONSOLE_APP_MAIN
+{
+	SeedRandom(0);
+	Vector<String> data;
+	for(int i = 0; i < 10000000; i++) {
+		int n = Random(7);
+		data.Add();
+		for(int j = 0; j < n; j++)
+			data.Top() << Random() << ' ';
+	}
+	
+	double sum = 0;
+	CoWork co;
+	co * [&] {
+		double m = 0;
+		int i;
+		while((i = co.Next()) < data.GetCount())
+			m += Sum(data[i]);
+		CoWork::FinLock();
+		sum += m;
+	};
+
+	RDUMP(sum);
+}
diff --git a/reference/CoWorkLoop/CoWorkLoop.upp b/reference/CoWorkLoop/CoWorkLoop.upp
new file mode 100644
index 000000000..0079d4d8a
--- /dev/null
+++ b/reference/CoWorkLoop/CoWorkLoop.upp
@@ -0,0 +1,11 @@
+description "Demonstrates Loop (aka operator *) method\377";
+
+uses
+	Core;
+
+file
+	CoWorkLoop.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/tutorial/CoreTutorial/CoLoop.cpp b/tutorial/CoreTutorial/CoLoop.cpp
new file mode 100644
index 000000000..1d1278c5f
--- /dev/null
+++ b/tutorial/CoreTutorial/CoLoop.cpp
@@ -0,0 +1,33 @@
+#include "Tutorial.h"
+
+void CoLoopTutorial()
+{
+	/// .CoWork loop method
+	
+	/// An alternative to `CoPartition` is 'loop' method of `CoWork` (`Loop` method with synonym
+	/// `operator*`). In this pattern, the job is simply started in all threads and the code is
+	/// responsible for scheduling the work. `Loop` / `operator*` waits for all started threads
+	/// to finish. For scheduling, it is possible to use internal `CoWork` index counter,
+	/// which is set to 0 at the start of `Loop` / `operator*`. This way, the overhead associated
+	/// with creating lambdas and scheduling them is kept to the minimum.
+	
+	Vector<String> data;
+	for(int i = 0; i < 100; i++)
+		data.Add(AsString(1.0 / i));
+	
+	double sum = 0;
+	
+	CoWork co;
+	co * [&] {
+		int i;
+		double m = 0;
+		while((i = co.Next()) < data.GetCount())
+			m += atof(data[i]);
+		CoWork::FinLock();
+		sum += m;
+	};
+
+	DUMP(sum);
+	
+	///
+}
diff --git a/tutorial/CoreTutorial/CoreTutorial.upp b/tutorial/CoreTutorial/CoreTutorial.upp
index 66f534a3f..394802893 100644
--- a/tutorial/CoreTutorial/CoreTutorial.upp
+++ b/tutorial/CoreTutorial/CoreTutorial.upp
@@ -46,6 +46,7 @@ file
 	CoWork.cpp,
 	Async.cpp,
 	CoPartition.cpp,
+	CoLoop.cpp,
 	Parallel.cpp,
 	Stream readonly separator,
 	Stream.cpp,
diff --git a/tutorial/CoreTutorial/tutorial2.cpp b/tutorial/CoreTutorial/tutorial2.cpp
index 6142e84f5..3f495a4cb 100644
--- a/tutorial/CoreTutorial/tutorial2.cpp
+++ b/tutorial/CoreTutorial/tutorial2.cpp
@@ -56,6 +56,7 @@ GUI_APP_MAIN
 	DO(CoWorkTutorial);
 	DO(AsyncTutorial);
 	DO(CoPartitionTutorial);
+	DO(CoLoopTutorial);
 	DO(CoAlgoTutorial);
 
 	MakeTutorial();
diff --git a/uppsrc/Painter/Rasterizer3.h b/uppsrc/Painter/Rasterizer3.h
deleted file mode 100644
index e940d40dc..000000000
--- a/uppsrc/Painter/Rasterizer3.h
+++ /dev/null
@@ -1,45 +0,0 @@
-class Rasterizer {
-	Rectf                   cliprect;
-	double                  x1, y1;
-	Buffer< Vector<dword> >  cell;
-	int                     xmax, ymax;
-	int                     min_y;
-	int                     max_y;
-	Size                    sz;
-
-	inline dword Cell(int x, int w, int c)     { return (x << 18) + (w << 9) + c; }
-	inline int   GetX(dword cell)              { return cell >> 18; }
-	inline int   GetW(dword cell)              { return (cell >> 9) & 511; }
-	inline int   GetC(dword cell)              { return (cell & 256) ? -512 | (cell & 511) : (cell & 511); }
-
-	void  Init();
-	dword *AddCells(int y, int n);
-	void  RenderHLine(int ey, int x1, int y1, int x2, int y2);
-	void  LineClip(double x1, double y1, double x2, double y2);
-	int   CvX(double x);
-	int   CvY(double y);
-	void  CvLine(double x1, double y1, double x2, double y2);
-
-public:
-	struct Target {
-		virtual void Start(int x, int len) = 0;
-		virtual void Render(int val) = 0;
-		virtual void Render(int val, int len) = 0;
-	};
-
-	void LineRaw(int x1, int y1, int x2, int y2);
-	
-	void Move(double x, double y);
-	void Line(double x, double y);
-
-	int  MinY() const                         { return min_y; }
-	int  MaxY() const                         { return max_y; }
-	
-	void SetClip(const Rectf& rect);
-
-	void Render(int y, Target& g);
-
-	void Reset();
-	
-	Rasterizer(int cx, int cy);
-};