From 877cfb04229b8f6c9a53d9ee201ffc16a255561c Mon Sep 17 00:00:00 2001 From: Michael Vrhel Date: Tue, 2 Jul 2013 19:37:10 -0700 Subject: Update of winrt solution files for the reorganization that was recently undertaken --- platform/winrt/generate.bat | 38 +- platform/winrt/generated.vcxproj | 192 +----- platform/winrt/generated.vcxproj.filters | 588 ++---------------- platform/winrt/libmupdf-nov8_winRT.vcxproj | 20 +- platform/winrt/libmupdf-nov8_winRT.vcxproj.filters | 9 +- platform/winrt/libmupdf_winRT.vcxproj | 322 ++++++---- platform/winrt/libmupdf_winRT.vcxproj.filters | 507 +++++++++++----- platform/winrt/libthirdparty_winRT.vcxproj | 446 +++++++------- platform/winrt/libthirdparty_winRT.vcxproj.filters | 668 +++++++++++---------- platform/winrt/mupdfwinrt/mupdfwinrt.vcxproj | 12 +- 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 @@ - - - + + + + - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 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 @@  - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {336f64c0-6502-4d6d-91bd-4b52ff0e5be6} - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {5129a522-0f9b-4dd3-aaf8-5b20b66060d8} - - - {75b3deb7-11ce-4813-b282-6dc1c099e669} - - - {1706f021-1fce-4074-9299-6fd9c516c7ca} - - - {f2a3739d-4175-47e4-9711-4a066e0f7094} - - - {5168e64f-094a-43e0-b53f-83df3632d7ae} - - - {8462cde5-1461-408e-8708-d2b844cbb69d} + + {d381092b-b798-4bb4-851b-9d85f2072427} - - Source Files + + scripts + + + scripts - - Source Files + + scripts - - Source Files + + scripts - - Header Files + + generated - - Header Files + + generated - - Header Files + + generated - - Header Files + + generated + + + generated + + + generated + + + generated + + + generated + + + generated + + + generated - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\cns - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\gb - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\japan - - - CMAPs\korea - - - CMAPs\korea - - - CMAPs\korea - - - CMAPs\korea - - - CMAPs\korea - - - CMAPs\korea - - - CMAPs\korea - - - CMAPs\korea - - - CMAPs\korea - - - CMAPs\korea - - - CMAPs\korea - - - CMAPs\korea - - - CMAPs\korea - - - CMAPs\korea - - - CMAPs\korea - - - CMAPs\korea - - - CMAPs\korea - - - CMAPs\korea - - - CMAPs\korea - - - CMAPs\korea - - - Fonts - - - Fonts - - - Fonts - - - Fonts - - - Fonts - - - Fonts - - - Fonts - - - Fonts - - - Fonts - - - Fonts - - - Fonts - - - Fonts - - - Fonts - - - Fonts - - - Fonts\droid - - - - - Fonts\droid - - - Fonts\droid - - - Fonts\droid - + \ 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 @@ - + {5affe821-c5c8-45fb-b834-10fed76e49a7} @@ -179,7 +179,7 @@ NotUsing false false - ..\scripts;..\include;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Console @@ -192,7 +192,7 @@ NotUsing false false - ..\scripts;..\include;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Console @@ -205,7 +205,7 @@ NotUsing false false - ..\scripts;..\include;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Console @@ -218,7 +218,7 @@ NotUsing false false - ..\scripts;..\include;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Console @@ -231,7 +231,7 @@ NotUsing false false - ..\scripts;..\include;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Console @@ -244,7 +244,7 @@ NotUsing false false - ..\scripts;..\include;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Console @@ -257,7 +257,7 @@ NotUsing false false - ..\scripts;..\include;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Console @@ -270,7 +270,7 @@ NotUsing false false - ..\scripts;..\include;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Console @@ -283,7 +283,7 @@ NotUsing false false - ..\scripts;..\include;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\include;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Console 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 @@  - - {9cbc5d32-1ade-452f-9a40-cd43b9e313aa} - - - - - pdf - + \ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {0715f3cf-5d1b-4617-a331-6527371365b7} @@ -303,7 +361,7 @@ NotUsing false false - ..\scripts;..\ucdn;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\ucdn;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) DEBUG=1;_WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -317,7 +375,7 @@ NotUsing false false - ..\scripts;..\ucdn;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\ucdn;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) MEMENTO=1;DEBUG=1;_WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -331,7 +389,7 @@ NotUsing false false - ..\scripts;..\ucdn;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\ucdn;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -346,7 +404,7 @@ false false DEBUG=1;_WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ..\scripts;..\ucdn;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\ucdn;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Console @@ -360,7 +418,7 @@ false false MEMENTO=1;DEBUG=1;_WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ..\scripts;..\ucdn;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\ucdn;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Console @@ -373,7 +431,7 @@ NotUsing false false - ..\scripts;..\ucdn;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\ucdn;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -387,7 +445,7 @@ NotUsing false false - ..\scripts;..\ucdn;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\ucdn;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) DEBUG=1;_WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -401,7 +459,7 @@ NotUsing false false - ..\scripts;..\ucdn;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\ucdn;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) MEMENTO=1;DEBUG=1;_WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -415,7 +473,7 @@ NotUsing false false - ..\scripts;..\ucdn;..\include;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\ucdn;..\..\include;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions) 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 @@ {d78079b0-99b0-4ce6-b1ec-cc101aecfc0d} - - {18aad001-4979-4a53-885b-57b50c49d073} - {31bd53e0-4b00-4f84-8c40-cb2c16a716e1} @@ -16,384 +13,564 @@ {be1af520-39c9-4c25-938e-4c90e486c89c} - - {3e7ffbf1-2975-4b19-96d3-ed2e168c870e} - - + {726654cd-aa58-4ed2-90df-7e02c3615031} + + {89ff37a6-fa19-4690-b07f-1fb91f4b5803} + + + {a3eb732e-eaea-4b44-b168-6384494ab2cf} + + + {7b0f7938-a977-4cd9-a8bc-aeef816ae84c} + - + cbz - - draw + + fitz + + + fitz + + + fitz + + + fitz + + + fitz + + + fitz - - draw + + fitz - - draw + + fitz - - draw + + fitz - - draw + + fitz - - draw + + fitz - - draw + + fitz - - draw + + fitz - - draw + + fitz + + + fitz - - draw + + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + fitz - + + fitz + + + fitz + + + fitz + + + fitz + + + img + + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - + pdf - - xps + + pdf - - xps + + pdf - + xps - + xps - + xps - + xps - + xps - + xps - + xps - + xps - + xps - - pdf - - - fitz - - - fitz - - - fitz - - - fitz - - - fitz - - - ucdn - - - fitz + + xps - - image + + xps - - cbz - - + fitz - + fitz - + fitz - + pdf - + pdf - - pdf + + !include\fitz - - pdf + + !include\fitz - - xps + + !include\fitz - - xps + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\fitz + + + !include\pdf + + + !include\pdf + + + !include\pdf + + + !include\pdf + + + !include\pdf + + + !include\pdf + + + !include\pdf + + + !include\pdf + + + !include\pdf + + + !include\pdf + + + !include\pdf + + + !include\pdf + + + !include\pdf + + + !include\pdf + + + !include\pdf + + + !include + + + !include + + + !include + + + !include + + + !include - - image + + !include \ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {c0d1c355-1bee-40e1-9ef4-fd9fffdbf396} @@ -393,7 +395,7 @@ NotUsing false false - ..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _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) @@ -407,7 +409,7 @@ NotUsing false false - ..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _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) @@ -421,7 +423,7 @@ NotUsing false false - ..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _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) @@ -437,7 +439,7 @@ false - ..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _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) @@ -453,7 +455,7 @@ false - ..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _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) @@ -467,7 +469,7 @@ NotUsing false false - ..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _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) @@ -481,7 +483,7 @@ NotUsing false false - ..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _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) @@ -495,7 +497,7 @@ NotUsing false false - ..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _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) @@ -509,7 +511,7 @@ NotUsing false false - ..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\scripts;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _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) 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 @@ {b6fa3d37-cb6e-45ea-88de-530cb5b26c41} - - {7cc0c26e-d546-4a6b-a193-a7b0b88393d3} - - - {2093ee27-7231-4db1-8764-40f4fe3dc8e8} - - - {993c585b-3680-4d68-9afd-dc921a0acd2d} - {34f17a77-9d71-40b1-a18b-75b0704bddf0} @@ -37,648 +28,663 @@ {3a31ee2f-bdac-4091-a83f-7a6236269aaf} + + {289ce62d-7110-4e8b-8045-72a557f8e6c0} + + + {bcbd304b-3787-4d77-a13d-1052885ff121} + + + {298e58d2-d279-4f1c-abb8-6224727db323} + - - libfreetype + + libopenjpeg\openjp2 - - libfreetype + + libopenjpeg\openjp2 - - libfreetype + + libopenjpeg\openjp2 - - libfreetype + + libopenjpeg\openjp2 - - libfreetype + + libopenjpeg\openjp2 - - libfreetype + + libopenjpeg\openjp2 - - libfreetype + + libopenjpeg\openjp2 - - libfreetype + + libopenjpeg\openjp2 - - libfreetype + + libopenjpeg\openjp2 - - libfreetype + + libopenjpeg\openjp2 + + + libopenjpeg\openjp2 + + + libopenjpeg\openjp2 + + + libopenjpeg\openjp2 - + + libopenjpeg\openjp2 + + + libopenjpeg\openjp2 + + + libopenjpeg\openjp2 + + + libopenjpeg\openjp2 + + + libopenjpeg\openjp2 + + + libopenjpeg\openjp2 + + + libopenjpeg\openjp2 + + + libopenjpeg\openjp2 + + + libopenjpeg\openjp2 + + + libopenjpeg\openjp2 + + + libopenjpeg\openjp2 + + + libopenjpeg\openjp2 + + libfreetype\base - + libfreetype\base - + libfreetype\base - + libfreetype\base - + libfreetype\base - + libfreetype\base - + libfreetype\base - + libfreetype\base - + libfreetype\base - + libfreetype\base - + libfreetype\base - + + libfreetype + + + libfreetype + + + libfreetype + + + libfreetype + + + libfreetype + + + libfreetype + + + libfreetype + + + libfreetype + + + libfreetype + + + libfreetype + + libjbig2dec - + libjbig2dec - + libjbig2dec - + libjbig2dec - + libjbig2dec - + libjbig2dec - + libjbig2dec - + libjbig2dec - + libjbig2dec - + libjbig2dec - + libjbig2dec - + libjbig2dec - + libjbig2dec - + libjbig2dec - + libjbig2dec - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libjpeg - + libz - + libz - + libz - + libz - + libz - + libz - + libz - + libz - + libz - + libz - + + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - + + libopenjpeg\openjp2 - - - - + + + libopenjpeg\openjp2 + + + libopenjpeg\openjp2 + + libfreetype\include - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - + libfreetype\include\freetype - - libfreetype\include\freetype\config + + libfreetype\include\freetype - + libfreetype\include\freetype\config - + libfreetype\include\freetype\config - + libfreetype\include\freetype\config - + libfreetype\include\freetype\config - - libfreetype\include\freetype\internal - - - libfreetype\include\freetype\internal - - - libfreetype\include\freetype\internal - - - libfreetype\include\freetype\internal - - - libfreetype\include\freetype\internal - - - libfreetype\include\freetype\internal - - - libfreetype\include\freetype\internal - - - libfreetype\include\freetype\internal - - - libfreetype\include\freetype\internal - - - libfreetype\include\freetype\internal - - - libfreetype\include\freetype\internal - - - libfreetype\include\freetype\internal - - - libfreetype\include\freetype\internal - - - libfreetype\include\freetype\internal - - - libfreetype\include\freetype\internal - - - libfreetype\include\freetype\internal - - - libfreetype\include\freetype\internal - - - libfreetype\include\freetype\internal - - - libfreetype\include\freetype\internal + + libfreetype\include\freetype\config - + libfreetype\include\freetype\internal\services - + libfreetype\include\freetype\internal\services - + libfreetype\include\freetype\internal\services - + libfreetype\include\freetype\internal\services - + libfreetype\include\freetype\internal\services - + libfreetype\include\freetype\internal\services - + libfreetype\include\freetype\internal\services - + libfreetype\include\freetype\internal\services - + libfreetype\include\freetype\internal\services - + libfreetype\include\freetype\internal\services - + libfreetype\include\freetype\internal\services - + libfreetype\include\freetype\internal\services - + libfreetype\include\freetype\internal\services - + libfreetype\include\freetype\internal\services - + libfreetype\include\freetype\internal\services - + libfreetype\include\freetype\internal\services - + libfreetype\include\freetype\internal\services - - libopenjpeg\openjp2 - - - libopenjpeg\openjp2 - - - libopenjpeg\openjp2 - - - libopenjpeg\openjp2 - - - libopenjpeg\openjp2 - - - libopenjpeg\openjp2 - - - libopenjpeg\openjp2 - - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal\services - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal - - libopenjpeg\openjp2 + + libfreetype\include\freetype\internal \ 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 @@ $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) /bigobj %(AdditionalOptions) - ../../include/;%(AdditionalIncludeDirectories) + ../../../include/;%(AdditionalIncludeDirectories) Console @@ -144,7 +144,7 @@ $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) /bigobj %(AdditionalOptions) - ../../include/;%(AdditionalIncludeDirectories) + ../../../include/;%(AdditionalIncludeDirectories) Console @@ -160,7 +160,7 @@ $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) /bigobj %(AdditionalOptions) - ../../include/;%(AdditionalIncludeDirectories) + ../../../include/;%(AdditionalIncludeDirectories) Console @@ -176,7 +176,7 @@ $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) /bigobj %(AdditionalOptions) - ../../include/;%(AdditionalIncludeDirectories) + ../../../include/;%(AdditionalIncludeDirectories) Console @@ -192,7 +192,7 @@ $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) /bigobj %(AdditionalOptions) - ../../include/;%(AdditionalIncludeDirectories) + ../../../include/;%(AdditionalIncludeDirectories) Console @@ -208,7 +208,7 @@ $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) /bigobj %(AdditionalOptions) - ../../include/;%(AdditionalIncludeDirectories) + ../../../include/;%(AdditionalIncludeDirectories) Console -- cgit v1.2.3