Way too much changes - all over.

2 files changed, 806 insertions, 6 deletions

diff --git a/MSVC/Baltisot - generic/Baltisot - generic.vcproj b/MSVC/Baltisot - generic/Baltisot - generic.vcproj
index 7338f95..dc69cea 100644
--- a/MSVC/Baltisot - generic/Baltisot - generic.vcproj
+++ b/MSVC/Baltisot - generic/Baltisot - generic.vcproj
@@ -41,8 +41,8 @@
 				Name="VCCLCompilerTool"
 				UseUnicodeResponseFiles="true"
 				Optimization="0"
-				AdditionalIncludeDirectories=""..\dirent";"..\..\generic\lib\lua\include";"..\..\generic\lib\lua\includes";"..\..\generic\lib\zlib\include";"..\..\generic\include";"..\regex""
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;READLINE_STATIC;READLINE_LIBRARY;STD_HEADERS;STDC;$(NOINHERIT)"
+				AdditionalIncludeDirectories=""..\dirent";"..\..\generic\lib\lua\include";"..\..\generic\lib\lua\includes";"..\..\generic\lib\zlib\include";"..\..\generic\include";"..\regex";"..\iconv""
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;READLINE_STATIC;READLINE_LIBRARY;STD_HEADERS;STDC;LIBICONV_PLUG;NO_HFILE;$(NOINHERIT)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -104,8 +104,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;..\dirent&quot;;&quot;..\..\generic\lib\lua\include&quot;;&quot;..\..\generic\lib\lua\includes&quot;;&quot;..\..\generic\lib\zlib\include&quot;;&quot;..\..\generic\include&quot;;&quot;..\regex&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;READLINE_STATIC;READLINE_LIBRARY;STD_HEADERS;STDC;$(NOINHERIT)"
+				AdditionalIncludeDirectories="&quot;..\dirent&quot;;&quot;..\..\generic\lib\lua\include&quot;;&quot;..\..\generic\lib\lua\includes&quot;;&quot;..\..\generic\lib\zlib\include&quot;;&quot;..\..\generic\include&quot;;&quot;..\regex&quot;;&quot;..\iconv&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;READLINE_STATIC;READLINE_LIBRARY;STD_HEADERS;STDC;LIBICONV_PLUG;NO_HFILE;$(NOINHERIT)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -331,6 +331,18 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="Socket class"
+				>
+				<File
+					RelativePath="..\..\generic\lib\Socket.cc"
+					>
+				</File>
+				<File
+					RelativePath="..\..\generic\include\Socket.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Lua (external)"
@@ -988,6 +1000,794 @@
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="iconv (external)"
+			>
+			<File
+				RelativePath="..\iconv\aliases.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\aliases2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\aliases_aix.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\aliases_dos.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\aliases_extra.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\aliases_osf1.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\armscii_8.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\ascii.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\big5.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\big5hkscs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\c99.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\ces_big5.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\ces_gbk.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cjk_variants.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cns11643.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cns11643_1.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cns11643_15.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cns11643_2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cns11643_3.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cns11643_4.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cns11643_4a.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cns11643_4b.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cns11643_5.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cns11643_6.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cns11643_7.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cns11643_inv.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\converters.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp1046.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp1124.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp1125.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp1129.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp1133.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp1161.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp1162.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp1163.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp1250.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp1251.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp1252.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp1253.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp1254.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp1255.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp1256.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp1257.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp1258.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp437.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp737.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp775.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp850.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp852.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp853.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp855.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp856.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp857.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp858.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp860.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp861.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp862.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp863.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp864.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp865.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp866.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp869.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp874.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp922.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp932.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp932ext.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp936ext.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp943.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp949.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp950.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\cp950ext.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\dec_hanyu.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\dec_kanji.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\euc_cn.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\euc_jisx0213.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\euc_jp.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\euc_kr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\euc_tw.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\flags.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\flushwc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\gb12345.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\gb12345ext.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\gb18030.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\gb18030ext.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\gb18030uni.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\gb2312.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\gbk.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\gbkext1.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\gbkext2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\gbkext_inv.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\georgian_academy.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\georgian_ps.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\hkscs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\hp_roman8.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\hz.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iconv-config.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iconv.c"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iconv.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso2022_cn.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso2022_cnext.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso2022_jp.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso2022_jp1.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso2022_jp2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso2022_jp3.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso2022_kr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso646_cn.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso646_jp.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso8859_1.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso8859_10.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso8859_13.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso8859_14.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso8859_15.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso8859_16.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso8859_2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso8859_3.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso8859_4.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso8859_5.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso8859_6.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso8859_7.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso8859_8.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\iso8859_9.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\isoir165.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\isoir165ext.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\java.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\jisx0201.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\jisx0208.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\jisx0212.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\jisx0213.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\johab.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\johab_hangul.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\koi8_r.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\koi8_ru.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\koi8_t.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\koi8_u.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\ksc5601.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\libcharset.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\localcharset.c"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\localcharset.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\loop_unicode.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\loop_wchar.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\loops.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\mac_arabic.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\mac_centraleurope.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\mac_croatian.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\mac_cyrillic.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\mac_greek.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\mac_hebrew.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\mac_iceland.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\mac_roman.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\mac_romania.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\mac_thai.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\mac_turkish.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\mac_ukraine.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\mulelao.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\nextstep.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\relocatable.c"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\relocatable.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\riscos1.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\shift_jisx0213.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\sjis.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\tcvn.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\tds565.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\tis620.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\translit.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\ucs2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\ucs2be.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\ucs2internal.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\ucs2le.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\ucs2swapped.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\ucs4.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\ucs4be.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\ucs4internal.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\ucs4le.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\ucs4swapped.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\uhc_1.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\uhc_2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\utf16.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\utf16be.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\utf16le.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\utf32.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\utf32be.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\utf32le.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\utf7.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\utf8.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\vietcomb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\iconv\viscii.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="TaskMan class"
+			>
+			<File
+				RelativePath="..\..\generic\lib\TaskMan.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\generic\include\TaskMan.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Task class"
+			>
+			<File
+				RelativePath="..\..\generic\lib\Task.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\generic\include\task.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="CopyJob class"
+			>
+			<File
+				RelativePath="..\..\generic\lib\CopyJob.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\generic\include\CopyJob.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\..\generic\include\Color.h"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/MSVC/mogltk/mogltk.vcproj b/MSVC/mogltk/mogltk.vcproj
index 29dab9a..c57590a 100644
--- a/MSVC/mogltk/mogltk.vcproj
+++ b/MSVC/mogltk/mogltk.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\SDL\include;&quot;..\..\mogltk\include&quot;;&quot;..\..\generic\include&quot;;&quot;..\..\generic\lib\zlib\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NO_HFILE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -104,7 +104,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\SDL\include;&quot;..\..\mogltk\include&quot;;&quot;..\..\generic\include&quot;;&quot;..\..\generic\lib\zlib\include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NO_HFILE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"