Update of winrt solution files for the reorganization that was recently undertaken

author: Michael Vrhel <michael.vrhel@artifex.com> 2013-07-02 19:37:10 -0700
committer: Michael Vrhel <michael.vrhel@artifex.com> 2013-07-04 12:18:48 -0700
commit: 877cfb04229b8f6c9a53d9ee201ffc16a255561c (patch)
tree: 658b144b16201d6ab4362aea4da9b85a9b818eb4 /platform/winrt
parent: c879c8b1af224b1c48a22d1905664bc870862cfb (diff)
download: mupdf-877cfb04229b8f6c9a53d9ee201ffc16a255561c.tar.xz
10 files changed, 1181 insertions, 1621 deletions
diff --git a/platform/winrt/generate.bat b/platform/winrt/generate.bat
index c10a9d8f..681eaf66 100644
--- a/platform/winrt/generate.bat
+++ b/platform/winrt/generate.bat
@@ -1,37 +1,31 @@
 @echo off
 
-if not exist scripts/fontdump.c cd ..
+if not exist scripts/fontdump.c cd ../..
+if not exist scripts/fontdump.c goto usage
 if not exist generated mkdir generated
 
-cl /nologo -Iinclude scripts/fontdump.c
-cl /nologo -Iinclude scripts/cmapdump.c
-cl /nologo -Iinclude scripts/cquote.c
-cl /nologo -Iinclude scripts/bin2hex.c
+cl /nologo -Iinclude scripts/fontdump.c setargv.obj
+cl /nologo -Iinclude scripts/cmapdump.c setargv.obj
+cl /nologo -Iinclude scripts/cquote.c setargv.obj
+cl /nologo -Iinclude scripts/bin2hex.c setargv.obj
 
 if not exist fontdump.exe goto usage
 if not exist cmapdump.exe goto usage
 if not exist cquote.exe goto usage
 if not exist bin2hex.exe goto usage
 
-if not exist generated/gen_font_base14.h fontdump.exe generated/gen_font_base14.h fonts/Dingbats.cff fonts/NimbusMonL-Bold.cff fonts/NimbusMonL-BoldObli.cff fonts/NimbusMonL-Regu.cff fonts/NimbusMonL-ReguObli.cff fonts/NimbusRomNo9L-Medi.cff fonts/NimbusRomNo9L-MediItal.cff fonts/NimbusRomNo9L-Regu.cff fonts/NimbusRomNo9L-ReguItal.cff fonts/NimbusSanL-Bold.cff fonts/NimbusSanL-BoldItal.cff fonts/NimbusSanL-Regu.cff fonts/NimbusSanL-ReguItal.cff fonts/StandardSymL.cff
+if not exist generated/gen_font_base14.h fontdump.exe generated/gen_font_base14.h resources/fonts/*.cff
+if not exist generated/gen_font_droid.h fontdump.exe generated/gen_font_droid.h resources/fonts/droid/DroidSans.ttf resources/fonts/droid/DroidSansMono.ttf
+if not exist generated/gen_font_cjk.h fontdump.exe generated/gen_font_cjk.h resources/fonts/droid/DroidSansFallback.ttf
+if not exist generated/gen_font_cjk_full.h fontdump.exe generated/gen_font_cjk_full.h resources/fonts/droid/DroidSansFallbackFull.ttf
 
-if not exist generated/gen_font_droid.h fontdump.exe generated/gen_font_droid.h fonts/droid/DroidSans.ttf fonts/droid/DroidSansMono.ttf
+if not exist generated/gen_cmap_cns.h cmapdump.exe generated/gen_cmap_cns.h resources\cmaps\cns\*
+if not exist generated/gen_cmap_gb.h cmapdump.exe generated/gen_cmap_gb.h resources\cmaps\gb\*
+if not exist generated/gen_cmap_japan.h cmapdump.exe generated/gen_cmap_japan.h resources\cmaps\japan\*
+if not exist generated/gen_cmap_korea.h cmapdump.exe generated/gen_cmap_korea.h resources\cmaps\korea\*
 
-if not exist generated/gen_font_cjk.h fontdump.exe generated/gen_font_cjk.h fonts/droid/DroidSansFallback.ttf
-
-if not exist generated/gen_font_cjk_full.h fontdump.exe generated/gen_font_cjk_full.h fonts/droid/DroidSansFallbackFull.ttf
-
-if not exist generated/gen_cmap_cns.h cmapdump.exe generated/gen_cmap_cns.h cmaps/cns/Adobe-CNS1-UCS2 cmaps/cns/Adobe-CNS1-0 cmaps/cns/Adobe-CNS1-1 cmaps/cns/Adobe-CNS1-2 cmaps/cns/Adobe-CNS1-3 cmaps/cns/Adobe-CNS1-4 cmaps/cns/Adobe-CNS1-5 cmaps/cns/Adobe-CNS1-6 cmaps/cns/B5-H cmaps/cns/B5-V cmaps/cns/B5pc-H cmaps/cns/B5pc-V cmaps/cns/CNS-EUC-H cmaps/cns/CNS-EUC-V cmaps/cns/CNS1-H cmaps/cns/CNS1-V cmaps/cns/CNS2-H cmaps/cns/CNS2-V cmaps/cns/ETen-B5-H cmaps/cns/ETen-B5-V cmaps/cns/ETenms-B5-H cmaps/cns/ETenms-B5-V cmaps/cns/ETHK-B5-H cmaps/cns/ETHK-B5-V cmaps/cns/HKdla-B5-H cmaps/cns/HKdla-B5-V cmaps/cns/HKdlb-B5-H cmaps/cns/HKdlb-B5-V cmaps/cns/HKgccs-B5-H cmaps/cns/HKgccs-B5-V cmaps/cns/HKm314-B5-H cmaps/cns/HKm314-B5-V cmaps/cns/HKm471-B5-H cmaps/cns/HKm471-B5-V cmaps/cns/HKscs-B5-H cmaps/cns/HKscs-B5-V cmaps/cns/UniCNS-UCS2-H cmaps/cns/UniCNS-UCS2-V cmaps/cns/UniCNS-UTF16-H cmaps/cns/UniCNS-UTF16-V
-
-if not exist generated/gen_cmap_gb.h cmapdump.exe generated/gen_cmap_gb.h cmaps/gb/Adobe-GB1-UCS2 cmaps/gb/Adobe-GB1-0 cmaps/gb/Adobe-GB1-1 cmaps/gb/Adobe-GB1-2 cmaps/gb/Adobe-GB1-3 cmaps/gb/Adobe-GB1-4 cmaps/gb/Adobe-GB1-5 cmaps/gb/GB-EUC-H cmaps/gb/GB-EUC-V cmaps/gb/GB-H cmaps/gb/GB-V cmaps/gb/GBK-EUC-H cmaps/gb/GBK-EUC-V cmaps/gb/GBK2K-H cmaps/gb/GBK2K-V cmaps/gb/GBKp-EUC-H cmaps/gb/GBKp-EUC-V cmaps/gb/GBpc-EUC-H cmaps/gb/GBpc-EUC-V cmaps/gb/GBT-EUC-H cmaps/gb/GBT-EUC-V cmaps/gb/GBT-H cmaps/gb/GBT-V cmaps/gb/GBTpc-EUC-H cmaps/gb/GBTpc-EUC-V cmaps/gb/UniGB-UCS2-H cmaps/gb/UniGB-UCS2-V cmaps/gb/UniGB-UTF16-H cmaps/gb/UniGB-UTF16-V
-
-if not exist generated/gen_cmap_japan.h cmapdump.exe generated/gen_cmap_japan.h cmaps/japan/Adobe-Japan1-UCS2 cmaps/japan/78-EUC-H cmaps/japan/78-EUC-V cmaps/japan/78-H cmaps/japan/78-RKSJ-H cmaps/japan/78-RKSJ-V cmaps/japan/78-V cmaps/japan/78ms-RKSJ-H cmaps/japan/78ms-RKSJ-V cmaps/japan/83pv-RKSJ-H cmaps/japan/90ms-RKSJ-H cmaps/japan/90ms-RKSJ-V cmaps/japan/90msp-RKSJ-H cmaps/japan/90msp-RKSJ-V cmaps/japan/90pv-RKSJ-H cmaps/japan/90pv-RKSJ-V cmaps/japan/Add-H cmaps/japan/Add-RKSJ-H cmaps/japan/Add-RKSJ-V cmaps/japan/Add-V cmaps/japan/Adobe-Japan1-0 cmaps/japan/Adobe-Japan1-1 cmaps/japan/Adobe-Japan1-2 cmaps/japan/Adobe-Japan1-3 cmaps/japan/Adobe-Japan1-4 cmaps/japan/Adobe-Japan1-5 cmaps/japan/Adobe-Japan1-6 cmaps/japan/EUC-H cmaps/japan/EUC-V cmaps/japan/Ext-H cmaps/japan/Ext-RKSJ-H cmaps/japan/Ext-RKSJ-V cmaps/japan/Ext-V cmaps/japan/H cmaps/japan/Hankaku cmaps/japan/Hiragana cmaps/japan/Katakana cmaps/japan/NWP-H cmaps/japan/NWP-V cmaps/japan/RKSJ-H cmaps/japan/RKSJ-V cmaps/japan/Roman cmaps/japan/UniJIS-UCS2-H cmaps/japan/UniJIS-UCS2-HW-H cmaps/japan/UniJIS-UCS2-HW-V cmaps/japan/UniJIS-UCS2-V cmaps/japan/UniJISPro-UCS2-HW-V cmaps/japan/UniJISPro-UCS2-V cmaps/japan/V cmaps/japan/WP-Symbol cmaps/japan/Adobe-Japan2-0 cmaps/japan/Hojo-EUC-H cmaps/japan/Hojo-EUC-V cmaps/japan/Hojo-H cmaps/japan/Hojo-V cmaps/japan/UniHojo-UCS2-H cmaps/japan/UniHojo-UCS2-V cmaps/japan/UniHojo-UTF16-H cmaps/japan/UniHojo-UTF16-V cmaps/japan/UniJIS-UTF16-H cmaps/japan/UniJIS-UTF16-V
-
-if not exist generated/gen_cmap_korea.h cmapdump.exe generated/gen_cmap_korea.h cmaps/korea/Adobe-Korea1-UCS2 cmaps/korea/Adobe-Korea1-0 cmaps/korea/Adobe-Korea1-1 cmaps/korea/Adobe-Korea1-2 cmaps/korea/KSC-EUC-H cmaps/korea/KSC-EUC-V cmaps/korea/KSC-H cmaps/korea/KSC-Johab-H cmaps/korea/KSC-Johab-V cmaps/korea/KSC-V cmaps/korea/KSCms-UHC-H cmaps/korea/KSCms-UHC-HW-H cmaps/korea/KSCms-UHC-HW-V cmaps/korea/KSCms-UHC-V cmaps/korea/KSCpc-EUC-H cmaps/korea/KSCpc-EUC-V cmaps/korea/UniKS-UCS2-H cmaps/korea/UniKS-UCS2-V cmaps/korea/UniKS-UTF16-H cmaps/korea/UniKS-UTF16-V
-
-if not exist generated/gen_js_util.h cquote.exe generated/gen_js_util.h pdf/pdf_util.js
-
-if not exist generated/gen_adobe_ca.h bin2hex.exe generated/gen_adobe_ca.h certs/AdobeCA.p7c
+if not exist generated/gen_adobe_ca.h bin2hex.exe generated/gen_adobe_ca.h resources/certs/AdobeCA.p7c
+if not exist generated/gen_js_util.h cquote.exe generated/gen_js_util.h source/pdf/js/pdf-util.js
 
 del cmapdump.obj fontdump.obj cquote.obj bin2hex.obj cmapdump.exe fontdump.exe cquote.exe bin2hex.exe
 
diff --git a/platform/winrt/generated.vcxproj b/platform/winrt/generated.vcxproj
index 11d2b479..24a59346 100644
--- a/platform/winrt/generated.vcxproj
+++ b/platform/winrt/generated.vcxproj
@@ -131,187 +131,25 @@
   <ItemDefinitionGroup>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\scripts\cmapdump.c" />
-    <ClCompile Include="..\scripts\cquote.c" />
-    <ClCompile Include="..\scripts\fontdump.c" />
+    <ClCompile Include="..\..\scripts\bin2hex.c" />
+    <ClCompile Include="..\..\scripts\cmapdump.c" />
+    <ClCompile Include="..\..\scripts\cquote.c" />
+    <ClCompile Include="..\..\scripts\fontdump.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\scripts\jconfig.h" />
-    <ClInclude Include="..\scripts\opj_config.h" />
-    <ClInclude Include="..\scripts\slimftmodules.h" />
-    <ClInclude Include="..\scripts\slimftoptions.h" />
+    <ClInclude Include="..\..\generated\gen_adobe_ca.h" />
+    <ClInclude Include="..\..\generated\gen_cmap_cns.h" />
+    <ClInclude Include="..\..\generated\gen_cmap_gb.h" />
+    <ClInclude Include="..\..\generated\gen_cmap_japan.h" />
+    <ClInclude Include="..\..\generated\gen_cmap_korea.h" />
+    <ClInclude Include="..\..\generated\gen_font_base14.h" />
+    <ClInclude Include="..\..\generated\gen_font_cjk.h" />
+    <ClInclude Include="..\..\generated\gen_font_cjk_full.h" />
+    <ClInclude Include="..\..\generated\gen_font_droid.h" />
+    <ClInclude Include="..\..\generated\gen_js_util.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\cmaps\cns\Adobe-CNS1-0" />
-    <None Include="..\cmaps\cns\Adobe-CNS1-1" />
-    <None Include="..\cmaps\cns\Adobe-CNS1-2" />
-    <None Include="..\cmaps\cns\Adobe-CNS1-3" />
-    <None Include="..\cmaps\cns\Adobe-CNS1-4" />
-    <None Include="..\cmaps\cns\Adobe-CNS1-5" />
-    <None Include="..\cmaps\cns\Adobe-CNS1-6" />
-    <None Include="..\cmaps\cns\Adobe-CNS1-UCS2" />
-    <None Include="..\cmaps\cns\B5-H" />
-    <None Include="..\cmaps\cns\B5-V" />
-    <None Include="..\cmaps\cns\B5pc-H" />
-    <None Include="..\cmaps\cns\B5pc-V" />
-    <None Include="..\cmaps\cns\CNS-EUC-H" />
-    <None Include="..\cmaps\cns\CNS-EUC-V" />
-    <None Include="..\cmaps\cns\CNS1-H" />
-    <None Include="..\cmaps\cns\CNS1-V" />
-    <None Include="..\cmaps\cns\CNS2-H" />
-    <None Include="..\cmaps\cns\CNS2-V" />
-    <None Include="..\cmaps\cns\ETen-B5-H" />
-    <None Include="..\cmaps\cns\ETen-B5-V" />
-    <None Include="..\cmaps\cns\ETenms-B5-H" />
-    <None Include="..\cmaps\cns\ETenms-B5-V" />
-    <None Include="..\cmaps\cns\ETHK-B5-H" />
-    <None Include="..\cmaps\cns\ETHK-B5-V" />
-    <None Include="..\cmaps\cns\HKdla-B5-H" />
-    <None Include="..\cmaps\cns\HKdla-B5-V" />
-    <None Include="..\cmaps\cns\HKdlb-B5-H" />
-    <None Include="..\cmaps\cns\HKdlb-B5-V" />
-    <None Include="..\cmaps\cns\HKgccs-B5-H" />
-    <None Include="..\cmaps\cns\HKgccs-B5-V" />
-    <None Include="..\cmaps\cns\HKm314-B5-H" />
-    <None Include="..\cmaps\cns\HKm314-B5-V" />
-    <None Include="..\cmaps\cns\HKm471-B5-H" />
-    <None Include="..\cmaps\cns\HKm471-B5-V" />
-    <None Include="..\cmaps\cns\HKscs-B5-H" />
-    <None Include="..\cmaps\cns\HKscs-B5-V" />
-    <None Include="..\cmaps\cns\UniCNS-UCS2-H" />
-    <None Include="..\cmaps\cns\UniCNS-UCS2-V" />
-    <None Include="..\cmaps\cns\UniCNS-UTF16-H" />
-    <None Include="..\cmaps\cns\UniCNS-UTF16-V" />
-    <None Include="..\cmaps\gb\Adobe-GB1-0" />
-    <None Include="..\cmaps\gb\Adobe-GB1-1" />
-    <None Include="..\cmaps\gb\Adobe-GB1-2" />
-    <None Include="..\cmaps\gb\Adobe-GB1-3" />
-    <None Include="..\cmaps\gb\Adobe-GB1-4" />
-    <None Include="..\cmaps\gb\Adobe-GB1-5" />
-    <None Include="..\cmaps\gb\Adobe-GB1-UCS2" />
-    <None Include="..\cmaps\gb\GB-EUC-H" />
-    <None Include="..\cmaps\gb\GB-EUC-V" />
-    <None Include="..\cmaps\gb\GB-H" />
-    <None Include="..\cmaps\gb\GB-V" />
-    <None Include="..\cmaps\gb\GBK-EUC-H" />
-    <None Include="..\cmaps\gb\GBK-EUC-V" />
-    <None Include="..\cmaps\gb\GBK2K-H" />
-    <None Include="..\cmaps\gb\GBK2K-V" />
-    <None Include="..\cmaps\gb\GBKp-EUC-H" />
-    <None Include="..\cmaps\gb\GBKp-EUC-V" />
-    <None Include="..\cmaps\gb\GBpc-EUC-H" />
-    <None Include="..\cmaps\gb\GBpc-EUC-V" />
-    <None Include="..\cmaps\gb\GBT-EUC-H" />
-    <None Include="..\cmaps\gb\GBT-EUC-V" />
-    <None Include="..\cmaps\gb\GBT-H" />
-    <None Include="..\cmaps\gb\GBT-V" />
-    <None Include="..\cmaps\gb\GBTpc-EUC-H" />
-    <None Include="..\cmaps\gb\GBTpc-EUC-V" />
-    <None Include="..\cmaps\gb\UniGB-UCS2-H" />
-    <None Include="..\cmaps\gb\UniGB-UCS2-V" />
-    <None Include="..\cmaps\gb\UniGB-UTF16-H" />
-    <None Include="..\cmaps\gb\UniGB-UTF16-V" />
-    <None Include="..\cmaps\japan\78-EUC-H" />
-    <None Include="..\cmaps\japan\78-EUC-V" />
-    <None Include="..\cmaps\japan\78-H" />
-    <None Include="..\cmaps\japan\78-RKSJ-H" />
-    <None Include="..\cmaps\japan\78-RKSJ-V" />
-    <None Include="..\cmaps\japan\78-V" />
-    <None Include="..\cmaps\japan\78ms-RKSJ-H" />
-    <None Include="..\cmaps\japan\78ms-RKSJ-V" />
-    <None Include="..\cmaps\japan\83pv-RKSJ-H" />
-    <None Include="..\cmaps\japan\90ms-RKSJ-H" />
-    <None Include="..\cmaps\japan\90ms-RKSJ-V" />
-    <None Include="..\cmaps\japan\90msp-RKSJ-H" />
-    <None Include="..\cmaps\japan\90msp-RKSJ-V" />
-    <None Include="..\cmaps\japan\90pv-RKSJ-H" />
-    <None Include="..\cmaps\japan\90pv-RKSJ-V" />
-    <None Include="..\cmaps\japan\Add-H" />
-    <None Include="..\cmaps\japan\Add-RKSJ-H" />
-    <None Include="..\cmaps\japan\Add-RKSJ-V" />
-    <None Include="..\cmaps\japan\Add-V" />
-    <None Include="..\cmaps\japan\Adobe-Japan1-0" />
-    <None Include="..\cmaps\japan\Adobe-Japan1-1" />
-    <None Include="..\cmaps\japan\Adobe-Japan1-2" />
-    <None Include="..\cmaps\japan\Adobe-Japan1-3" />
-    <None Include="..\cmaps\japan\Adobe-Japan1-4" />
-    <None Include="..\cmaps\japan\Adobe-Japan1-5" />
-    <None Include="..\cmaps\japan\Adobe-Japan1-6" />
-    <None Include="..\cmaps\japan\Adobe-Japan1-UCS2" />
-    <None Include="..\cmaps\japan\Adobe-Japan2-0" />
-    <None Include="..\cmaps\japan\EUC-H" />
-    <None Include="..\cmaps\japan\EUC-V" />
-    <None Include="..\cmaps\japan\Ext-H" />
-    <None Include="..\cmaps\japan\Ext-RKSJ-H" />
-    <None Include="..\cmaps\japan\Ext-RKSJ-V" />
-    <None Include="..\cmaps\japan\Ext-V" />
-    <None Include="..\cmaps\japan\H" />
-    <None Include="..\cmaps\japan\Hankaku" />
-    <None Include="..\cmaps\japan\Hiragana" />
-    <None Include="..\cmaps\japan\Hojo-EUC-H" />
-    <None Include="..\cmaps\japan\Hojo-EUC-V" />
-    <None Include="..\cmaps\japan\Hojo-H" />
-    <None Include="..\cmaps\japan\Hojo-V" />
-    <None Include="..\cmaps\japan\Katakana" />
-    <None Include="..\cmaps\japan\NWP-H" />
-    <None Include="..\cmaps\japan\NWP-V" />
-    <None Include="..\cmaps\japan\RKSJ-H" />
-    <None Include="..\cmaps\japan\RKSJ-V" />
-    <None Include="..\cmaps\japan\Roman" />
-    <None Include="..\cmaps\japan\UniHojo-UCS2-H" />
-    <None Include="..\cmaps\japan\UniHojo-UCS2-V" />
-    <None Include="..\cmaps\japan\UniHojo-UTF16-H" />
-    <None Include="..\cmaps\japan\UniHojo-UTF16-V" />
-    <None Include="..\cmaps\japan\UniJIS-UCS2-H" />
-    <None Include="..\cmaps\japan\UniJIS-UCS2-HW-H" />
-    <None Include="..\cmaps\japan\UniJIS-UCS2-HW-V" />
-    <None Include="..\cmaps\japan\UniJIS-UCS2-V" />
-    <None Include="..\cmaps\japan\UniJIS-UTF16-H" />
-    <None Include="..\cmaps\japan\UniJIS-UTF16-V" />
-    <None Include="..\cmaps\japan\UniJISPro-UCS2-HW-V" />
-    <None Include="..\cmaps\japan\UniJISPro-UCS2-V" />
-    <None Include="..\cmaps\japan\V" />
-    <None Include="..\cmaps\japan\WP-Symbol" />
-    <None Include="..\cmaps\korea\Adobe-Korea1-0" />
-    <None Include="..\cmaps\korea\Adobe-Korea1-1" />
-    <None Include="..\cmaps\korea\Adobe-Korea1-2" />
-    <None Include="..\cmaps\korea\Adobe-Korea1-UCS2" />
-    <None Include="..\cmaps\korea\KSC-EUC-H" />
-    <None Include="..\cmaps\korea\KSC-EUC-V" />
-    <None Include="..\cmaps\korea\KSC-H" />
-    <None Include="..\cmaps\korea\KSC-Johab-H" />
-    <None Include="..\cmaps\korea\KSC-Johab-V" />
-    <None Include="..\cmaps\korea\KSC-V" />
-    <None Include="..\cmaps\korea\KSCms-UHC-H" />
-    <None Include="..\cmaps\korea\KSCms-UHC-HW-H" />
-    <None Include="..\cmaps\korea\KSCms-UHC-HW-V" />
-    <None Include="..\cmaps\korea\KSCms-UHC-V" />
-    <None Include="..\cmaps\korea\KSCpc-EUC-H" />
-    <None Include="..\cmaps\korea\KSCpc-EUC-V" />
-    <None Include="..\cmaps\korea\UniKS-UCS2-H" />
-    <None Include="..\cmaps\korea\UniKS-UCS2-V" />
-    <None Include="..\cmaps\korea\UniKS-UTF16-H" />
-    <None Include="..\cmaps\korea\UniKS-UTF16-V" />
-    <None Include="..\fonts\Dingbats.cff" />
-    <None Include="..\fonts\NimbusMonL-Bold.cff" />
-    <None Include="..\fonts\NimbusMonL-BoldObli.cff" />
-    <None Include="..\fonts\NimbusMonL-Regu.cff" />
-    <None Include="..\fonts\NimbusMonL-ReguObli.cff" />
-    <None Include="..\fonts\NimbusRomNo9L-Medi.cff" />
-    <None Include="..\fonts\NimbusRomNo9L-MediItal.cff" />
-    <None Include="..\fonts\NimbusRomNo9L-Regu.cff" />
-    <None Include="..\fonts\NimbusRomNo9L-ReguItal.cff" />
-    <None Include="..\fonts\NimbusSanL-Bold.cff" />
-    <None Include="..\fonts\NimbusSanL-BoldItal.cff" />
-    <None Include="..\fonts\NimbusSanL-Regu.cff" />
-    <None Include="..\fonts\NimbusSanL-ReguItal.cff" />
-    <None Include="..\fonts\StandardSymL.cff" />
-    <None Include="..\fonts\droid\NOTICE" />
-  </ItemGroup>
-  <ItemGroup>
-    <Font Include="..\fonts\droid\DroidSans.ttf" />
-    <Font Include="..\fonts\droid\DroidSansFallback.ttf" />
-    <Font Include="..\fonts\droid\DroidSansMono.ttf" />
+    <None Include="generate.bat" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/platform/winrt/generated.vcxproj.filters b/platform/winrt/generated.vcxproj.filters
index 1a078e59..79c6c9d3 100644
--- a/platform/winrt/generated.vcxproj.filters
+++ b/platform/winrt/generated.vcxproj.filters
@@ -1,568 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    <Filter Include="scripts">
+      <UniqueIdentifier>{336f64c0-6502-4d6d-91bd-4b52ff0e5be6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="CMAPs">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="CMAPs\cns">
-      <UniqueIdentifier>{5129a522-0f9b-4dd3-aaf8-5b20b66060d8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="CMAPs\gb">
-      <UniqueIdentifier>{75b3deb7-11ce-4813-b282-6dc1c099e669}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="CMAPs\japan">
-      <UniqueIdentifier>{1706f021-1fce-4074-9299-6fd9c516c7ca}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="CMAPs\korea">
-      <UniqueIdentifier>{f2a3739d-4175-47e4-9711-4a066e0f7094}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Fonts">
-      <UniqueIdentifier>{5168e64f-094a-43e0-b53f-83df3632d7ae}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Fonts\droid">
-      <UniqueIdentifier>{8462cde5-1461-408e-8708-d2b844cbb69d}</UniqueIdentifier>
+    <Filter Include="generated">
+      <UniqueIdentifier>{d381092b-b798-4bb4-851b-9d85f2072427}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\scripts\cmapdump.c">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\scripts\bin2hex.c">
+      <Filter>scripts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\scripts\cmapdump.c">
+      <Filter>scripts</Filter>
     </ClCompile>
-    <ClCompile Include="..\scripts\cquote.c">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\scripts\cquote.c">
+      <Filter>scripts</Filter>
     </ClCompile>
-    <ClCompile Include="..\scripts\fontdump.c">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\scripts\fontdump.c">
+      <Filter>scripts</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\scripts\jconfig.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\..\generated\gen_adobe_ca.h">
+      <Filter>generated</Filter>
     </ClInclude>
-    <ClInclude Include="..\scripts\opj_config.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\..\generated\gen_cmap_cns.h">
+      <Filter>generated</Filter>
     </ClInclude>
-    <ClInclude Include="..\scripts\slimftmodules.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\..\generated\gen_cmap_gb.h">
+      <Filter>generated</Filter>
     </ClInclude>
-    <ClInclude Include="..\scripts\slimftoptions.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\..\generated\gen_cmap_japan.h">
+      <Filter>generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\generated\gen_cmap_korea.h">
+      <Filter>generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\generated\gen_font_base14.h">
+      <Filter>generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\generated\gen_font_cjk.h">
+      <Filter>generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\generated\gen_font_cjk_full.h">
+      <Filter>generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\generated\gen_font_droid.h">
+      <Filter>generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\generated\gen_js_util.h">
+      <Filter>generated</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\cmaps\cns\Adobe-CNS1-0">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\Adobe-CNS1-1">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\Adobe-CNS1-2">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\Adobe-CNS1-3">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\Adobe-CNS1-4">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\Adobe-CNS1-5">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\Adobe-CNS1-6">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\Adobe-CNS1-UCS2">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\B5-H">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\B5-V">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\B5pc-H">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\B5pc-V">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\CNS-EUC-H">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\CNS-EUC-V">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\CNS1-H">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\CNS1-V">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\CNS2-H">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\CNS2-V">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\ETen-B5-H">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\ETen-B5-V">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\ETenms-B5-H">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\ETenms-B5-V">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\ETHK-B5-H">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\ETHK-B5-V">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\HKdla-B5-H">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\HKdla-B5-V">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\HKdlb-B5-H">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\HKdlb-B5-V">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\HKgccs-B5-H">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\HKgccs-B5-V">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\HKm314-B5-H">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\HKm314-B5-V">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\HKm471-B5-H">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\HKm471-B5-V">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\HKscs-B5-H">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\HKscs-B5-V">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\UniCNS-UCS2-H">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\UniCNS-UCS2-V">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\UniCNS-UTF16-H">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\cns\UniCNS-UTF16-V">
-      <Filter>CMAPs\cns</Filter>
-    </None>
-    <None Include="..\cmaps\gb\Adobe-GB1-0">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\Adobe-GB1-1">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\Adobe-GB1-2">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\Adobe-GB1-3">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\Adobe-GB1-4">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\Adobe-GB1-5">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\Adobe-GB1-UCS2">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\GB-EUC-H">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\GB-EUC-V">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\GB-H">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\GB-V">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\GBK-EUC-H">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\GBK-EUC-V">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\GBK2K-H">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\GBK2K-V">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\GBKp-EUC-H">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\GBKp-EUC-V">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\GBpc-EUC-H">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\GBpc-EUC-V">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\GBT-EUC-H">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\GBT-EUC-V">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\GBT-H">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\GBT-V">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\GBTpc-EUC-H">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\GBTpc-EUC-V">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\UniGB-UCS2-H">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\UniGB-UCS2-V">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\UniGB-UTF16-H">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\gb\UniGB-UTF16-V">
-      <Filter>CMAPs\gb</Filter>
-    </None>
-    <None Include="..\cmaps\japan\78-EUC-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\78-EUC-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\78-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\78-RKSJ-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\78-RKSJ-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\78-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\78ms-RKSJ-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\78ms-RKSJ-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\83pv-RKSJ-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\90ms-RKSJ-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\90ms-RKSJ-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\90msp-RKSJ-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\90msp-RKSJ-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\90pv-RKSJ-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\90pv-RKSJ-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Add-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Add-RKSJ-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Add-RKSJ-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Add-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Adobe-Japan1-0">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Adobe-Japan1-1">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Adobe-Japan1-2">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Adobe-Japan1-3">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Adobe-Japan1-4">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Adobe-Japan1-5">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Adobe-Japan1-6">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Adobe-Japan1-UCS2">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Adobe-Japan2-0">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\EUC-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\EUC-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Ext-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Ext-RKSJ-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Ext-RKSJ-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Ext-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Hankaku">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Hiragana">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Hojo-EUC-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Hojo-EUC-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Hojo-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Hojo-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Katakana">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\NWP-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\NWP-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\RKSJ-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\RKSJ-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\Roman">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\UniHojo-UCS2-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\UniHojo-UCS2-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\UniHojo-UTF16-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\UniHojo-UTF16-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\UniJIS-UCS2-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\UniJIS-UCS2-HW-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\UniJIS-UCS2-HW-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\UniJIS-UCS2-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\UniJIS-UTF16-H">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\UniJIS-UTF16-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\UniJISPro-UCS2-HW-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\UniJISPro-UCS2-V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\V">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\japan\WP-Symbol">
-      <Filter>CMAPs\japan</Filter>
-    </None>
-    <None Include="..\cmaps\korea\Adobe-Korea1-0">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\cmaps\korea\Adobe-Korea1-1">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\cmaps\korea\Adobe-Korea1-2">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\cmaps\korea\Adobe-Korea1-UCS2">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\cmaps\korea\KSC-EUC-H">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\cmaps\korea\KSC-EUC-V">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\cmaps\korea\KSC-H">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\cmaps\korea\KSC-Johab-H">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\cmaps\korea\KSC-Johab-V">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\cmaps\korea\KSC-V">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\cmaps\korea\KSCms-UHC-H">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\cmaps\korea\KSCms-UHC-HW-H">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\cmaps\korea\KSCms-UHC-HW-V">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\cmaps\korea\KSCms-UHC-V">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\cmaps\korea\KSCpc-EUC-H">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\cmaps\korea\KSCpc-EUC-V">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\cmaps\korea\UniKS-UCS2-H">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\cmaps\korea\UniKS-UCS2-V">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\cmaps\korea\UniKS-UTF16-H">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\cmaps\korea\UniKS-UTF16-V">
-      <Filter>CMAPs\korea</Filter>
-    </None>
-    <None Include="..\fonts\Dingbats.cff">
-      <Filter>Fonts</Filter>
-    </None>
-    <None Include="..\fonts\NimbusMonL-Bold.cff">
-      <Filter>Fonts</Filter>
-    </None>
-    <None Include="..\fonts\NimbusMonL-BoldObli.cff">
-      <Filter>Fonts</Filter>
-    </None>
-    <None Include="..\fonts\NimbusMonL-Regu.cff">
-      <Filter>Fonts</Filter>
-    </None>
-    <None Include="..\fonts\NimbusMonL-ReguObli.cff">
-      <Filter>Fonts</Filter>
-    </None>
-    <None Include="..\fonts\NimbusRomNo9L-Medi.cff">
-      <Filter>Fonts</Filter>
-    </None>
-    <None Include="..\fonts\NimbusRomNo9L-MediItal.cff">
-      <Filter>Fonts</Filter>
-    </None>
-    <None Include="..\fonts\NimbusRomNo9L-Regu.cff">
-      <Filter>Fonts</Filter>
-    </None>
-    <None Include="..\fonts\NimbusRomNo9L-ReguItal.cff">
-      <Filter>Fonts</Filter>
-    </None>
-    <None Include="..\fonts\NimbusSanL-Bold.cff">
-      <Filter>Fonts</Filter>
-    </None>
-    <None Include="..\fonts\NimbusSanL-BoldItal.cff">
-      <Filter>Fonts</Filter>
-    </None>
-    <None Include="..\fonts\NimbusSanL-Regu.cff">
-      <Filter>Fonts</Filter>
-    </None>
-    <None Include="..\fonts\NimbusSanL-ReguItal.cff">
-      <Filter>Fonts</Filter>
-    </None>
-    <None Include="..\fonts\StandardSymL.cff">
-      <Filter>Fonts</Filter>
-    </None>
-    <None Include="..\fonts\droid\NOTICE">
-      <Filter>Fonts\droid</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Font Include="..\fonts\droid\DroidSans.ttf">
-      <Filter>Fonts\droid</Filter>
-    </Font>
-    <Font Include="..\fonts\droid\DroidSansFallback.ttf">
-      <Filter>Fonts\droid</Filter>
-    </Font>
-    <Font Include="..\fonts\droid\DroidSansMono.ttf">
-      <Filter>Fonts\droid</Filter>
-    </Font>
+    <None Include="generate.bat" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/platform/winrt/libmupdf-nov8_winRT.vcxproj b/platform/winrt/libmupdf-nov8_winRT.vcxproj
index 4c643aae..2119e3e4 100644
--- a/platform/winrt/libmupdf-nov8_winRT.vcxproj
+++ b/platform/winrt/libmupdf-nov8_winRT.vcxproj
@@ -39,7 +39,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\pdf\pdf_js_none.c" />
+    <ClCompile Include="..\..\source\pdf\js\pdf-js-none.c" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{5affe821-c5c8-45fb-b834-10fed76e49a7}</ProjectGuid>
@@ -179,7 +179,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\include;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -192,7 +192,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\include;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -205,7 +205,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\include;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -218,7 +218,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\include;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -231,7 +231,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\include;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -244,7 +244,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\include;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -257,7 +257,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\include;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -270,7 +270,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\include;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -283,7 +283,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\include;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/platform/winrt/libmupdf-nov8_winRT.vcxproj.filters b/platform/winrt/libmupdf-nov8_winRT.vcxproj.filters
index c0612d85..7e73bfa6 100644
--- a/platform/winrt/libmupdf-nov8_winRT.vcxproj.filters
+++ b/platform/winrt/libmupdf-nov8_winRT.vcxproj.filters
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="pdf">
-      <UniqueIdentifier>{9cbc5d32-1ade-452f-9a40-cd43b9e313aa}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\pdf\pdf_js_none.c">
-      <Filter>pdf</Filter>
-    </ClCompile>
+    <ClCompile Include="..\..\source\pdf\js\pdf-js-none.c" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/platform/winrt/libmupdf_winRT.vcxproj b/platform/winrt/libmupdf_winRT.vcxproj
index 9db1732a..9774c981 100644
--- a/platform/winrt/libmupdf_winRT.vcxproj
+++ b/platform/winrt/libmupdf_winRT.vcxproj
@@ -39,131 +39,189 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\cbz\mucbz.c" />
-    <ClCompile Include="..\draw\draw_affine.c" />
-    <ClCompile Include="..\draw\draw_blend.c" />
-    <ClCompile Include="..\draw\draw_device.c" />
-    <ClCompile Include="..\draw\draw_edge.c" />
-    <ClCompile Include="..\draw\draw_glyph.c" />
-    <ClCompile Include="..\draw\draw_mesh.c" />
-    <ClCompile Include="..\draw\draw_paint.c" />
-    <ClCompile Include="..\draw\draw_path.c" />
-    <ClCompile Include="..\draw\draw_simple_scale.c" />
-    <ClCompile Include="..\draw\draw_unpack.c" />
-    <ClCompile Include="..\fitz\base_context.c" />
-    <ClCompile Include="..\fitz\base_error.c" />
-    <ClCompile Include="..\fitz\base_geometry.c" />
-    <ClCompile Include="..\fitz\base_getopt.c" />
-    <ClCompile Include="..\fitz\base_hash.c" />
-    <ClCompile Include="..\fitz\base_memory.c" />
-    <ClCompile Include="..\fitz\base_string.c" />
-    <ClCompile Include="..\fitz\base_time.c" />
-    <ClCompile Include="..\fitz\base_trans.c" />
-    <ClCompile Include="..\fitz\base_xml.c" />
-    <ClCompile Include="..\fitz\crypt_aes.c" />
-    <ClCompile Include="..\fitz\crypt_arc4.c" />
-    <ClCompile Include="..\fitz\crypt_md5.c" />
-    <ClCompile Include="..\fitz\crypt_sha2.c" />
-    <ClCompile Include="..\fitz\dev_bbox.c" />
-    <ClCompile Include="..\fitz\dev_list.c" />
-    <ClCompile Include="..\fitz\dev_null.c" />
-    <ClCompile Include="..\fitz\dev_trace.c" />
-    <ClCompile Include="..\fitz\doc_document.c" />
-    <ClCompile Include="..\fitz\doc_link.c" />
-    <ClCompile Include="..\fitz\doc_outline.c" />
-    <ClCompile Include="..\fitz\filt_basic.c" />
-    <ClCompile Include="..\fitz\filt_dctd.c" />
-    <ClCompile Include="..\fitz\filt_faxd.c" />
-    <ClCompile Include="..\fitz\filt_flate.c" />
-    <ClCompile Include="..\fitz\filt_jbig2d.c" />
-    <ClCompile Include="..\fitz\filt_lzwd.c" />
-    <ClCompile Include="..\fitz\filt_predict.c" />
-    <ClCompile Include="..\fitz\image_jpeg.c" />
-    <ClCompile Include="..\fitz\image_jpx.c" />
-    <ClCompile Include="..\fitz\image_png.c" />
-    <ClCompile Include="..\fitz\image_tiff.c" />
-    <ClCompile Include="..\fitz\memento.c" />
-    <ClCompile Include="..\fitz\res_bitmap.c" />
-    <ClCompile Include="..\fitz\res_colorspace.c" />
-    <ClCompile Include="..\fitz\res_font.c" />
-    <ClCompile Include="..\fitz\res_func.c" />
-    <ClCompile Include="..\fitz\res_halftone.c" />
-    <ClCompile Include="..\fitz\res_image.c" />
-    <ClCompile Include="..\fitz\res_path.c" />
-    <ClCompile Include="..\fitz\res_pixmap.c" />
-    <ClCompile Include="..\fitz\res_shade.c" />
-    <ClCompile Include="..\fitz\res_store.c" />
-    <ClCompile Include="..\fitz\res_text.c" />
-    <ClCompile Include="..\fitz\stm_buffer.c" />
-    <ClCompile Include="..\fitz\stm_comp_buf.c" />
-    <ClCompile Include="..\fitz\stm_open.c" />
-    <ClCompile Include="..\fitz\stm_output.c" />
-    <ClCompile Include="..\fitz\stm_read.c" />
-    <ClCompile Include="..\fitz\text_extract.c" />
-    <ClCompile Include="..\fitz\text_output.c" />
-    <ClCompile Include="..\fitz\text_paragraph.c" />
-    <ClCompile Include="..\fitz\text_search.c" />
-    <ClCompile Include="..\image\muimage.c" />
-    <ClCompile Include="..\pdf\pdf_annot.c" />
-    <ClCompile Include="..\pdf\pdf_cmap.c" />
-    <ClCompile Include="..\pdf\pdf_cmap_load.c" />
-    <ClCompile Include="..\pdf\pdf_cmap_parse.c" />
-    <ClCompile Include="..\pdf\pdf_cmap_table.c" />
-    <ClCompile Include="..\pdf\pdf_colorspace.c" />
-    <ClCompile Include="..\pdf\pdf_crypt.c" />
-    <ClCompile Include="..\pdf\pdf_device.c" />
-    <ClCompile Include="..\pdf\pdf_encoding.c" />
-    <ClCompile Include="..\pdf\pdf_event.c" />
-    <ClCompile Include="..\pdf\pdf_field.c" />
-    <ClCompile Include="..\pdf\pdf_font.c" />
-    <ClCompile Include="..\pdf\pdf_fontfile.c" />
-    <ClCompile Include="..\pdf\pdf_form.c" />
-    <ClCompile Include="..\pdf\pdf_function.c" />
-    <ClCompile Include="..\pdf\pdf_image.c" />
-    <ClCompile Include="..\pdf\pdf_interpret.c" />
-    <ClCompile Include="..\pdf\pdf_lex.c" />
-    <ClCompile Include="..\pdf\pdf_metrics.c" />
-    <ClCompile Include="..\pdf\pdf_nametree.c" />
-    <ClCompile Include="..\pdf\pdf_object.c" />
-    <ClCompile Include="..\pdf\pdf_outline.c" />
-    <ClCompile Include="..\pdf\pdf_page.c" />
-    <ClCompile Include="..\pdf\pdf_parse.c" />
-    <ClCompile Include="..\pdf\pdf_pattern.c" />
-    <ClCompile Include="..\pdf\pdf_repair.c" />
-    <ClCompile Include="..\pdf\pdf_shade.c" />
-    <ClCompile Include="..\pdf\pdf_store.c" />
-    <ClCompile Include="..\pdf\pdf_stream.c" />
-    <ClCompile Include="..\pdf\pdf_type3.c" />
-    <ClCompile Include="..\pdf\pdf_unicode.c" />
-    <ClCompile Include="..\pdf\pdf_write.c" />
-    <ClCompile Include="..\pdf\pdf_xobject.c" />
-    <ClCompile Include="..\pdf\pdf_xref.c" />
-    <ClCompile Include="..\pdf\pdf_xref_aux.c" />
-    <ClCompile Include="..\ucdn\ucdn.c" />
-    <ClCompile Include="..\xps\xps_common.c" />
-    <ClCompile Include="..\xps\xps_doc.c" />
-    <ClCompile Include="..\xps\xps_glyphs.c" />
-    <ClCompile Include="..\xps\xps_gradient.c" />
-    <ClCompile Include="..\xps\xps_image.c" />
-    <ClCompile Include="..\xps\xps_outline.c" />
-    <ClCompile Include="..\xps\xps_path.c" />
-    <ClCompile Include="..\xps\xps_resource.c" />
-    <ClCompile Include="..\xps\xps_tile.c" />
-    <ClCompile Include="..\xps\xps_util.c" />
-    <ClCompile Include="..\xps\xps_zip.c" />
+    <ClCompile Include="..\..\source\cbz\mucbz.c" />
+    <ClCompile Include="..\..\source\fitz\bbox-device.c" />
+    <ClCompile Include="..\..\source\fitz\bitmap.c" />
+    <ClCompile Include="..\..\source\fitz\buffer.c" />
+    <ClCompile Include="..\..\source\fitz\colorspace.c" />
+    <ClCompile Include="..\..\source\fitz\compressed-buffer.c" />
+    <ClCompile Include="..\..\source\fitz\context.c" />
+    <ClCompile Include="..\..\source\fitz\crypt-aes.c" />
+    <ClCompile Include="..\..\source\fitz\crypt-arc4.c" />
+    <ClCompile Include="..\..\source\fitz\crypt-md5.c" />
+    <ClCompile Include="..\..\source\fitz\crypt-sha2.c" />
+    <ClCompile Include="..\..\source\fitz\device.c" />
+    <ClCompile Include="..\..\source\fitz\document.c" />
+    <ClCompile Include="..\..\source\fitz\draw-affine.c" />
+    <ClCompile Include="..\..\source\fitz\draw-blend.c" />
+    <ClCompile Include="..\..\source\fitz\draw-device.c" />
+    <ClCompile Include="..\..\source\fitz\draw-edge.c" />
+    <ClCompile Include="..\..\source\fitz\draw-glyph.c" />
+    <ClCompile Include="..\..\source\fitz\draw-mesh.c" />
+    <ClCompile Include="..\..\source\fitz\draw-paint.c" />
+    <ClCompile Include="..\..\source\fitz\draw-path.c" />
+    <ClCompile Include="..\..\source\fitz\draw-scale-simple.c" />
+    <ClCompile Include="..\..\source\fitz\draw-unpack.c" />
+    <ClCompile Include="..\..\source\fitz\error.c" />
+    <ClCompile Include="..\..\source\fitz\filter-basic.c" />
+    <ClCompile Include="..\..\source\fitz\filter-dct.c" />
+    <ClCompile Include="..\..\source\fitz\filter-fax.c" />
+    <ClCompile Include="..\..\source\fitz\filter-flate.c" />
+    <ClCompile Include="..\..\source\fitz\filter-jbig2.c" />
+    <ClCompile Include="..\..\source\fitz\filter-lzw.c" />
+    <ClCompile Include="..\..\source\fitz\filter-predict.c" />
+    <ClCompile Include="..\..\source\fitz\font.c" />
+    <ClCompile Include="..\..\source\fitz\function.c" />
+    <ClCompile Include="..\..\source\fitz\geometry.c" />
+    <ClCompile Include="..\..\source\fitz\getopt.c" />
+    <ClCompile Include="..\..\source\fitz\halftone.c" />
+    <ClCompile Include="..\..\source\fitz\hash.c" />
+    <ClCompile Include="..\..\source\fitz\image.c" />
+    <ClCompile Include="..\..\source\fitz\link.c" />
+    <ClCompile Include="..\..\source\fitz\list-device.c" />
+    <ClCompile Include="..\..\source\fitz\load-jpeg.c" />
+    <ClCompile Include="..\..\source\fitz\load-jpx.c" />
+    <ClCompile Include="..\..\source\fitz\load-png.c" />
+    <ClCompile Include="..\..\source\fitz\load-tiff.c" />
+    <ClCompile Include="..\..\source\fitz\memento.c" />
+    <ClCompile Include="..\..\source\fitz\memory.c" />
+    <ClCompile Include="..\..\source\fitz\outline.c" />
+    <ClCompile Include="..\..\source\fitz\output-pcl.c" />
+    <ClCompile Include="..\..\source\fitz\output-pwg.c" />
+    <ClCompile Include="..\..\source\fitz\output.c" />
+    <ClCompile Include="..\..\source\fitz\path.c" />
+    <ClCompile Include="..\..\source\fitz\pixmap.c" />
+    <ClCompile Include="..\..\source\fitz\shade.c" />
+    <ClCompile Include="..\..\source\fitz\stext-device.c" />
+    <ClCompile Include="..\..\source\fitz\stext-output.c" />
+    <ClCompile Include="..\..\source\fitz\stext-paragraph.c" />
+    <ClCompile Include="..\..\source\fitz\stext-search.c" />
+    <ClCompile Include="..\..\source\fitz\store.c" />
+    <ClCompile Include="..\..\source\fitz\stream-open.c" />
+    <ClCompile Include="..\..\source\fitz\stream-read.c" />
+    <ClCompile Include="..\..\source\fitz\string.c" />
+    <ClCompile Include="..\..\source\fitz\svg-device.c" />
+    <ClCompile Include="..\..\source\fitz\text.c" />
+    <ClCompile Include="..\..\source\fitz\time.c" />
+    <ClCompile Include="..\..\source\fitz\trace-device.c" />
+    <ClCompile Include="..\..\source\fitz\transition.c" />
+    <ClCompile Include="..\..\source\fitz\ucdn.c" />
+    <ClCompile Include="..\..\source\fitz\xml.c" />
+    <ClCompile Include="..\..\source\img\muimage.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-annot.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-cmap-load.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-cmap-parse.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-cmap-table.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-cmap.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-colorspace.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-crypt.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-device.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-encoding.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-event.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-field.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-font.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-fontfile.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-form.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-function.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-image.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-interpret.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-lex.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-metrics.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-nametree.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-object.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-outline.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-page.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-parse.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-pattern.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-pkcs7.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-repair.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-shade.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-store.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-stream.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-type3.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-unicode.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-write.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-xobject.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-xref-aux.c" />
+    <ClCompile Include="..\..\source\pdf\pdf-xref.c" />
+    <ClCompile Include="..\..\source\xps\xps-common.c" />
+    <ClCompile Include="..\..\source\xps\xps-doc.c" />
+    <ClCompile Include="..\..\source\xps\xps-glyphs.c" />
+    <ClCompile Include="..\..\source\xps\xps-gradient.c" />
+    <ClCompile Include="..\..\source\xps\xps-image.c" />
+    <ClCompile Include="..\..\source\xps\xps-outline.c" />
+    <ClCompile Include="..\..\source\xps\xps-path.c" />
+    <ClCompile Include="..\..\source\xps\xps-resource.c" />
+    <ClCompile Include="..\..\source\xps\xps-tile.c" />
+    <ClCompile Include="..\..\source\xps\xps-util.c" />
+    <ClCompile Include="..\..\source\xps\xps-zip.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\cbz\mucbz.h" />
-    <ClInclude Include="..\fitz\fitz-internal.h" />
-    <ClInclude Include="..\fitz\fitz.h" />
-    <ClInclude Include="..\fitz\memento.h" />
-    <ClInclude Include="..\image\muimage.h" />
-    <ClInclude Include="..\pdf\data_encodings.h" />
-    <ClInclude Include="..\pdf\data_glyphlist.h" />
-    <ClInclude Include="..\pdf\mupdf-internal.h" />
-    <ClInclude Include="..\pdf\mupdf.h" />
-    <ClInclude Include="..\xps\muxps-internal.h" />
-    <ClInclude Include="..\xps\muxps.h" />
+    <ClInclude Include="..\..\include\mupdf\cbz.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\annotation.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\bitmap.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\buffer.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\colorspace.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\compressed-buffer.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\context.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\crypt.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\device.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\display-list.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\document.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\filter.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\font.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\function.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\getopt.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\glyph-cache.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\hash.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\image.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\link.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\math.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\meta.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\outline.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\output-pcl.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\output-png.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\output-pnm.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\output-pwg.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\output-svg.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\output.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\path.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\pixmap.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\shade.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\store.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\stream.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\string.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\structured-text.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\system.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\text.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\transition.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\write-document.h" />
+    <ClInclude Include="..\..\include\mupdf\fitz\xml.h" />
+    <ClInclude Include="..\..\include\mupdf\img.h" />
+    <ClInclude Include="..\..\include\mupdf\memento.h" />
+    <ClInclude Include="..\..\include\mupdf\pdf.h" />
+    <ClInclude Include="..\..\include\mupdf\pdf\annot.h" />
+    <ClInclude Include="..\..\include\mupdf\pdf\cmap.h" />
+    <ClInclude Include="..\..\include\mupdf\pdf\crypt.h" />
+    <ClInclude Include="..\..\include\mupdf\pdf\document.h" />
+    <ClInclude Include="..\..\include\mupdf\pdf\event.h" />
+    <ClInclude Include="..\..\include\mupdf\pdf\field.h" />
+    <ClInclude Include="..\..\include\mupdf\pdf\font.h" />
+    <ClInclude Include="..\..\include\mupdf\pdf\javascript.h" />
+    <ClInclude Include="..\..\include\mupdf\pdf\object.h" />
+    <ClInclude Include="..\..\include\mupdf\pdf\output-pdf.h" />
+    <ClInclude Include="..\..\include\mupdf\pdf\page.h" />
+    <ClInclude Include="..\..\include\mupdf\pdf\parse.h" />
+    <ClInclude Include="..\..\include\mupdf\pdf\resource.h" />
+    <ClInclude Include="..\..\include\mupdf\pdf\widget.h" />
+    <ClInclude Include="..\..\include\mupdf\pdf\xref.h" />
+    <ClInclude Include="..\..\include\mupdf\xps.h" />
+    <ClInclude Include="..\..\source\fitz\draw-imp.h" />
+    <ClInclude Include="..\..\source\fitz\ucdn.h" />
+    <ClInclude Include="..\..\source\fitz\unicodedata_db.h" />
+    <ClInclude Include="..\..\source\pdf\pdf-encodings.h" />
+    <ClInclude Include="..\..\source\pdf\pdf-glyphlist.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{0715f3cf-5d1b-4617-a331-6527371365b7}</ProjectGuid>
@@ -303,7 +361,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\ucdn;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\ucdn;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG=1;_WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -317,7 +375,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\ucdn;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\ucdn;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>MEMENTO=1;DEBUG=1;_WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -331,7 +389,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\ucdn;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\ucdn;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -346,7 +404,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
       <PreprocessorDefinitions>DEBUG=1;_WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\scripts;..\ucdn;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\ucdn;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -360,7 +418,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
       <PreprocessorDefinitions>MEMENTO=1;DEBUG=1;_WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\scripts;..\ucdn;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\ucdn;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -373,7 +431,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\ucdn;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\ucdn;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -387,7 +445,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\ucdn;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\ucdn;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG=1;_WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -401,7 +459,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\ucdn;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\ucdn;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>MEMENTO=1;DEBUG=1;_WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -415,7 +473,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\ucdn;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\ucdn;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
diff --git a/platform/winrt/libmupdf_winRT.vcxproj.filters b/platform/winrt/libmupdf_winRT.vcxproj.filters
index f2dfaec7..3b1950e7 100644
--- a/platform/winrt/libmupdf_winRT.vcxproj.filters
+++ b/platform/winrt/libmupdf_winRT.vcxproj.filters
@@ -4,9 +4,6 @@
     <Filter Include="cbz">
       <UniqueIdentifier>{d78079b0-99b0-4ce6-b1ec-cc101aecfc0d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="draw">
-      <UniqueIdentifier>{18aad001-4979-4a53-885b-57b50c49d073}</UniqueIdentifier>
-    </Filter>
     <Filter Include="fitz">
       <UniqueIdentifier>{31bd53e0-4b00-4f84-8c40-cb2c16a716e1}</UniqueIdentifier>
     </Filter>
@@ -16,384 +13,564 @@
     <Filter Include="xps">
       <UniqueIdentifier>{be1af520-39c9-4c25-938e-4c90e486c89c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="ucdn">
-      <UniqueIdentifier>{3e7ffbf1-2975-4b19-96d3-ed2e168c870e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="image">
+    <Filter Include="img">
       <UniqueIdentifier>{726654cd-aa58-4ed2-90df-7e02c3615031}</UniqueIdentifier>
     </Filter>
+    <Filter Include="!include">
+      <UniqueIdentifier>{89ff37a6-fa19-4690-b07f-1fb91f4b5803}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="!include\fitz">
+      <UniqueIdentifier>{a3eb732e-eaea-4b44-b168-6384494ab2cf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="!include\pdf">
+      <UniqueIdentifier>{7b0f7938-a977-4cd9-a8bc-aeef816ae84c}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\cbz\mucbz.c">
+    <ClCompile Include="..\..\source\cbz\mucbz.c">
       <Filter>cbz</Filter>
     </ClCompile>
-    <ClCompile Include="..\draw\draw_affine.c">
-      <Filter>draw</Filter>
+    <ClCompile Include="..\..\source\fitz\store.c">
+      <Filter>fitz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\fitz\stream-open.c">
+      <Filter>fitz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\fitz\stream-read.c">
+      <Filter>fitz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\fitz\string.c">
+      <Filter>fitz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\fitz\svg-device.c">
+      <Filter>fitz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\fitz\text.c">
+      <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\draw\draw_blend.c">
-      <Filter>draw</Filter>
+    <ClCompile Include="..\..\source\fitz\time.c">
+      <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\draw\draw_device.c">
-      <Filter>draw</Filter>
+    <ClCompile Include="..\..\source\fitz\trace-device.c">
+      <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\draw\draw_edge.c">
-      <Filter>draw</Filter>
+    <ClCompile Include="..\..\source\fitz\transition.c">
+      <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\draw\draw_glyph.c">
-      <Filter>draw</Filter>
+    <ClCompile Include="..\..\source\fitz\ucdn.c">
+      <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\draw\draw_mesh.c">
-      <Filter>draw</Filter>
+    <ClCompile Include="..\..\source\fitz\xml.c">
+      <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\draw\draw_paint.c">
-      <Filter>draw</Filter>
+    <ClCompile Include="..\..\source\fitz\bbox-device.c">
+      <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\draw\draw_path.c">
-      <Filter>draw</Filter>
+    <ClCompile Include="..\..\source\fitz\bitmap.c">
+      <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\draw\draw_simple_scale.c">
-      <Filter>draw</Filter>
+    <ClCompile Include="..\..\source\fitz\buffer.c">
+      <Filter>fitz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\fitz\colorspace.c">
+      <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\draw\draw_unpack.c">
-      <Filter>draw</Filter>
+    <ClCompile Include="..\..\source\fitz\compressed-buffer.c">
+      <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\base_context.c">
+    <ClCompile Include="..\..\source\fitz\context.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\base_error.c">
+    <ClCompile Include="..\..\source\fitz\crypt-aes.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\base_geometry.c">
+    <ClCompile Include="..\..\source\fitz\crypt-arc4.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\base_getopt.c">
+    <ClCompile Include="..\..\source\fitz\crypt-md5.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\base_hash.c">
+    <ClCompile Include="..\..\source\fitz\crypt-sha2.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\base_memory.c">
+    <ClCompile Include="..\..\source\fitz\device.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\base_string.c">
+    <ClCompile Include="..\..\source\fitz\document.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\base_time.c">
+    <ClCompile Include="..\..\source\fitz\draw-affine.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\base_trans.c">
+    <ClCompile Include="..\..\source\fitz\draw-blend.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\base_xml.c">
+    <ClCompile Include="..\..\source\fitz\draw-device.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\crypt_aes.c">
+    <ClCompile Include="..\..\source\fitz\draw-edge.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\crypt_arc4.c">
+    <ClCompile Include="..\..\source\fitz\draw-glyph.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\crypt_md5.c">
+    <ClCompile Include="..\..\source\fitz\draw-mesh.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\crypt_sha2.c">
+    <ClCompile Include="..\..\source\fitz\draw-paint.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\dev_bbox.c">
+    <ClCompile Include="..\..\source\fitz\draw-path.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\dev_list.c">
+    <ClCompile Include="..\..\source\fitz\draw-scale-simple.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\dev_null.c">
+    <ClCompile Include="..\..\source\fitz\draw-unpack.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\dev_trace.c">
+    <ClCompile Include="..\..\source\fitz\error.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\doc_document.c">
+    <ClCompile Include="..\..\source\fitz\filter-basic.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\doc_link.c">
+    <ClCompile Include="..\..\source\fitz\filter-dct.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\doc_outline.c">
+    <ClCompile Include="..\..\source\fitz\filter-fax.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\filt_basic.c">
+    <ClCompile Include="..\..\source\fitz\filter-flate.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\filt_dctd.c">
+    <ClCompile Include="..\..\source\fitz\filter-jbig2.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\filt_faxd.c">
+    <ClCompile Include="..\..\source\fitz\filter-lzw.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\filt_flate.c">
+    <ClCompile Include="..\..\source\fitz\filter-predict.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\filt_jbig2d.c">
+    <ClCompile Include="..\..\source\fitz\font.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\filt_lzwd.c">
+    <ClCompile Include="..\..\source\fitz\function.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\filt_predict.c">
+    <ClCompile Include="..\..\source\fitz\geometry.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\image_jpeg.c">
+    <ClCompile Include="..\..\source\fitz\getopt.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\image_jpx.c">
+    <ClCompile Include="..\..\source\fitz\halftone.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\image_png.c">
+    <ClCompile Include="..\..\source\fitz\hash.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\image_tiff.c">
+    <ClCompile Include="..\..\source\fitz\image.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\memento.c">
+    <ClCompile Include="..\..\source\fitz\link.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\res_bitmap.c">
+    <ClCompile Include="..\..\source\fitz\list-device.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\res_colorspace.c">
+    <ClCompile Include="..\..\source\fitz\load-jpeg.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\res_font.c">
+    <ClCompile Include="..\..\source\fitz\load-jpx.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\res_halftone.c">
+    <ClCompile Include="..\..\source\fitz\load-png.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\res_path.c">
+    <ClCompile Include="..\..\source\fitz\load-tiff.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\res_pixmap.c">
+    <ClCompile Include="..\..\source\fitz\memento.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\res_shade.c">
+    <ClCompile Include="..\..\source\fitz\memory.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\res_store.c">
+    <ClCompile Include="..\..\source\fitz\outline.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\res_text.c">
+    <ClCompile Include="..\..\source\fitz\output.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\stm_buffer.c">
+    <ClCompile Include="..\..\source\fitz\output-pcl.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\stm_comp_buf.c">
+    <ClCompile Include="..\..\source\fitz\output-pwg.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\stm_open.c">
+    <ClCompile Include="..\..\source\fitz\path.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\stm_output.c">
+    <ClCompile Include="..\..\source\fitz\pixmap.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\fitz\stm_read.c">
+    <ClCompile Include="..\..\source\fitz\shade.c">
       <Filter>fitz</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_annot.c">
+    <ClCompile Include="..\..\source\fitz\stext-device.c">
+      <Filter>fitz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\fitz\stext-output.c">
+      <Filter>fitz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\fitz\stext-paragraph.c">
+      <Filter>fitz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\fitz\stext-search.c">
+      <Filter>fitz</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\img\muimage.c">
+      <Filter>img</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\pdf\pdf-xobject.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_cmap.c">
+    <ClCompile Include="..\..\source\pdf\pdf-xref.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_cmap_load.c">
+    <ClCompile Include="..\..\source\pdf\pdf-xref-aux.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_cmap_parse.c">
+    <ClCompile Include="..\..\source\pdf\pdf-annot.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_cmap_table.c">
+    <ClCompile Include="..\..\source\pdf\pdf-cmap.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_colorspace.c">
+    <ClCompile Include="..\..\source\pdf\pdf-cmap-load.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_crypt.c">
+    <ClCompile Include="..\..\source\pdf\pdf-cmap-parse.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_device.c">
+    <ClCompile Include="..\..\source\pdf\pdf-cmap-table.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_encoding.c">
+    <ClCompile Include="..\..\source\pdf\pdf-colorspace.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_event.c">
+    <ClCompile Include="..\..\source\pdf\pdf-crypt.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_font.c">
+    <ClCompile Include="..\..\source\pdf\pdf-device.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_fontfile.c">
+    <ClCompile Include="..\..\source\pdf\pdf-encoding.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_form.c">
+    <ClCompile Include="..\..\source\pdf\pdf-event.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_function.c">
+    <ClCompile Include="..\..\source\pdf\pdf-field.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_image.c">
+    <ClCompile Include="..\..\source\pdf\pdf-font.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_interpret.c">
+    <ClCompile Include="..\..\source\pdf\pdf-fontfile.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_lex.c">
+    <ClCompile Include="..\..\source\pdf\pdf-form.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_metrics.c">
+    <ClCompile Include="..\..\source\pdf\pdf-function.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_nametree.c">
+    <ClCompile Include="..\..\source\pdf\pdf-image.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_object.c">
+    <ClCompile Include="..\..\source\pdf\pdf-interpret.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_outline.c">
+    <ClCompile Include="..\..\source\pdf\pdf-lex.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_page.c">
+    <ClCompile Include="..\..\source\pdf\pdf-metrics.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_parse.c">
+    <ClCompile Include="..\..\source\pdf\pdf-nametree.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_pattern.c">
+    <ClCompile Include="..\..\source\pdf\pdf-object.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_repair.c">
+    <ClCompile Include="..\..\source\pdf\pdf-outline.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_shade.c">
+    <ClCompile Include="..\..\source\pdf\pdf-page.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_store.c">
+    <ClCompile Include="..\..\source\pdf\pdf-parse.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_stream.c">
+    <ClCompile Include="..\..\source\pdf\pdf-pattern.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_type3.c">
+    <ClCompile Include="..\..\source\pdf\pdf-pkcs7.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_unicode.c">
+    <ClCompile Include="..\..\source\pdf\pdf-repair.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_write.c">
+    <ClCompile Include="..\..\source\pdf\pdf-shade.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_xobject.c">
+    <ClCompile Include="..\..\source\pdf\pdf-store.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_xref.c">
+    <ClCompile Include="..\..\source\pdf\pdf-stream.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_xref_aux.c">
+    <ClCompile Include="..\..\source\pdf\pdf-type3.c">
       <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\xps\xps_common.c">
-      <Filter>xps</Filter>
+    <ClCompile Include="..\..\source\pdf\pdf-unicode.c">
+      <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\xps\xps_doc.c">
-      <Filter>xps</Filter>
+    <ClCompile Include="..\..\source\pdf\pdf-write.c">
+      <Filter>pdf</Filter>
     </ClCompile>
-    <ClCompile Include="..\xps\xps_glyphs.c">
+    <ClCompile Include="..\..\source\xps\xps-gradient.c">
       <Filter>xps</Filter>
     </ClCompile>
-    <ClCompile Include="..\xps\xps_gradient.c">
+    <ClCompile Include="..\..\source\xps\xps-image.c">
       <Filter>xps</Filter>
     </ClCompile>
-    <ClCompile Include="..\xps\xps_image.c">
+    <ClCompile Include="..\..\source\xps\xps-outline.c">
       <Filter>xps</Filter>
     </ClCompile>
-    <ClCompile Include="..\xps\xps_outline.c">
+    <ClCompile Include="..\..\source\xps\xps-path.c">
       <Filter>xps</Filter>
     </ClCompile>
-    <ClCompile Include="..\xps\xps_path.c">
+    <ClCompile Include="..\..\source\xps\xps-resource.c">
       <Filter>xps</Filter>
     </ClCompile>
-    <ClCompile Include="..\xps\xps_resource.c">
+    <ClCompile Include="..\..\source\xps\xps-tile.c">
       <Filter>xps</Filter>
     </ClCompile>
-    <ClCompile Include="..\xps\xps_tile.c">
+    <ClCompile Include="..\..\source\xps\xps-util.c">
       <Filter>xps</Filter>
     </ClCompile>
-    <ClCompile Include="..\xps\xps_util.c">
+    <ClCompile Include="..\..\source\xps\xps-zip.c">
       <Filter>xps</Filter>
     </ClCompile>
-    <ClCompile Include="..\xps\xps_zip.c">
+    <ClCompile Include="..\..\source\xps\xps-common.c">
       <Filter>xps</Filter>
     </ClCompile>
-    <ClCompile Include="..\pdf\pdf_field.c">
-      <Filter>pdf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\fitz\res_func.c">
-      <Filter>fitz</Filter>
-    </ClCompile>
-    <ClCompile Include="..\fitz\text_extract.c">
-      <Filter>fitz</Filter>
-    </ClCompile>
-    <ClCompile Include="..\fitz\text_output.c">
-      <Filter>fitz</Filter>
-    </ClCompile>
-    <ClCompile Include="..\fitz\text_paragraph.c">
-      <Filter>fitz</Filter>
-    </ClCompile>
-    <ClCompile Include="..\fitz\text_search.c">
-      <Filter>fitz</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ucdn\ucdn.c">
-      <Filter>ucdn</Filter>
-    </ClCompile>
-    <ClCompile Include="..\fitz\res_image.c">
-      <Filter>fitz</Filter>
+    <ClCompile Include="..\..\source\xps\xps-doc.c">
+      <Filter>xps</Filter>
     </ClCompile>
-    <ClCompile Include="..\image\muimage.c">
-      <Filter>image</Filter>
+    <ClCompile Include="..\..\source\xps\xps-glyphs.c">
+      <Filter>xps</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\cbz\mucbz.h">
-      <Filter>cbz</Filter>
-    </ClInclude>
-    <ClInclude Include="..\fitz\fitz-internal.h">
+    <ClInclude Include="..\..\source\fitz\ucdn.h">
       <Filter>fitz</Filter>
     </ClInclude>
-    <ClInclude Include="..\fitz\fitz.h">
+    <ClInclude Include="..\..\source\fitz\unicodedata_db.h">
       <Filter>fitz</Filter>
     </ClInclude>
-    <ClInclude Include="..\fitz\memento.h">
+    <ClInclude Include="..\..\source\fitz\draw-imp.h">
       <Filter>fitz</Filter>
     </ClInclude>
-    <ClInclude Include="..\pdf\data_encodings.h">
+    <ClInclude Include="..\..\source\pdf\pdf-encodings.h">
       <Filter>pdf</Filter>
     </ClInclude>
-    <ClInclude Include="..\pdf\data_glyphlist.h">
+    <ClInclude Include="..\..\source\pdf\pdf-glyphlist.h">
       <Filter>pdf</Filter>
     </ClInclude>
-    <ClInclude Include="..\pdf\mupdf-internal.h">
-      <Filter>pdf</Filter>
+    <ClInclude Include="..\..\include\mupdf\fitz\function.h">
+      <Filter>!include\fitz</Filter>
     </ClInclude>
-    <ClInclude Include="..\pdf\mupdf.h">
-      <Filter>pdf</Filter>
+    <ClInclude Include="..\..\include\mupdf\fitz\getopt.h">
+      <Filter>!include\fitz</Filter>
     </ClInclude>
-    <ClInclude Include="..\xps\muxps-internal.h">
-      <Filter>xps</Filter>
+    <ClInclude Include="..\..\include\mupdf\fitz\glyph-cache.h">
+      <Filter>!include\fitz</Filter>
     </ClInclude>
-    <ClInclude Include="..\xps\muxps.h">
-      <Filter>xps</Filter>
+    <ClInclude Include="..\..\include\mupdf\fitz\hash.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\image.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\link.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\math.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\meta.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\outline.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\output.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\output-pcl.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\output-png.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\output-pnm.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\output-pwg.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\output-svg.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\path.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\pixmap.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\shade.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\store.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\stream.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\string.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\structured-text.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\system.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\text.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\transition.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\write-document.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\xml.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\annotation.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\bitmap.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\buffer.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\colorspace.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\compressed-buffer.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\context.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\crypt.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\device.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\display-list.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\document.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\filter.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz\font.h">
+      <Filter>!include\fitz</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\pdf\annot.h">
+      <Filter>!include\pdf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\pdf\cmap.h">
+      <Filter>!include\pdf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\pdf\crypt.h">
+      <Filter>!include\pdf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\pdf\document.h">
+      <Filter>!include\pdf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\pdf\event.h">
+      <Filter>!include\pdf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\pdf\field.h">
+      <Filter>!include\pdf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\pdf\font.h">
+      <Filter>!include\pdf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\pdf\javascript.h">
+      <Filter>!include\pdf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\pdf\object.h">
+      <Filter>!include\pdf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\pdf\output-pdf.h">
+      <Filter>!include\pdf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\pdf\page.h">
+      <Filter>!include\pdf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\pdf\parse.h">
+      <Filter>!include\pdf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\pdf\resource.h">
+      <Filter>!include\pdf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\pdf\widget.h">
+      <Filter>!include\pdf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\pdf\xref.h">
+      <Filter>!include\pdf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\cbz.h">
+      <Filter>!include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\fitz.h">
+      <Filter>!include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\img.h">
+      <Filter>!include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\memento.h">
+      <Filter>!include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mupdf\pdf.h">
+      <Filter>!include</Filter>
     </ClInclude>
-    <ClInclude Include="..\image\muimage.h">
-      <Filter>image</Filter>
+    <ClInclude Include="..\..\include\mupdf\xps.h">
+      <Filter>!include</Filter>
     </ClInclude>
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/platform/winrt/libthirdparty_winRT.vcxproj b/platform/winrt/libthirdparty_winRT.vcxproj
index 386f6d95..aa131220 100644
--- a/platform/winrt/libthirdparty_winRT.vcxproj
+++ b/platform/winrt/libthirdparty_winRT.vcxproj
@@ -39,221 +39,223 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftbase.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftbbox.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftbitmap.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftgasp.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftglyph.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftinit.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftstroke.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftsynth.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftsystem.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\base\fttype1.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftxf86.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\cff\cff.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\cid\type1cid.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\psaux\psaux.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\pshinter\pshinter.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\psnames\psnames.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\raster\raster.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\sfnt\sfnt.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\smooth\smooth.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\truetype\truetype.c" />
-    <ClCompile Include="..\thirdparty\freetype\src\type1\type1.c" />
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2.c" />
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_arith.c" />
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_arith_iaid.c" />
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_arith_int.c" />
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_generic.c" />
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_halftone.c" />
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_huffman.c" />
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_image.c" />
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_metadata.c" />
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_mmr.c" />
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_page.c" />
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_refinement.c" />
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_segment.c" />
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_symbol_dict.c" />
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_text.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jaricom.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jcomapi.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jdapimin.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jdapistd.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jdarith.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jdatadst.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jdatasrc.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jdcoefct.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jdcolor.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jddctmgr.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jdhuff.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jdinput.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jdmainct.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jdmarker.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jdmaster.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jdmerge.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jdpostct.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jdsample.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jdtrans.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jerror.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jfdctflt.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jfdctfst.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jfdctint.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jidctflt.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jidctfst.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jidctint.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jmemmgr.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jmemnobs.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jquant1.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jquant2.c" />
-    <ClCompile Include="..\thirdparty\jpeg\jutils.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\bio.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\cio.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\dwt.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\event.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\function_list.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\image.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\invert.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\j2k.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\jp2.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\mct.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\mqc.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\phix_manager.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\pi.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\ppix_manager.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\raw.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\t1.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\t1_generate_luts.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\t2.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\tcd.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\tgt.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\thix_manager.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\tpix_manager.c" />
-    <ClCompile Include="..\thirdparty\zlib\adler32.c" />
-    <ClCompile Include="..\thirdparty\zlib\compress.c" />
-    <ClCompile Include="..\thirdparty\zlib\crc32.c" />
-    <ClCompile Include="..\thirdparty\zlib\deflate.c" />
-    <ClCompile Include="..\thirdparty\zlib\inffast.c" />
-    <ClCompile Include="..\thirdparty\zlib\inflate.c" />
-    <ClCompile Include="..\thirdparty\zlib\inftrees.c" />
-    <ClCompile Include="..\thirdparty\zlib\trees.c" />
-    <ClCompile Include="..\thirdparty\zlib\uncompr.c" />
-    <ClCompile Include="..\thirdparty\zlib\zutil.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftbase.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftbbox.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftbitmap.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftgasp.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftglyph.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftinit.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftstroke.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftsynth.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftsystem.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\fttype1.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftxf86.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\cff\cff.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\cid\type1cid.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\psaux\psaux.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\pshinter\pshinter.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\psnames\psnames.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\raster\raster.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\sfnt\sfnt.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\smooth\smooth.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\truetype\truetype.c" />
+    <ClCompile Include="..\..\thirdparty\freetype\src\type1\type1.c" />
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2.c" />
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_arith.c" />
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_arith_iaid.c" />
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_arith_int.c" />
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_generic.c" />
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_halftone.c" />
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_huffman.c" />
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_image.c" />
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_metadata.c" />
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_mmr.c" />
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_page.c" />
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_refinement.c" />
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_segment.c" />
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_symbol_dict.c" />
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_text.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jaricom.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jcomapi.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jdapimin.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jdapistd.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jdarith.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jdatadst.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jdatasrc.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jdcoefct.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jdcolor.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jddctmgr.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jdhuff.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jdinput.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jdmainct.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jdmarker.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jdmaster.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jdmerge.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jdpostct.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jdsample.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jdtrans.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jerror.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jfdctflt.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jfdctfst.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jfdctint.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jidctflt.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jidctfst.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jidctint.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jmemmgr.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jmemnobs.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jquant1.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jquant2.c" />
+    <ClCompile Include="..\..\thirdparty\jpeg\jutils.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\bio.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\cio.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\dwt.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\event.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\function_list.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\image.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\invert.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\j2k.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\jp2.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\mct.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\mqc.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\phix_manager.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\pi.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\ppix_manager.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\raw.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\t1.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\t1_generate_luts.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\t2.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\tcd.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\tgt.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\thix_manager.c" />
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\tpix_manager.c" />
+    <ClCompile Include="..\..\thirdparty\zlib\adler32.c" />
+    <ClCompile Include="..\..\thirdparty\zlib\compress.c" />
+    <ClCompile Include="..\..\thirdparty\zlib\crc32.c" />
+    <ClCompile Include="..\..\thirdparty\zlib\deflate.c" />
+    <ClCompile Include="..\..\thirdparty\zlib\inffast.c" />
+    <ClCompile Include="..\..\thirdparty\zlib\inflate.c" />
+    <ClCompile Include="..\..\thirdparty\zlib\inftrees.c" />
+    <ClCompile Include="..\..\thirdparty\zlib\trees.c" />
+    <ClCompile Include="..\..\thirdparty\zlib\uncompr.c" />
+    <ClCompile Include="..\..\thirdparty\zlib\zutil.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\config\ftconfig.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\config\ftheader.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\config\ftmodule.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\config\ftoption.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\config\ftstdlib.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\freetype.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftadvanc.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftbbox.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftbdf.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftbitmap.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftbzip2.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftcache.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftchapters.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftcid.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\fterrdef.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\fterrors.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftgasp.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftglyph.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftgxval.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftgzip.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftimage.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftincrem.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftlcdfil.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftlist.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftlzw.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftmac.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftmm.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftmodapi.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftmoderr.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftotval.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftoutln.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftpfr.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftrender.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftsizes.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftsnames.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftstroke.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftsynth.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftsystem.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\fttrigon.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\fttypes.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftwinfnt.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftxf86.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\autohint.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftcalc.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftdebug.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftdriver.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftgloadr.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftmemory.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftobjs.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftpic.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftrfork.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftserv.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftstream.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\fttrace.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftvalid.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\internal.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\psaux.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\pshints.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svbdf.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svcid.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svgldict.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svgxval.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svkern.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svmm.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svotval.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svpfr.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svpostnm.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svpscmap.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svpsinfo.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svsfnt.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svttcmap.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svtteng.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svttglyf.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svwinfnt.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svxf86nm.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\sfnt.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\t1types.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\tttypes.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\t1tables.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ttnameid.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\tttables.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\tttags.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ttunpat.h" />
-    <ClInclude Include="..\thirdparty\freetype\include\ft2build.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\bio.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\cio.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\dwt.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\event.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\function_list.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\image.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\indexbox_manager.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\invert.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\j2k.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\jp2.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\mct.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\mqc.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_includes.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_intmath.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_inttypes.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_malloc.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_stdint.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\pi.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\raw.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\t1.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\t1_luts.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\t2.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\tcd.h" />
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\tgt.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\config\ftconfig.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\config\ftheader.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\config\ftmodule.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\config\ftoption.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\config\ftstdlib.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\freetype.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftadvanc.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftautoh.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftbbox.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftbdf.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftbitmap.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftbzip2.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftcache.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftchapters.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftcid.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\fterrdef.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\fterrors.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftgasp.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftglyph.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftgxval.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftgzip.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftimage.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftincrem.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftlcdfil.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftlist.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftlzw.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftmac.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftmm.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftmodapi.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftmoderr.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftotval.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftoutln.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftpfr.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftrender.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftsizes.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftsnames.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftstroke.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftsynth.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftsystem.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\fttrigon.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\fttypes.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftwinfnt.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftxf86.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\autohint.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftcalc.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftdebug.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftdriver.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftgloadr.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftmemory.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftobjs.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftpic.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftrfork.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftserv.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftstream.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\fttrace.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftvalid.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\internal.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\psaux.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\pshints.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svbdf.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svcid.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svgldict.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svgxval.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svkern.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svmm.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svotval.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svpfr.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svpostnm.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svprop.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svpscmap.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svpsinfo.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svsfnt.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svttcmap.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svtteng.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svttglyf.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svwinfnt.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svxf86nm.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\sfnt.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\t1types.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\tttypes.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\t1tables.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ttnameid.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\tttables.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\tttags.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ttunpat.h" />
+    <ClInclude Include="..\..\thirdparty\freetype\include\ft2build.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\bio.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\cio.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\dwt.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\event.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\function_list.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\image.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\indexbox_manager.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\invert.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\j2k.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\jp2.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\mct.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\mqc.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_includes.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_intmath.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_inttypes.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_malloc.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_stdint.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\pi.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\raw.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\t1.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\t1_luts.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\t2.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\tcd.h" />
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\tgt.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{c0d1c355-1bee-40e1-9ef4-fd9fffdbf396}</ProjectGuid>
@@ -393,7 +395,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINRT;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H="slimftmodules.h";FT_CONFIG_OPTIONS_H="slimftoptions.h";DEBUG=1;verbose=-1;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -407,7 +409,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINRT;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H="slimftmodules.h";FT_CONFIG_OPTIONS_H="slimftoptions.h";DEBUG=1;verbose=-1;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -421,7 +423,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINRT;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H="slimftmodules.h";FT_CONFIG_OPTIONS_H="slimftoptions.h";DEBUG=1;verbose=-1;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -437,7 +439,7 @@
       <SDLCheck>false</SDLCheck>
       <PrecompiledHeaderFile>
       </PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINRT;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H="slimftmodules.h";FT_CONFIG_OPTIONS_H="slimftoptions.h";DEBUG=1;verbose=-1;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -453,7 +455,7 @@
       <SDLCheck>false</SDLCheck>
       <PrecompiledHeaderFile>
       </PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINRT;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H="slimftmodules.h";FT_CONFIG_OPTIONS_H="slimftoptions.h";DEBUG=1;verbose=-1;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -467,7 +469,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINRT;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H="slimftmodules.h";FT_CONFIG_OPTIONS_H="slimftoptions.h";DEBUG=1;verbose=-1;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -481,7 +483,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINRT;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H="slimftmodules.h";FT_CONFIG_OPTIONS_H="slimftoptions.h";DEBUG=1;verbose=-1;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -495,7 +497,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINRT;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H="slimftmodules.h";FT_CONFIG_OPTIONS_H="slimftoptions.h";DEBUG=1;verbose=-1;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -509,7 +511,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINRT;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H="slimftmodules.h";FT_CONFIG_OPTIONS_H="slimftoptions.h";DEBUG=1;verbose=-1;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
diff --git a/platform/winrt/libthirdparty_winRT.vcxproj.filters b/platform/winrt/libthirdparty_winRT.vcxproj.filters
index 55f068b0..77a768da 100644
--- a/platform/winrt/libthirdparty_winRT.vcxproj.filters
+++ b/platform/winrt/libthirdparty_winRT.vcxproj.filters
@@ -13,15 +13,6 @@
     <Filter Include="libfreetype\include\freetype">
       <UniqueIdentifier>{b6fa3d37-cb6e-45ea-88de-530cb5b26c41}</UniqueIdentifier>
     </Filter>
-    <Filter Include="libfreetype\include\freetype\config">
-      <UniqueIdentifier>{7cc0c26e-d546-4a6b-a193-a7b0b88393d3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="libfreetype\include\freetype\internal">
-      <UniqueIdentifier>{2093ee27-7231-4db1-8764-40f4fe3dc8e8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="libfreetype\include\freetype\internal\services">
-      <UniqueIdentifier>{993c585b-3680-4d68-9afd-dc921a0acd2d}</UniqueIdentifier>
-    </Filter>
     <Filter Include="libjbig2dec">
       <UniqueIdentifier>{34f17a77-9d71-40b1-a18b-75b0704bddf0}</UniqueIdentifier>
     </Filter>
@@ -37,648 +28,663 @@
     <Filter Include="libopenjpeg\openjp2">
       <UniqueIdentifier>{3a31ee2f-bdac-4091-a83f-7a6236269aaf}</UniqueIdentifier>
     </Filter>
+    <Filter Include="libfreetype\include\freetype\config">
+      <UniqueIdentifier>{289ce62d-7110-4e8b-8045-72a557f8e6c0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libfreetype\include\freetype\internal">
+      <UniqueIdentifier>{bcbd304b-3787-4d77-a13d-1052885ff121}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libfreetype\include\freetype\internal\services">
+      <UniqueIdentifier>{298e58d2-d279-4f1c-abb8-6224727db323}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\thirdparty\freetype\src\cff\cff.c">
-      <Filter>libfreetype</Filter>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\bio.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\psaux\psaux.c">
-      <Filter>libfreetype</Filter>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\pshinter\pshinter.c">
-      <Filter>libfreetype</Filter>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\cio.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\psnames\psnames.c">
-      <Filter>libfreetype</Filter>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\dwt.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\raster\raster.c">
-      <Filter>libfreetype</Filter>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\event.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\sfnt\sfnt.c">
-      <Filter>libfreetype</Filter>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\function_list.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\smooth\smooth.c">
-      <Filter>libfreetype</Filter>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\image.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\truetype\truetype.c">
-      <Filter>libfreetype</Filter>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\invert.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\type1\type1.c">
-      <Filter>libfreetype</Filter>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\j2k.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\cid\type1cid.c">
-      <Filter>libfreetype</Filter>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\jp2.c">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\mct.c">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\mqc.c">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftbase.c">
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.c">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\phix_manager.c">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\pi.c">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\ppix_manager.c">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\raw.c">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\t1.c">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\t1_generate_luts.c">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\t2.c">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\tcd.c">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\tgt.c">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\thix_manager.c">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\openjpeg\src\lib\openjp2\tpix_manager.c">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftstroke.c">
       <Filter>libfreetype\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftbbox.c">
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftsynth.c">
       <Filter>libfreetype\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftbitmap.c">
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftsystem.c">
       <Filter>libfreetype\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftgasp.c">
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\fttype1.c">
       <Filter>libfreetype\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftglyph.c">
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftxf86.c">
       <Filter>libfreetype\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftinit.c">
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftbase.c">
       <Filter>libfreetype\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftstroke.c">
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftbbox.c">
       <Filter>libfreetype\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftsynth.c">
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftbitmap.c">
       <Filter>libfreetype\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftsystem.c">
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftgasp.c">
       <Filter>libfreetype\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\base\fttype1.c">
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftglyph.c">
       <Filter>libfreetype\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\freetype\src\base\ftxf86.c">
+    <ClCompile Include="..\..\thirdparty\freetype\src\base\ftinit.c">
       <Filter>libfreetype\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2.c">
+    <ClCompile Include="..\..\thirdparty\freetype\src\cff\cff.c">
+      <Filter>libfreetype</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\freetype\src\psaux\psaux.c">
+      <Filter>libfreetype</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\freetype\src\pshinter\pshinter.c">
+      <Filter>libfreetype</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\freetype\src\psnames\psnames.c">
+      <Filter>libfreetype</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\freetype\src\raster\raster.c">
+      <Filter>libfreetype</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\freetype\src\sfnt\sfnt.c">
+      <Filter>libfreetype</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\freetype\src\smooth\smooth.c">
+      <Filter>libfreetype</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\freetype\src\truetype\truetype.c">
+      <Filter>libfreetype</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\freetype\src\type1\type1.c">
+      <Filter>libfreetype</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\freetype\src\cid\type1cid.c">
+      <Filter>libfreetype</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_metadata.c">
       <Filter>libjbig2dec</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_arith.c">
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_mmr.c">
       <Filter>libjbig2dec</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_arith_iaid.c">
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_page.c">
       <Filter>libjbig2dec</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_arith_int.c">
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_refinement.c">
       <Filter>libjbig2dec</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_generic.c">
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_segment.c">
       <Filter>libjbig2dec</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_halftone.c">
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_symbol_dict.c">
       <Filter>libjbig2dec</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_huffman.c">
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_text.c">
       <Filter>libjbig2dec</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_image.c">
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2.c">
       <Filter>libjbig2dec</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_metadata.c">
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_arith.c">
       <Filter>libjbig2dec</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_mmr.c">
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_arith_iaid.c">
       <Filter>libjbig2dec</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_page.c">
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_arith_int.c">
       <Filter>libjbig2dec</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_refinement.c">
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_generic.c">
       <Filter>libjbig2dec</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_segment.c">
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_halftone.c">
       <Filter>libjbig2dec</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_symbol_dict.c">
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_huffman.c">
       <Filter>libjbig2dec</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jbig2dec\jbig2_text.c">
+    <ClCompile Include="..\..\thirdparty\jbig2dec\jbig2_image.c">
       <Filter>libjbig2dec</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jaricom.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jquant1.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jcomapi.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jquant2.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jdapimin.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jutils.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jdapistd.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jaricom.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jdarith.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jcomapi.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jdatadst.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jdapimin.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jdatasrc.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jdapistd.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jdcoefct.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jdarith.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jdcolor.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jdatadst.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jddctmgr.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jdatasrc.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jdhuff.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jdcoefct.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jdinput.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jdcolor.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jdmainct.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jddctmgr.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jdmarker.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jdhuff.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jdmaster.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jdinput.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jdmerge.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jdmainct.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jdpostct.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jdmarker.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jdsample.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jdmaster.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jdtrans.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jdmerge.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jerror.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jdpostct.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jfdctflt.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jdsample.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jfdctfst.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jdtrans.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jfdctint.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jerror.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jidctflt.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jfdctflt.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jidctfst.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jfdctfst.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jidctint.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jfdctint.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jmemmgr.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jidctflt.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jmemnobs.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jidctfst.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jquant1.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jidctint.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jquant2.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jmemmgr.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\jpeg\jutils.c">
+    <ClCompile Include="..\..\thirdparty\jpeg\jmemnobs.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\adler32.c">
+    <ClCompile Include="..\..\thirdparty\zlib\zutil.c">
       <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\compress.c">
+    <ClCompile Include="..\..\thirdparty\zlib\adler32.c">
       <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\crc32.c">
+    <ClCompile Include="..\..\thirdparty\zlib\compress.c">
       <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\deflate.c">
+    <ClCompile Include="..\..\thirdparty\zlib\crc32.c">
       <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\inffast.c">
+    <ClCompile Include="..\..\thirdparty\zlib\deflate.c">
       <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\inflate.c">
+    <ClCompile Include="..\..\thirdparty\zlib\inffast.c">
       <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\inftrees.c">
+    <ClCompile Include="..\..\thirdparty\zlib\inflate.c">
       <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\trees.c">
+    <ClCompile Include="..\..\thirdparty\zlib\inftrees.c">
       <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\uncompr.c">
+    <ClCompile Include="..\..\thirdparty\zlib\trees.c">
       <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\zutil.c">
+    <ClCompile Include="..\..\thirdparty\zlib\uncompr.c">
       <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\phix_manager.c">
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\bio.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\pi.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\ppix_manager.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\cio.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\raw.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\dwt.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\t1.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\event.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\t1_generate_luts.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\function_list.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\t2.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\image.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\tcd.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\indexbox_manager.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\tgt.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\invert.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\thix_manager.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\j2k.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\tpix_manager.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\jp2.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\mct.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\mct.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\mqc.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\mqc.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\dwt.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_includes.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\event.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_intmath.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\function_list.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_inttypes.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\image.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_malloc.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\invert.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_stdint.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\j2k.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\pi.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\jp2.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\raw.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\bio.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\t1.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\t1_luts.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\cio.c">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\t2.h">
       <Filter>libopenjpeg\openjp2</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\thirdparty\freetype\include\ft2build.h">
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\tcd.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\openjpeg\src\lib\openjp2\tgt.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\freetype\include\ft2build.h">
       <Filter>libfreetype\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\freetype.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftmodapi.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftadvanc.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftmoderr.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftbbox.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftotval.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftbdf.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftoutln.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftbitmap.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftpfr.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftbzip2.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftrender.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftcache.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftsizes.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftchapters.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftsnames.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftcid.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftstroke.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\fterrdef.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftsynth.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\fterrors.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftsystem.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftgasp.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\fttrigon.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftglyph.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\fttypes.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftgxval.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftwinfnt.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftgzip.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftxf86.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftimage.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\t1tables.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftincrem.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ttnameid.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftlcdfil.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\tttables.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftlist.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\tttags.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftlzw.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ttunpat.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftmac.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\freetype.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftmm.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftadvanc.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftmodapi.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftautoh.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftmoderr.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftbbox.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftotval.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftbdf.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftoutln.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftbitmap.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftpfr.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftbzip2.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftrender.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftcache.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftsizes.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftchapters.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftsnames.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftcid.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftstroke.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\fterrdef.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftsynth.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\fterrors.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftsystem.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftgasp.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\fttrigon.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftglyph.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\fttypes.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftgxval.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftwinfnt.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftgzip.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ftxf86.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftimage.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\t1tables.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftincrem.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ttnameid.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftlcdfil.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\tttables.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftlist.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\tttags.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftlzw.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\ttunpat.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftmac.h">
       <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\config\ftconfig.h">
-      <Filter>libfreetype\include\freetype\config</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\ftmm.h">
+      <Filter>libfreetype\include\freetype</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\config\ftheader.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\config\ftconfig.h">
       <Filter>libfreetype\include\freetype\config</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\config\ftmodule.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\config\ftheader.h">
       <Filter>libfreetype\include\freetype\config</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\config\ftoption.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\config\ftmodule.h">
       <Filter>libfreetype\include\freetype\config</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\config\ftstdlib.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\config\ftoption.h">
       <Filter>libfreetype\include\freetype\config</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\autohint.h">
-      <Filter>libfreetype\include\freetype\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftcalc.h">
-      <Filter>libfreetype\include\freetype\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftdebug.h">
-      <Filter>libfreetype\include\freetype\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftdriver.h">
-      <Filter>libfreetype\include\freetype\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftgloadr.h">
-      <Filter>libfreetype\include\freetype\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftmemory.h">
-      <Filter>libfreetype\include\freetype\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftobjs.h">
-      <Filter>libfreetype\include\freetype\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftpic.h">
-      <Filter>libfreetype\include\freetype\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftrfork.h">
-      <Filter>libfreetype\include\freetype\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftserv.h">
-      <Filter>libfreetype\include\freetype\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftstream.h">
-      <Filter>libfreetype\include\freetype\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\fttrace.h">
-      <Filter>libfreetype\include\freetype\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\ftvalid.h">
-      <Filter>libfreetype\include\freetype\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\internal.h">
-      <Filter>libfreetype\include\freetype\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\psaux.h">
-      <Filter>libfreetype\include\freetype\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\pshints.h">
-      <Filter>libfreetype\include\freetype\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\sfnt.h">
-      <Filter>libfreetype\include\freetype\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\t1types.h">
-      <Filter>libfreetype\include\freetype\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\tttypes.h">
-      <Filter>libfreetype\include\freetype\internal</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\config\ftstdlib.h">
+      <Filter>libfreetype\include\freetype\config</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svbdf.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svbdf.h">
       <Filter>libfreetype\include\freetype\internal\services</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svcid.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svcid.h">
       <Filter>libfreetype\include\freetype\internal\services</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svgldict.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svgldict.h">
       <Filter>libfreetype\include\freetype\internal\services</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svgxval.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svgxval.h">
       <Filter>libfreetype\include\freetype\internal\services</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svkern.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svkern.h">
       <Filter>libfreetype\include\freetype\internal\services</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svmm.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svmm.h">
       <Filter>libfreetype\include\freetype\internal\services</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svotval.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svotval.h">
       <Filter>libfreetype\include\freetype\internal\services</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svpfr.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svpfr.h">
       <Filter>libfreetype\include\freetype\internal\services</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svpostnm.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svpostnm.h">
       <Filter>libfreetype\include\freetype\internal\services</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svpscmap.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svprop.h">
       <Filter>libfreetype\include\freetype\internal\services</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svpsinfo.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svpscmap.h">
       <Filter>libfreetype\include\freetype\internal\services</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svsfnt.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svpsinfo.h">
       <Filter>libfreetype\include\freetype\internal\services</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svttcmap.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svsfnt.h">
       <Filter>libfreetype\include\freetype\internal\services</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svtteng.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svttcmap.h">
       <Filter>libfreetype\include\freetype\internal\services</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svttglyf.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svtteng.h">
       <Filter>libfreetype\include\freetype\internal\services</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svwinfnt.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svttglyf.h">
       <Filter>libfreetype\include\freetype\internal\services</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svxf86nm.h">
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svwinfnt.h">
       <Filter>libfreetype\include\freetype\internal\services</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_includes.h">
-      <Filter>libopenjpeg\openjp2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_intmath.h">
-      <Filter>libopenjpeg\openjp2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_inttypes.h">
-      <Filter>libopenjpeg\openjp2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_malloc.h">
-      <Filter>libopenjpeg\openjp2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_stdint.h">
-      <Filter>libopenjpeg\openjp2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\pi.h">
-      <Filter>libopenjpeg\openjp2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\raw.h">
-      <Filter>libopenjpeg\openjp2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\t1.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\services\svxf86nm.h">
+      <Filter>libfreetype\include\freetype\internal\services</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\t1_luts.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftrfork.h">
+      <Filter>libfreetype\include\freetype\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\t2.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftserv.h">
+      <Filter>libfreetype\include\freetype\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\tcd.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftstream.h">
+      <Filter>libfreetype\include\freetype\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\tgt.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\fttrace.h">
+      <Filter>libfreetype\include\freetype\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\mct.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftvalid.h">
+      <Filter>libfreetype\include\freetype\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\mqc.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\internal.h">
+      <Filter>libfreetype\include\freetype\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\psaux.h">
+      <Filter>libfreetype\include\freetype\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\pshints.h">
+      <Filter>libfreetype\include\freetype\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\dwt.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\sfnt.h">
+      <Filter>libfreetype\include\freetype\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\event.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\t1types.h">
+      <Filter>libfreetype\include\freetype\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\function_list.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\tttypes.h">
+      <Filter>libfreetype\include\freetype\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\image.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\autohint.h">
+      <Filter>libfreetype\include\freetype\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\indexbox_manager.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftcalc.h">
+      <Filter>libfreetype\include\freetype\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\invert.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftdebug.h">
+      <Filter>libfreetype\include\freetype\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\j2k.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftdriver.h">
+      <Filter>libfreetype\include\freetype\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\jp2.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftgloadr.h">
+      <Filter>libfreetype\include\freetype\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\bio.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftmemory.h">
+      <Filter>libfreetype\include\freetype\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftobjs.h">
+      <Filter>libfreetype\include\freetype\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\cio.h">
-      <Filter>libopenjpeg\openjp2</Filter>
+    <ClInclude Include="..\..\thirdparty\freetype\include\freetype\internal\ftpic.h">
+      <Filter>libfreetype\include\freetype\internal</Filter>
     </ClInclude>
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/platform/winrt/mupdfwinrt/mupdfwinrt.vcxproj b/platform/winrt/mupdfwinrt/mupdfwinrt.vcxproj
index 01b99ea6..9df0ab18 100644
--- a/platform/winrt/mupdfwinrt/mupdfwinrt.vcxproj
+++ b/platform/winrt/mupdfwinrt/mupdfwinrt.vcxproj
@@ -128,7 +128,7 @@
       <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
       <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>../../include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -144,7 +144,7 @@
       <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
       <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>../../include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -160,7 +160,7 @@
       <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
       <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>../../include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -176,7 +176,7 @@
       <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
       <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>../../include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -192,7 +192,7 @@
       <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
       <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>../../include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -208,7 +208,7 @@
       <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
       <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>../../include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
author	Michael Vrhel <michael.vrhel@artifex.com>	2013-07-02 19:37:10 -0700
committer	Michael Vrhel <michael.vrhel@artifex.com>	2013-07-04 12:18:48 -0700
commit	877cfb04229b8f6c9a53d9ee201ffc16a255561c (patch)
tree	658b144b16201d6ab4362aea4da9b85a9b818eb4 /platform/winrt
parent	c879c8b1af224b1c48a22d1905664bc870862cfb (diff)
download	mupdf-877cfb04229b8f6c9a53d9ee201ffc16a255561c.tar.xz