diff options
author | Robin Watts <robin.watts@artifex.com> | 2016-03-23 16:10:32 +0000 |
---|---|---|
committer | Robin Watts <robin.watts@artifex.com> | 2016-03-23 16:25:09 +0000 |
commit | 5f8ed8d0b32e8a59e3e33ae6ef67c8e9afd58bab (patch) | |
tree | 2d514528b903fde6accb7fd68c2fa0434a570246 /platform/win32/mupdf.sln | |
parent | ff349d7c4658e5aa274e0c11baad914a45970d6b (diff) | |
download | mupdf-5f8ed8d0b32e8a59e3e33ae6ef67c8e9afd58bab.tar.xz |
Fix MSVC builds.
Update generate.bat to generate generate/fontname.c files rather
than generate/fontname.{ttc,ttf,cff} etc.
Add a new libfonts target that builds those, and make libmupdf
depend on it.
Fix build problem in load-bmp.c - don't declare in the middle of
blocks.
Diffstat (limited to 'platform/win32/mupdf.sln')
-rw-r--r-- | platform/win32/mupdf.sln | 37 |
1 files changed, 29 insertions, 8 deletions
diff --git a/platform/win32/mupdf.sln b/platform/win32/mupdf.sln index 52b9ca05..88f7777c 100644 --- a/platform/win32/mupdf.sln +++ b/platform/win32/mupdf.sln @@ -3,27 +3,28 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf", "mupdf.vcproj", "{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}" ProjectSection(ProjectDependencies) = postProject - {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} + {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libthirdparty", "libthirdparty.vcproj", "{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf", "libmupdf.vcproj", "{5F615F91-DFF8-4F05-BF48-6222B7D86519}" ProjectSection(ProjectDependencies) = postProject + {52DCAB29-C8EE-4422-954C-29AFA6B33E22} = {52DCAB29-C8EE-4422-954C-29AFA6B33E22} {A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mudraw", "mudraw.vcproj", "{0B51171B-B10E-4EAC-8FFA-19226A1828A3}" ProjectSection(ProjectDependencies) = postProject - {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} + {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mutool", "mutool.vcproj", "{00811970-815B-4F64-BC9D-219078B1F3AA}" ProjectSection(ProjectDependencies) = postProject - {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} + {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generated", "generated.vcproj", "{A5053AA7-02E5-4903-B596-04F17AEB1526}" @@ -32,28 +33,33 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\..\thirdparty EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf-curl", "mupdf-curl.vcproj", "{27B53E5C-ACAB-423C-854E-BECE56D73544}" ProjectSection(ProjectDependencies) = postProject - {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mujstest", "mujstest.vcproj", "{21E28758-E4D2-4B84-8EC5-B631CEE66B30}" ProjectSection(ProjectDependencies) = postProject - {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} + {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglfw", "libglfw.vcproj", "{A1B75D29-9F5C-4A0F-B368-322A10477D0C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf-gl", "mupdf-gl.vcproj", "{CE3A76A8-A28F-4991-8FB9-C9453D922037}" ProjectSection(ProjectDependencies) = postProject - {A1B75D29-9F5C-4A0F-B368-322A10477D0C} = {A1B75D29-9F5C-4A0F-B368-322A10477D0C} - {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} + {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} + {A1B75D29-9F5C-4A0F-B368-322A10477D0C} = {A1B75D29-9F5C-4A0F-B368-322A10477D0C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jni", "jni.vcproj", "{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfonts", "libfonts.vcproj", "{52DCAB29-C8EE-4422-954C-29AFA6B33E22}" + ProjectSection(ProjectDependencies) = postProject + {A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -303,6 +309,21 @@ Global {05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32 {05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.ReleaseOpenssl|Win32.Build.0 = Release|Win32 {05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.ReleaseOpenssl|x64.ActiveCfg = Release|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|Win32.ActiveCfg = Debug|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|Win32.Build.0 = Debug|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|x64.ActiveCfg = Debug|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|Win32.Build.0 = Debug|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|x64.ActiveCfg = Debug|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Memento|Win32.ActiveCfg = Release|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Memento|Win32.Build.0 = Release|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Memento|x64.ActiveCfg = Release|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Release|Win32.ActiveCfg = Release|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Release|Win32.Build.0 = Release|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Release|x64.ActiveCfg = Release|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.ReleaseOpenssl|Win32.Build.0 = Release|Win32 + {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.ReleaseOpenssl|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE |