Update source, makefiles and win32 projects.

1 files changed, 24 insertions, 702 deletions

diff --git a/platform/win32/generated.vcproj b/platform/win32/generated.vcproj
index 4fef3694..109031a7 100644
--- a/platform/win32/generated.vcproj
+++ b/platform/win32/generated.vcproj
@@ -43,8 +43,8 @@
 			<Tool
 				Name="VCNMakeTool"
 				BuildCommandLine="generate.bat"
-				ReBuildCommandLine="del /q ..\generated &amp;&amp; generate.bat"
-				CleanCommandLine="del /q ..\generated"
+				ReBuildCommandLine="del /q ..\..\generated &amp;&amp; generate.bat"
+				CleanCommandLine="del /q ..\..\generated"
 				Output="generated\cmap_cns.h"
 				PreprocessorDefinitions="WIN32;NDEBUG"
 				IncludeSearchPath=""
@@ -63,8 +63,8 @@
 			<Tool
 				Name="VCNMakeTool"
 				BuildCommandLine="generate.bat"
-				ReBuildCommandLine="del /q ..\generated &amp;&amp; generate.bat"
-				CleanCommandLine="del /q ..\generated"
+				ReBuildCommandLine="del /q ..\..\generated &amp;&amp; generate.bat"
+				CleanCommandLine="del /q ..\..\generated"
 				Output="generated\cmap_cns.h"
 				PreprocessorDefinitions="WIN32;_DEBUG"
 				IncludeSearchPath=""
@@ -79,751 +79,73 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\scripts\bin2hex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\scripts\cmapdump.c"
-				>
-			</File>
-			<File
-				RelativePath="..\scripts\cquote.c"
-				>
-			</File>
-			<File
-				RelativePath="..\scripts\fontdump.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			Name="scripts"
 			>
 			<File
-				RelativePath="..\scripts\jconfig.h"
+				RelativePath="..\..\scripts\bin2hex.c"
 				>
 			</File>
 			<File
-				RelativePath="..\scripts\opj_config.h"
+				RelativePath="..\..\scripts\cmapdump.c"
 				>
 			</File>
 			<File
-				RelativePath="..\scripts\slimftmodules.h"
+				RelativePath="..\..\scripts\cquote.c"
 				>
 			</File>
 			<File
-				RelativePath="..\scripts\slimftoptions.h"
+				RelativePath="..\..\scripts\fontdump.c"
 				>
 			</File>
 		</Filter>
 		<Filter
-			Name="CMAPs"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<Filter
-				Name="cns"
-				>
-				<File
-					RelativePath="..\cmaps\cns\Adobe-CNS1-0"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\Adobe-CNS1-1"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\Adobe-CNS1-2"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\Adobe-CNS1-3"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\Adobe-CNS1-4"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\Adobe-CNS1-5"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\Adobe-CNS1-6"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\Adobe-CNS1-UCS2"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\B5-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\B5-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\B5pc-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\B5pc-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\CNS-EUC-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\CNS-EUC-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\CNS1-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\CNS1-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\CNS2-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\CNS2-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\ETen-B5-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\ETen-B5-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\ETenms-B5-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\ETenms-B5-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\ETHK-B5-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\ETHK-B5-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\HKdla-B5-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\HKdla-B5-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\HKdlb-B5-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\HKdlb-B5-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\HKgccs-B5-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\HKgccs-B5-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\HKm314-B5-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\HKm314-B5-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\HKm471-B5-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\HKm471-B5-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\HKscs-B5-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\HKscs-B5-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\UniCNS-UCS2-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\UniCNS-UCS2-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\UniCNS-UTF16-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\cns\UniCNS-UTF16-V"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="gb"
-				>
-				<File
-					RelativePath="..\cmaps\gb\Adobe-GB1-0"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\Adobe-GB1-1"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\Adobe-GB1-2"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\Adobe-GB1-3"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\Adobe-GB1-4"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\Adobe-GB1-5"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\Adobe-GB1-UCS2"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\GB-EUC-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\GB-EUC-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\GB-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\GB-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\GBK-EUC-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\GBK-EUC-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\GBK2K-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\GBK2K-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\GBKp-EUC-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\GBKp-EUC-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\GBpc-EUC-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\GBpc-EUC-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\GBT-EUC-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\GBT-EUC-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\GBT-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\GBT-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\GBTpc-EUC-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\GBTpc-EUC-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\UniGB-UCS2-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\UniGB-UCS2-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\UniGB-UTF16-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\gb\UniGB-UTF16-V"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="japan"
-				>
-				<File
-					RelativePath="..\cmaps\japan\78-EUC-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\78-EUC-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\78-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\78-RKSJ-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\78-RKSJ-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\78-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\78ms-RKSJ-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\78ms-RKSJ-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\83pv-RKSJ-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\90ms-RKSJ-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\90ms-RKSJ-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\90msp-RKSJ-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\90msp-RKSJ-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\90pv-RKSJ-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\90pv-RKSJ-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Add-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Add-RKSJ-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Add-RKSJ-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Add-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Adobe-Japan1-0"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Adobe-Japan1-1"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Adobe-Japan1-2"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Adobe-Japan1-3"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Adobe-Japan1-4"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Adobe-Japan1-5"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Adobe-Japan1-6"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Adobe-Japan1-UCS2"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Adobe-Japan2-0"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\EUC-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\EUC-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Ext-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Ext-RKSJ-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Ext-RKSJ-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Ext-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Hankaku"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Hiragana"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Hojo-EUC-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Hojo-EUC-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Hojo-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Hojo-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Katakana"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\NWP-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\NWP-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\RKSJ-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\RKSJ-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\Roman"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\UniHojo-UCS2-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\UniHojo-UCS2-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\UniHojo-UTF16-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\UniHojo-UTF16-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\UniJIS-UCS2-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\UniJIS-UCS2-HW-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\UniJIS-UCS2-HW-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\UniJIS-UCS2-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\UniJIS-UTF16-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\UniJIS-UTF16-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\UniJISPro-UCS2-HW-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\UniJISPro-UCS2-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\japan\WP-Symbol"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="korea"
-				>
-				<File
-					RelativePath="..\cmaps\korea\Adobe-Korea1-0"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\korea\Adobe-Korea1-1"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\korea\Adobe-Korea1-2"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\korea\Adobe-Korea1-UCS2"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\korea\KSC-EUC-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\korea\KSC-EUC-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\korea\KSC-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\korea\KSC-Johab-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\korea\KSC-Johab-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\korea\KSC-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\korea\KSCms-UHC-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\korea\KSCms-UHC-HW-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\korea\KSCms-UHC-HW-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\korea\KSCms-UHC-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\korea\KSCpc-EUC-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\korea\KSCpc-EUC-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\korea\UniKS-UCS2-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\korea\UniKS-UCS2-V"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\korea\UniKS-UTF16-H"
-					>
-				</File>
-				<File
-					RelativePath="..\cmaps\korea\UniKS-UTF16-V"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Fonts"
+			Name="generated"
 			>
 			<File
-				RelativePath="..\fonts\Dingbats.cff"
-				>
-			</File>
-			<File
-				RelativePath="..\fonts\NimbusMonL-Bold.cff"
-				>
-			</File>
-			<File
-				RelativePath="..\fonts\NimbusMonL-BoldObli.cff"
-				>
-			</File>
-			<File
-				RelativePath="..\fonts\NimbusMonL-Regu.cff"
+				RelativePath="..\..\generated\gen_adobe_ca.h"
 				>
 			</File>
 			<File
-				RelativePath="..\fonts\NimbusMonL-ReguObli.cff"
+				RelativePath="..\..\generated\gen_cmap_cns.h"
 				>
 			</File>
 			<File
-				RelativePath="..\fonts\NimbusRomNo9L-Medi.cff"
+				RelativePath="..\..\generated\gen_cmap_gb.h"
 				>
 			</File>
 			<File
-				RelativePath="..\fonts\NimbusRomNo9L-MediItal.cff"
+				RelativePath="..\..\generated\gen_cmap_japan.h"
 				>
 			</File>
 			<File
-				RelativePath="..\fonts\NimbusRomNo9L-Regu.cff"
+				RelativePath="..\..\generated\gen_cmap_korea.h"
 				>
 			</File>
 			<File
-				RelativePath="..\fonts\NimbusRomNo9L-ReguItal.cff"
+				RelativePath="..\..\generated\gen_font_base14.h"
 				>
 			</File>
 			<File
-				RelativePath="..\fonts\NimbusSanL-Bold.cff"
+				RelativePath="..\..\generated\gen_font_cjk.h"
 				>
 			</File>
 			<File
-				RelativePath="..\fonts\NimbusSanL-BoldItal.cff"
+				RelativePath="..\..\generated\gen_font_cjk_full.h"
 				>
 			</File>
 			<File
-				RelativePath="..\fonts\NimbusSanL-Regu.cff"
+				RelativePath="..\..\generated\gen_font_droid.h"
 				>
 			</File>
 			<File
-				RelativePath="..\fonts\NimbusSanL-ReguItal.cff"
+				RelativePath="..\..\generated\gen_js_util.h"
 				>
 			</File>
-			<File
-				RelativePath="..\fonts\StandardSymL.cff"
-				>
-			</File>
-			<Filter
-				Name="droid"
-				>
-				<File
-					RelativePath="..\fonts\droid\DroidSans.ttf"
-					>
-				</File>
-				<File
-					RelativePath="..\fonts\droid\DroidSansFallback.ttf"
-					>
-				</File>
-				<File
-					RelativePath="..\fonts\droid\DroidSansMono.ttf"
-					>
-				</File>
-				<File
-					RelativePath="..\fonts\droid\NOTICE"
-					>
-				</File>
-			</Filter>
 		</Filter>
+		<File
+			RelativePath=".\generate.bat"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>