diff options
author | Michael Vrhel <michael.vrhel@artifex.com> | 2014-07-21 12:41:01 -0700 |
---|---|---|
committer | Michael Vrhel <michael.vrhel@artifex.com> | 2014-09-09 16:39:39 -0700 |
commit | 3fbf865ac3184263edfe2639daef1fce34877520 (patch) | |
tree | 2436dc92b13dacf15ea601398052aabab47b5418 | |
parent | bc6dd8d8e40e712bd184a77323169d5f09781185 (diff) | |
download | mupdf-3fbf865ac3184263edfe2639daef1fce34877520.tar.xz |
Fix several issues in the project files. Also add missing App.config file.
-rw-r--r-- | platform/winrt/generate.bat | 4 | ||||
-rw-r--r-- | platform/winrt/generated.vcxproj | 21 | ||||
-rw-r--r-- | platform/winrt/gsview/App.config | 6 | ||||
-rw-r--r-- | platform/winrt/gsview/Install32/Install32.vdproj | 517 | ||||
-rw-r--r-- | platform/winrt/gsview/Install64/Install64.vdproj | 50 | ||||
-rw-r--r-- | platform/winrt/gsview/gsview.csproj | 4 | ||||
-rw-r--r-- | platform/winrt/gsview/gsview_app.ico | bin | 0 -> 370070 bytes | |||
-rw-r--r-- | platform/winrt/mupdf.sln | 30 | ||||
-rw-r--r-- | platform/winrt/mupdf_cpp/mupdf_cpp.vcxproj | 4 | ||||
-rw-r--r-- | platform/winrt/mupdfwinrt/mupdfwinrt.vcxproj | 4 |
10 files changed, 574 insertions, 66 deletions
diff --git a/platform/winrt/generate.bat b/platform/winrt/generate.bat index 0615a5fb..934dec4b 100644 --- a/platform/winrt/generate.bat +++ b/platform/winrt/generate.bat @@ -16,8 +16,8 @@ if not exist bin2hex.exe goto usage if not exist generated/gen_font_base14.h fontdump.exe generated/gen_font_base14.h resources/fonts/urw/*.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_cjk.h fontdump.exe generated/gen_font_cjk.h resources/fonts/droid/DroidSansFallback.ttc +if not exist generated/gen_font_cjk_full.h fontdump.exe generated/gen_font_cjk_full.h resources/fonts/droid/DroidSansFallbackFull.ttc 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\* diff --git a/platform/winrt/generated.vcxproj b/platform/winrt/generated.vcxproj index 24a59346..77127696 100644 --- a/platform/winrt/generated.vcxproj +++ b/platform/winrt/generated.vcxproj @@ -84,9 +84,10 @@ <OutDir>$(Configuration)\</OutDir> <IntDir>$(Configuration)\</IntDir> <NMakeBuildCommandLine>generate.bat</NMakeBuildCommandLine> - <NMakeReBuildCommandLine>del /q ..\generated && generate.bat</NMakeReBuildCommandLine> - <NMakeCleanCommandLine>del /q ..\generated</NMakeCleanCommandLine> - <NMakeOutput /> + <NMakeReBuildCommandLine>del /q ..\..\generated && generate.bat</NMakeReBuildCommandLine> + <NMakeCleanCommandLine>del /q ..\..\generated</NMakeCleanCommandLine> + <NMakeOutput> + </NMakeOutput> <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> @@ -100,9 +101,10 @@ <OutDir>$(Configuration)\</OutDir> <IntDir>$(Configuration)\</IntDir> <NMakeBuildCommandLine>generate.bat</NMakeBuildCommandLine> - <NMakeReBuildCommandLine>del /q ..\generated && generate.bat</NMakeReBuildCommandLine> - <NMakeCleanCommandLine>del /q ..\generated</NMakeCleanCommandLine> - <NMakeOutput>generated\cmap_cns.h</NMakeOutput> + <NMakeReBuildCommandLine>del /q ..\..\generated && generate.bat</NMakeReBuildCommandLine> + <NMakeCleanCommandLine>del /q ..\..\generated</NMakeCleanCommandLine> + <NMakeOutput> + </NMakeOutput> <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> @@ -116,9 +118,10 @@ <OutDir>$(Configuration)\</OutDir> <IntDir>$(Configuration)\</IntDir> <NMakeBuildCommandLine>generate.bat</NMakeBuildCommandLine> - <NMakeReBuildCommandLine>del /q ..\generated && generate.bat</NMakeReBuildCommandLine> - <NMakeCleanCommandLine>del /q ..\generated</NMakeCleanCommandLine> - <NMakeOutput>generated\cmap_cns.h</NMakeOutput> + <NMakeReBuildCommandLine>del /q ..\..\generated && generate.bat</NMakeReBuildCommandLine> + <NMakeCleanCommandLine>del /q ..\..\generated</NMakeCleanCommandLine> + <NMakeOutput> + </NMakeOutput> <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Memento|ARM'"> diff --git a/platform/winrt/gsview/App.config b/platform/winrt/gsview/App.config new file mode 100644 index 00000000..7d2f9bbc --- /dev/null +++ b/platform/winrt/gsview/App.config @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<configuration> + <startup> + + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup> +</configuration> diff --git a/platform/winrt/gsview/Install32/Install32.vdproj b/platform/winrt/gsview/Install32/Install32.vdproj index a7e9f753..4fecfe14 100644 --- a/platform/winrt/gsview/Install32/Install32.vdproj +++ b/platform/winrt/gsview/Install32/Install32.vdproj @@ -15,7 +15,43 @@ { "Entry" { - "MsmKey" = "8:_29FAF27F8AE14B06AA30971B590EE862" + "MsmKey" = "8:_016DC0AD4FFB4399B8519ACA84400E23" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_14D6D6CD543648468701A0FE8D5A2463" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1F1881EE52A84F49A62D42DE7E4D9D24" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_200E66532F6140579FA9390D6F7CC178" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2684CEAF38794D53AF9D906A7F8D677C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_389C02C6991141428A41BC2459A55E76" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4826B6F3283A4770935083729B0777B2" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -27,12 +63,30 @@ } "Entry" { + "MsmKey" = "8:_791D64A55F0847788638D3FCDD1802DD" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_87036B53E422457DBCA496540B818802" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { + "MsmKey" = "8:_A62B07FE876C4ACBBE7DEF7A219A570E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B2090A11BD04495DACDA72D4E5D72B7E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_4879181DB5BD4512A8A1790BC22435A0" "MsmSig" = "8:_UNDEFINED" @@ -55,6 +109,14 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + } } "Release" { @@ -71,6 +133,22 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.5" + { + "Name" = "8:Microsoft .NET Framework 4.5 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.5" + } + } + } } } "Deployable" @@ -100,12 +178,132 @@ } "File" { - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_29FAF27F8AE14B06AA30971B590EE862" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_016DC0AD4FFB4399B8519ACA84400E23" { - "SourcePath" = "8:..\\bin\\Release\\gsdll32.dll" - "TargetName" = "8:gsdll32.dll" + "SourcePath" = "8:..\\Resources\\pagePNG.ico" + "TargetName" = "8:pagePNG.ico" "Tag" = "8:" - "Folder" = "8:_F115E751BD3842299C96BA6F8A5B0F40" + "Folder" = "8:_F28BDA152FBB403EAF109B8E144140A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_14D6D6CD543648468701A0FE8D5A2463" + { + "SourcePath" = "8:..\\Resources\\pageCBZ.ico" + "TargetName" = "8:pageCBZ.ico" + "Tag" = "8:" + "Folder" = "8:_F28BDA152FBB403EAF109B8E144140A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1F1881EE52A84F49A62D42DE7E4D9D24" + { + "SourcePath" = "8:..\\Resources\\pageEPS.ico" + "TargetName" = "8:pageEPS.ico" + "Tag" = "8:" + "Folder" = "8:_F28BDA152FBB403EAF109B8E144140A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_200E66532F6140579FA9390D6F7CC178" + { + "SourcePath" = "8:..\\Resources\\pagePDF.ico" + "TargetName" = "8:pagePDF.ico" + "Tag" = "8:" + "Folder" = "8:_F28BDA152FBB403EAF109B8E144140A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2684CEAF38794D53AF9D906A7F8D677C" + { + "SourcePath" = "8:..\\Resources\\pagePS.ico" + "TargetName" = "8:pagePS.ico" + "Tag" = "8:" + "Folder" = "8:_F28BDA152FBB403EAF109B8E144140A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_389C02C6991141428A41BC2459A55E76" + { + "SourcePath" = "8:..\\Resources\\pageOXPS.ico" + "TargetName" = "8:pageOXPS.ico" + "Tag" = "8:" + "Folder" = "8:_F28BDA152FBB403EAF109B8E144140A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4826B6F3283A4770935083729B0777B2" + { + "SourcePath" = "8:..\\Resources\\pageJPG.ico" + "TargetName" = "8:pageJPG.ico" + "Tag" = "8:" + "Folder" = "8:_F28BDA152FBB403EAF109B8E144140A8" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -127,11 +325,6 @@ "AssemblyAsmDisplayName" = "8:gsview, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_4879181DB5BD4512A8A1790BC22435A0" - { - "Name" = "8:gsview.exe" - "Attributes" = "3:512" - } } "SourcePath" = "8:..\\bin\\Release\\gsview.exe" "TargetName" = "8:" @@ -151,6 +344,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_791D64A55F0847788638D3FCDD1802DD" + { + "SourcePath" = "8:..\\Resources\\pageXPS.ico" + "TargetName" = "8:pageXPS.ico" + "Tag" = "8:" + "Folder" = "8:_F28BDA152FBB403EAF109B8E144140A8" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_87036B53E422457DBCA496540B818802" { "SourcePath" = "8:..\\bin\\Release\\mupdfnet32.dll" @@ -171,9 +384,233 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A62B07FE876C4ACBBE7DEF7A219A570E" + { + "SourcePath" = "8:..\\gsview.visualelementsmanifest.xml" + "TargetName" = "8:gsview.visualelementsmanifest.xml" + "Tag" = "8:" + "Folder" = "8:_F115E751BD3842299C96BA6F8A5B0F40" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B2090A11BD04495DACDA72D4E5D72B7E" + { + "SourcePath" = "8:..\\gslib\\gsdll32.dll" + "TargetName" = "8:gsdll32.dll" + "Tag" = "8:" + "Folder" = "8:_F115E751BD3842299C96BA6F8A5B0F40" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } } "FileType" { + "{5EB83D71-FA18-4901-BE56-DE22E13CC478}:_12B01738B600492AA1C8D89AD0821413" + { + "Name" = "8:CDisplay ZIP Archived Comic Book file" + "Description" = "8:CDisplay ZIP Archived Comic Book file" + "Extensions" = "8:cbz" + "MIME" = "8:" + "Icon" = "8:_14D6D6CD543648468701A0FE8D5A2463" + "IconIndex" = "3:0" + "Command" + { + "Command" = "8:_4879181DB5BD4512A8A1790BC22435A0" + } + "Verbs" + { + "{95C0C507-CBF0-42B8-B119-07219E384A4A}:_33B319EC439B40E38BD09902607AFE0B" + { + "Command" = "8:&Open" + "Verb" = "8:open" + "Arguments" = "8:\"%1\"" + "Order" = "3:0" + } + } + } + "{5EB83D71-FA18-4901-BE56-DE22E13CC478}:_13D929725BF0460F823C23414FB2F0A1" + { + "Name" = "8:Open XPS Document" + "Description" = "8:Open XPS Document" + "Extensions" = "8:oxps" + "MIME" = "8:" + "Icon" = "8:_389C02C6991141428A41BC2459A55E76" + "IconIndex" = "3:0" + "Command" + { + "Command" = "8:_4879181DB5BD4512A8A1790BC22435A0" + } + "Verbs" + { + "{95C0C507-CBF0-42B8-B119-07219E384A4A}:_02319B3587ED4701B20BE6C84D578514" + { + "Command" = "8:&Open" + "Verb" = "8:open" + "Arguments" = "8:\"%1\"" + "Order" = "3:0" + } + } + } + "{5EB83D71-FA18-4901-BE56-DE22E13CC478}:_65F612197D8D450C8AC251D615131D21" + { + "Name" = "8:PostScript File" + "Description" = "8:PostScript File" + "Extensions" = "8:ps" + "MIME" = "8:" + "Icon" = "8:_2684CEAF38794D53AF9D906A7F8D677C" + "IconIndex" = "3:0" + "Command" + { + "Command" = "8:_4879181DB5BD4512A8A1790BC22435A0" + } + "Verbs" + { + "{95C0C507-CBF0-42B8-B119-07219E384A4A}:_1CC8050B2F6146E6A1F7C71C12ACB66E" + { + "Command" = "8:&Open" + "Verb" = "8:open" + "Arguments" = "8:\"%1\"" + "Order" = "3:0" + } + } + } + "{5EB83D71-FA18-4901-BE56-DE22E13CC478}:_69F979C4C92C4C348E8001B157A92FED" + { + "Name" = "8:EPS File" + "Description" = "8:EPS File" + "Extensions" = "8:eps" + "MIME" = "8:" + "Icon" = "8:_1F1881EE52A84F49A62D42DE7E4D9D24" + "IconIndex" = "3:0" + "Command" + { + "Command" = "8:_4879181DB5BD4512A8A1790BC22435A0" + } + "Verbs" + { + "{95C0C507-CBF0-42B8-B119-07219E384A4A}:_EA00D9AD05ED40BE82A6F8CF37AA21EE" + { + "Command" = "8:&Open" + "Verb" = "8:open" + "Arguments" = "8:\"%1\"" + "Order" = "3:0" + } + } + } + "{5EB83D71-FA18-4901-BE56-DE22E13CC478}:_A5691CEB907F4D66A3FE718B4FF65E8D" + { + "Name" = "8:PNG image" + "Description" = "8:PNG image" + "Extensions" = "8:png" + "MIME" = "8:" + "Icon" = "8:_016DC0AD4FFB4399B8519ACA84400E23" + "IconIndex" = "3:0" + "Command" + { + "Command" = "8:_4879181DB5BD4512A8A1790BC22435A0" + } + "Verbs" + { + "{95C0C507-CBF0-42B8-B119-07219E384A4A}:_95A3859E50134298ACEA0E1EACA47513" + { + "Command" = "8:&Open" + "Verb" = "8:open" + "Arguments" = "8:\"%1\"" + "Order" = "3:0" + } + } + } + "{5EB83D71-FA18-4901-BE56-DE22E13CC478}:_CD91C7FED2C94607AC5CFB7F6571A963" + { + "Name" = "8:XPS Document" + "Description" = "8:XPS Document" + "Extensions" = "8:xps" + "MIME" = "8:" + "Icon" = "8:_791D64A55F0847788638D3FCDD1802DD" + "IconIndex" = "3:0" + "Command" + { + "Command" = "8:_4879181DB5BD4512A8A1790BC22435A0" + } + "Verbs" + { + "{95C0C507-CBF0-42B8-B119-07219E384A4A}:_C39CD59228F345E48878777D30252120" + { + "Command" = "8:&Open" + "Verb" = "8:open" + "Arguments" = "8:\"%1\"" + "Order" = "3:0" + } + } + } + "{5EB83D71-FA18-4901-BE56-DE22E13CC478}:_EA8DCA7319A3441EA0A8F07F20C7EC71" + { + "Name" = "8:JPEG image" + "Description" = "8:JPEG image" + "Extensions" = "8:jpeg" + "MIME" = "8:" + "Icon" = "8:_4826B6F3283A4770935083729B0777B2" + "IconIndex" = "3:0" + "Command" + { + "Command" = "8:_4879181DB5BD4512A8A1790BC22435A0" + } + "Verbs" + { + "{95C0C507-CBF0-42B8-B119-07219E384A4A}:_90799BABA05F49D6AB9D093411DD157E" + { + "Command" = "8:&Open" + "Verb" = "8:open" + "Arguments" = "8:\"%1\"" + "Order" = "3:0" + } + } + } + "{5EB83D71-FA18-4901-BE56-DE22E13CC478}:_EA91006930CC4A349642A7F0AD319AA4" + { + "Name" = "8:PDF" + "Description" = "8:PDF" + "Extensions" = "8:pdf" + "MIME" = "8:" + "Icon" = "8:_200E66532F6140579FA9390D6F7CC178" + "IconIndex" = "3:0" + "Command" + { + "Command" = "8:_4879181DB5BD4512A8A1790BC22435A0" + } + "Verbs" + { + "{95C0C507-CBF0-42B8-B119-07219E384A4A}:_D9041E3AC16C43E4AF1822F9103B24D6" + { + "Command" = "8:&Open" + "Verb" = "8:open" + "Arguments" = "8:\"%1\"" + "Order" = "3:0" + } + } + } } "Folder" { @@ -186,6 +623,17 @@ "Property" = "8:ProgramMenuFolder" "Folders" { + "{9EF0B969-E518-4E46-987F-47570745A589}:_8ADA7142ADE14DFFA878A5107FE5C304" + { + "Name" = "8:Artifex Software" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_AF85737E4DAA4E318495768F54D7F0AF" + "Folders" + { + } + } } } "{1525181F-901A-416C-8A58-119130FE478E}:_74B5607A82364A9E8F63FA435CF2C5FA" @@ -209,6 +657,17 @@ "Property" = "8:TARGETDIR" "Folders" { + "{9EF0B969-E518-4E46-987F-47570745A589}:_F28BDA152FBB403EAF109B8E144140A8" + { + "Name" = "8:Resources" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_76594C33BABA488DBC160B0B115E0F1B" + "Folders" + { + } + } } } } @@ -226,25 +685,25 @@ "Product" { "Name" = "8:Microsoft Visual Studio" - "ProductName" = "8:Install32" - "ProductCode" = "8:{A6EC46B0-8B42-42E9-9BDE-E9C33B45AAAE}" - "PackageCode" = "8:{42A67127-1F5A-4E6C-A5E8-9A40A0F297F1}" + "ProductName" = "8:GSview 6.0" + "ProductCode" = "8:{BB8C85F6-5B3C-4163-9B55-6B07E747E947}" + "PackageCode" = "8:{85959242-0814-4BFE-8891-EE46ADB397D6}" "UpgradeCode" = "8:{00F5E049-7C22-449F-9879-A4D6A7634B7E}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" - "RemovePreviousVersions" = "11:FALSE" + "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" - "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.0" - "Manufacturer" = "8:Default Company Name" + "InstallAllUsers" = "11:TRUE" + "ProductVersion" = "8:6.0.0" + "Manufacturer" = "8:Artifex Software" "ARPHELPTELEPHONE" = "8:" - "ARPHELPLINK" = "8:" - "Title" = "8:Install32" + "ARPHELPLINK" = "8:http://www.artifex.com" + "Title" = "8:Install GSview 6.0 x86" "Subject" = "8:" - "ARPCONTACT" = "8:Default Company Name" + "ARPCONTACT" = "8:Artifex Software" "Keywords" = "8:" - "ARPCOMMENTS" = "8:" - "ARPURLINFOABOUT" = "8:" + "ARPCOMMENTS" = "8:Install GSview 6.0 for x86" + "ARPURLINFOABOUT" = "8:http://www.artifex.com" "ARPPRODUCTICON" = "8:" "ARPIconIndex" = "3:0" "SearchPath" = "8:" @@ -348,6 +807,20 @@ } "Shortcut" { + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_027434B1EED34DEF86F7CF3635B5FD30" + { + "Name" = "8:GSView 6.0" + "Arguments" = "8:" + "Description" = "8:" + "ShowCmd" = "3:1" + "IconIndex" = "3:32512" + "Transitive" = "11:FALSE" + "Target" = "8:_4879181DB5BD4512A8A1790BC22435A0" + "Folder" = "8:_8ADA7142ADE14DFFA878A5107FE5C304" + "WorkingFolder" = "8:_F115E751BD3842299C96BA6F8A5B0F40" + "Icon" = "8:_4879181DB5BD4512A8A1790BC22435A0" + "Feature" = "8:" + } } "UserInterface" { diff --git a/platform/winrt/gsview/Install64/Install64.vdproj b/platform/winrt/gsview/Install64/Install64.vdproj index 3208aa5b..1d660c05 100644 --- a/platform/winrt/gsview/Install64/Install64.vdproj +++ b/platform/winrt/gsview/Install64/Install64.vdproj @@ -27,25 +27,25 @@ } "Entry" { - "MsmKey" = "8:_28423EA654C8488A8F59859D947164F4" + "MsmKey" = "8:_1BF4736955034DCEBB4B7C53AEFECA2A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_372F38F3347F4E0491FA521F236BA54C" + "MsmKey" = "8:_28423EA654C8488A8F59859D947164F4" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_44A71C9401B94929A3DF6828309FE684" + "MsmKey" = "8:_372F38F3347F4E0491FA521F236BA54C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_528DB596D02340538C9E6E35872234C5" + "MsmKey" = "8:_44A71C9401B94929A3DF6828309FE684" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -226,6 +226,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1BF4736955034DCEBB4B7C53AEFECA2A" + { + "SourcePath" = "8:..\\gslib\\gsdll64.dll" + "TargetName" = "8:gsdll64.dll" + "Tag" = "8:" + "Folder" = "8:_CDB2B40979C34EBAA8A815DA144BF441" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_28423EA654C8488A8F59859D947164F4" { "SourcePath" = "8:..\\Resources\\pageOXPS.ico" @@ -297,26 +317,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_528DB596D02340538C9E6E35872234C5" - { - "SourcePath" = "8:..\\bin\\Release\\gsdll64.dll" - "TargetName" = "8:gsdll64.dll" - "Tag" = "8:" - "Folder" = "8:_CDB2B40979C34EBAA8A815DA144BF441" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6724F24524E24AA1907957AF0812BD09" { "SourcePath" = "8:..\\Resources\\pagePS.ico" @@ -700,7 +700,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GSview 6.0" "ProductCode" = "8:{A22596C0-BCF4-46F9-9CF2-1C66E8588C30}" - "PackageCode" = "8:{3F02128C-B018-4DD5-B18D-5C202F2A3A48}" + "PackageCode" = "8:{8B802149-336B-4DEB-A58A-ABDF1941600D}" "UpgradeCode" = "8:{B494B7A2-738F-4F9D-87F4-31830A16FB76}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" diff --git a/platform/winrt/gsview/gsview.csproj b/platform/winrt/gsview/gsview.csproj index 3e2e5524..31f40f51 100644 --- a/platform/winrt/gsview/gsview.csproj +++ b/platform/winrt/gsview/gsview.csproj @@ -265,10 +265,10 @@ <Resource Include="Resources\gsview_app.ico" /> </ItemGroup> <ItemGroup> - <Resource Include="gsview_app.ico" /> + <None Include="Resources\PDF.bmp" /> </ItemGroup> <ItemGroup> - <None Include="Resources\PDF.bmp" /> + <Resource Include="gsview_app.ico" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/platform/winrt/gsview/gsview_app.ico b/platform/winrt/gsview/gsview_app.ico Binary files differnew file mode 100644 index 00000000..29c5ca50 --- /dev/null +++ b/platform/winrt/gsview/gsview_app.ico diff --git a/platform/winrt/mupdf.sln b/platform/winrt/mupdf.sln index acdfec7f..65818c0e 100644 --- a/platform/winrt/mupdf.sln +++ b/platform/winrt/mupdf.sln @@ -7,7 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generated", "generated.vcxp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf_winRT", "libmupdf_winRT.vcxproj", "{0715F3CF-5D1B-4617-A331-6527371365B7}" ProjectSection(ProjectDependencies) = postProject - {C0D1C355-1BEE-40E1-9EF4-FD9FFFDBF396} = {C0D1C355-1BEE-40E1-9EF4-FD9FFFDBF396} {A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526} EndProjectSection EndProject @@ -16,7 +15,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdfwinrt", "mupdfwinrt\mupdfwinrt.vcxproj", "{9E6AB41D-09A7-45A6-A53B-1E4BF3AC5B33}" ProjectSection(ProjectDependencies) = postProject {C0D1C355-1BEE-40E1-9EF4-FD9FFFDBF396} = {C0D1C355-1BEE-40E1-9EF4-FD9FFFDBF396} - {A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526} {0715F3CF-5D1B-4617-A331-6527371365B7} = {0715F3CF-5D1B-4617-A331-6527371365B7} EndProjectSection EndProject @@ -26,14 +24,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf_cpp", "mupdf_cpp\mupd EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gsview", "gsview\gsview.csproj", "{5DA0ECC9-4026-4427-862F-E3226EFEFEB1}" + ProjectSection(ProjectDependencies) = postProject + {4468C2E0-6C90-4FA5-8A48-0A9629776167} = {4468C2E0-6C90-4FA5-8A48-0A9629776167} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdfnet", "mupdfnet\mupdfnet.vcxproj", "{4468C2E0-6C90-4FA5-8A48-0A9629776167}" + ProjectSection(ProjectDependencies) = postProject + {DF87E242-8B2C-4F04-9A7E-61C578FD994C} = {DF87E242-8B2C-4F04-9A7E-61C578FD994C} + {4D5C4349-480D-4CD6-9D3B-09C50BA35FA2} = {4D5C4349-480D-4CD6-9D3B-09C50BA35FA2} + EndProjectSection EndProject Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Install64", "gsview\Install64\Install64.vdproj", "{76633D68-1082-4040-B943-362B02811577}" + ProjectSection(ProjectDependencies) = postProject + {5DA0ECC9-4026-4427-862F-E3226EFEFEB1} = {5DA0ECC9-4026-4427-862F-E3226EFEFEB1} + {4468C2E0-6C90-4FA5-8A48-0A9629776167} = {4468C2E0-6C90-4FA5-8A48-0A9629776167} + EndProjectSection EndProject Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Install32", "gsview\Install32\Install32.vdproj", "{FA5C8A67-3783-4096-B2E8-34BCF88F07EB}" + ProjectSection(ProjectDependencies) = postProject + {5DA0ECC9-4026-4427-862F-E3226EFEFEB1} = {5DA0ECC9-4026-4427-862F-E3226EFEFEB1} + {4468C2E0-6C90-4FA5-8A48-0A9629776167} = {4468C2E0-6C90-4FA5-8A48-0A9629776167} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf", "libmupdf\libmupdf.vcxproj", "{4D5C4349-480D-4CD6-9D3B-09C50BA35FA2}" + ProjectSection(ProjectDependencies) = postProject + {A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libthirdparty", "libthirdparty\libthirdparty.vcxproj", "{DF87E242-8B2C-4F04-9A7E-61C578FD994C}" EndProject @@ -95,6 +111,7 @@ Global {A5053AA7-02E5-4903-B596-04F17AEB1526}.Debug|Win32.ActiveCfg = Debug|Win32 {A5053AA7-02E5-4903-B596-04F17AEB1526}.Debug|Win32.Build.0 = Debug|Win32 {A5053AA7-02E5-4903-B596-04F17AEB1526}.Debug|x64.ActiveCfg = Debug|Win32 + {A5053AA7-02E5-4903-B596-04F17AEB1526}.Debug|x64.Build.0 = Debug|Win32 {A5053AA7-02E5-4903-B596-04F17AEB1526}.Debug|x86.ActiveCfg = Debug|Win32 {A5053AA7-02E5-4903-B596-04F17AEB1526}.Debug|x86.Build.0 = Debug|Win32 {A5053AA7-02E5-4903-B596-04F17AEB1526}.DVD-5|Any CPU.ActiveCfg = Debug|Win32 @@ -123,6 +140,7 @@ Global {A5053AA7-02E5-4903-B596-04F17AEB1526}.Release|Win32.ActiveCfg = Release|Win32 {A5053AA7-02E5-4903-B596-04F17AEB1526}.Release|Win32.Build.0 = Release|Win32 {A5053AA7-02E5-4903-B596-04F17AEB1526}.Release|x64.ActiveCfg = Release|Win32 + {A5053AA7-02E5-4903-B596-04F17AEB1526}.Release|x64.Build.0 = Release|Win32 {A5053AA7-02E5-4903-B596-04F17AEB1526}.Release|x86.ActiveCfg = Release|Win32 {A5053AA7-02E5-4903-B596-04F17AEB1526}.Release|x86.Build.0 = Release|Win32 {A5053AA7-02E5-4903-B596-04F17AEB1526}.SingleImage|Any CPU.ActiveCfg = Release|Win32 @@ -443,7 +461,9 @@ Global {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.Debug|Win32.ActiveCfg = Debug|Any CPU + {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.Debug|Win32.Build.0 = Debug|Any CPU {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.Debug|x64.ActiveCfg = Debug|Any CPU + {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.Debug|x64.Build.0 = Debug|Any CPU {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.Debug|x86.ActiveCfg = Debug|Any CPU {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.DVD-5|Any CPU.Build.0 = Debug|Any CPU @@ -467,8 +487,11 @@ Global {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.Release|Mixed Platforms.Build.0 = Release|Any CPU {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.Release|Win32.ActiveCfg = Release|Any CPU + {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.Release|Win32.Build.0 = Release|Any CPU {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.Release|x64.ActiveCfg = Release|Any CPU + {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.Release|x64.Build.0 = Release|Any CPU {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.Release|x86.ActiveCfg = Release|Any CPU + {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.Release|x86.Build.0 = Release|Any CPU {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.SingleImage|Any CPU.Build.0 = Release|Any CPU {5DA0ECC9-4026-4427-862F-E3226EFEFEB1}.SingleImage|ARM.ActiveCfg = Release|Any CPU @@ -566,6 +589,7 @@ Global {76633D68-1082-4040-B943-362B02811577}.Release|Mixed Platforms.ActiveCfg = Release {76633D68-1082-4040-B943-362B02811577}.Release|Win32.ActiveCfg = Release {76633D68-1082-4040-B943-362B02811577}.Release|x64.ActiveCfg = Release + {76633D68-1082-4040-B943-362B02811577}.Release|x64.Build.0 = Release {76633D68-1082-4040-B943-362B02811577}.Release|x86.ActiveCfg = Release {76633D68-1082-4040-B943-362B02811577}.SingleImage|Any CPU.ActiveCfg = Release {76633D68-1082-4040-B943-362B02811577}.SingleImage|ARM.ActiveCfg = Release @@ -601,8 +625,10 @@ Global {FA5C8A67-3783-4096-B2E8-34BCF88F07EB}.Release|ARM.ActiveCfg = Release {FA5C8A67-3783-4096-B2E8-34BCF88F07EB}.Release|Mixed Platforms.ActiveCfg = Release {FA5C8A67-3783-4096-B2E8-34BCF88F07EB}.Release|Win32.ActiveCfg = Release + {FA5C8A67-3783-4096-B2E8-34BCF88F07EB}.Release|Win32.Build.0 = Release {FA5C8A67-3783-4096-B2E8-34BCF88F07EB}.Release|x64.ActiveCfg = Release {FA5C8A67-3783-4096-B2E8-34BCF88F07EB}.Release|x86.ActiveCfg = Release + {FA5C8A67-3783-4096-B2E8-34BCF88F07EB}.Release|x86.Build.0 = Release {FA5C8A67-3783-4096-B2E8-34BCF88F07EB}.SingleImage|Any CPU.ActiveCfg = Release {FA5C8A67-3783-4096-B2E8-34BCF88F07EB}.SingleImage|ARM.ActiveCfg = Release {FA5C8A67-3783-4096-B2E8-34BCF88F07EB}.SingleImage|Mixed Platforms.ActiveCfg = Release diff --git a/platform/winrt/mupdf_cpp/mupdf_cpp.vcxproj b/platform/winrt/mupdf_cpp/mupdf_cpp.vcxproj index a76e973a..aaeb56dc 100644 --- a/platform/winrt/mupdf_cpp/mupdf_cpp.vcxproj +++ b/platform/winrt/mupdf_cpp/mupdf_cpp.vcxproj @@ -178,7 +178,7 @@ <AdditionalIncludeDirectories>../../include/;../mupdfwinrt/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalDependencies>D3D11.lib;D2d1.lib;kernel32.lib;%(AdditionalDependencies);../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib;../$(Platform)/$(Configuration)/mupdfwinrt.lib</AdditionalDependencies> + <AdditionalDependencies>D3D11.lib;D2d1.lib;kernel32.lib;%(AdditionalDependencies);../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/mupdfwinrt.lib</AdditionalDependencies> <AdditionalOptions>/APPCONTAINER %(AdditionalOptions)</AdditionalOptions> </Link> </ItemDefinitionGroup> @@ -190,7 +190,7 @@ <PreprocessorDefinitions>_UNICODE;NDEBUG;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>D3D11.lib;D2d1.lib;kernel32.lib;%(AdditionalDependencies);../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib;../$(Platform)/$(Configuration)/mupdfwinrt.lib</AdditionalDependencies> + <AdditionalDependencies>D3D11.lib;D2d1.lib;kernel32.lib;%(AdditionalDependencies);../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/mupdfwinrt.lib</AdditionalDependencies> <SectionAlignment> </SectionAlignment> <AdditionalOptions>/APPCONTAINER %(AdditionalOptions)</AdditionalOptions> diff --git a/platform/winrt/mupdfwinrt/mupdfwinrt.vcxproj b/platform/winrt/mupdfwinrt/mupdfwinrt.vcxproj index d2f6ae88..444ea626 100644 --- a/platform/winrt/mupdfwinrt/mupdfwinrt.vcxproj +++ b/platform/winrt/mupdfwinrt/mupdfwinrt.vcxproj @@ -198,7 +198,7 @@ </ClCompile> <Link> <SubSystem>Console</SubSystem> - <AdditionalDependencies>runtimeobject.lib;../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib</AdditionalDependencies> + <AdditionalDependencies>runtimeobject.lib;../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib</AdditionalDependencies> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> </Link> </ItemDefinitionGroup> @@ -214,7 +214,7 @@ </ClCompile> <Link> <SubSystem>Console</SubSystem> - <AdditionalDependencies>runtimeobject.lib;../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib</AdditionalDependencies> + <AdditionalDependencies>runtimeobject.lib;../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib</AdditionalDependencies> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> </Link> </ItemDefinitionGroup> |