From 473ecaee2c94aa04ef1a50ce853837e521f804b8 Mon Sep 17 00:00:00 2001 From: Robin Watts Date: Mon, 11 Jun 2018 12:52:05 +0100 Subject: MSVC solution fixes. Having libluratech set to not build in non-commercial builds is not enough to make stuff work, as the dependencies will still try to link it in. Instead, we now have a Release configuration for libluratech with every file disabled, and the non-commercial builds depend on that. Also, tweak bin2coff build to put it's buildlog in the usual place. --- platform/win32/bin2coff.vcproj | 2 +- platform/win32/libluratech.vcproj | 2552 +++++++++++++++++++++++++++++++++++++ platform/win32/mupdf.sln | 21 +- 3 files changed, 2567 insertions(+), 8 deletions(-) diff --git a/platform/win32/bin2coff.vcproj b/platform/win32/bin2coff.vcproj index badcde97..90c9d8dd 100644 --- a/platform/win32/bin2coff.vcproj +++ b/platform/win32/bin2coff.vcproj @@ -18,7 +18,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -409,498 +529,1490 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1094,542 +2566,1622 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/win32/mupdf.sln b/platform/win32/mupdf.sln index 2b45451e..0cd8ac76 100644 --- a/platform/win32/mupdf.sln +++ b/platform/win32/mupdf.sln @@ -575,33 +575,40 @@ Global {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.ReleaseJava|x64.ActiveCfg = ReleaseJava|Win32 {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseJava|Win32 {FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.ReleaseOpenssl|x64.ActiveCfg = ReleaseJava|Win32 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Debug|Win32.ActiveCfg = DebugCommercial|Win32 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Debug|Win32.ActiveCfg = Release|Win32 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Debug|Win32.Build.0 = Release|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Debug|x64.ActiveCfg = DebugCommercial|x64 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugCommercial|Win32.ActiveCfg = DebugCommercial|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugCommercial|Win32.Build.0 = DebugCommercial|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugCommercial|x64.ActiveCfg = DebugCommercial|x64 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugCommercial|x64.Build.0 = DebugCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugJava|Win32.ActiveCfg = DebugCommercial|Win32 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugJava|Win32.ActiveCfg = Release|Win32 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugJava|Win32.Build.0 = Release|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugJava|x64.ActiveCfg = DebugCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugOpenssl|Win32.ActiveCfg = DebugCommercial|Win32 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugOpenssl|Win32.ActiveCfg = Release|Win32 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugOpenssl|Win32.Build.0 = Release|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.DebugOpenssl|x64.ActiveCfg = DebugCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Memento|Win32.ActiveCfg = MementoCommercial|Win32 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Memento|Win32.ActiveCfg = Release|Win32 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Memento|Win32.Build.0 = Release|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Memento|x64.ActiveCfg = MementoCommercial|x64 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Memento|x64.Build.0 = MementoCommercial|x64 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.MementoCommercial|Win32.ActiveCfg = MementoCommercial|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.MementoCommercial|Win32.Build.0 = MementoCommercial|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.MementoCommercial|x64.ActiveCfg = MementoCommercial|x64 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.MementoCommercial|x64.Build.0 = MementoCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Release|Win32.ActiveCfg = ReleaseCommercial|Win32 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Release|Win32.ActiveCfg = Release|Win32 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Release|Win32.Build.0 = Release|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Release|x64.ActiveCfg = ReleaseCommercial|x64 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.Release|x64.Build.0 = ReleaseCommercial|x64 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseCommercial|Win32.ActiveCfg = ReleaseCommercial|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseCommercial|Win32.Build.0 = ReleaseCommercial|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseCommercial|x64.ActiveCfg = ReleaseCommercial|x64 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseCommercial|x64.Build.0 = ReleaseCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseJava|Win32.ActiveCfg = ReleaseCommercial|Win32 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseJava|Win32.ActiveCfg = Release|Win32 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseJava|Win32.Build.0 = Release|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseJava|x64.ActiveCfg = ReleaseCommercial|x64 - {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseCommercial|Win32 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32 + {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseOpenssl|Win32.Build.0 = Release|Win32 {B0091365-C9BA-4F40-AE2B-EF93702871B2}.ReleaseOpenssl|x64.ActiveCfg = ReleaseCommercial|x64 {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.Debug|Win32.ActiveCfg = Debug|Win32 {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}.Debug|Win32.Build.0 = Debug|Win32 -- cgit v1.2.3