diff options
Diffstat (limited to 'platform/win32')
-rw-r--r-- | platform/win32/libmupdf.vcproj | 22 | ||||
-rw-r--r-- | platform/win32/libpkcs7.vcproj | 2 | ||||
-rw-r--r-- | platform/win32/libthirdparty.vcproj | 4 | ||||
-rw-r--r-- | platform/win32/mupdf.sln | 24 |
4 files changed, 35 insertions, 17 deletions
diff --git a/platform/win32/libmupdf.vcproj b/platform/win32/libmupdf.vcproj index d920c995..b1fffcc4 100644 --- a/platform/win32/libmupdf.vcproj +++ b/platform/win32/libmupdf.vcproj @@ -61,6 +61,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -123,6 +124,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -186,6 +188,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -249,6 +252,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -311,6 +315,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -374,6 +379,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -436,6 +442,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -499,6 +506,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -561,6 +569,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -624,6 +633,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -686,6 +696,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -749,6 +760,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -812,6 +824,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -875,6 +888,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -937,6 +951,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -1000,6 +1015,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -1062,6 +1078,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -1125,6 +1142,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -1188,6 +1206,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -1251,6 +1270,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -1313,6 +1333,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" @@ -1376,6 +1397,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="true" /> <Tool Name="VCALinkTool" diff --git a/platform/win32/libpkcs7.vcproj b/platform/win32/libpkcs7.vcproj index 9ad46288..4d99870f 100644 --- a/platform/win32/libpkcs7.vcproj +++ b/platform/win32/libpkcs7.vcproj @@ -843,6 +843,7 @@ </FileConfiguration> <FileConfiguration Name="Memento|x64" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -857,7 +858,6 @@ </FileConfiguration> <FileConfiguration Name="MementoOpenSSL|x64" - ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" diff --git a/platform/win32/libthirdparty.vcproj b/platform/win32/libthirdparty.vcproj index 0d15478d..cffc0ca1 100644 --- a/platform/win32/libthirdparty.vcproj +++ b/platform/win32/libthirdparty.vcproj @@ -752,10 +752,6 @@ > </File> <File - RelativePath="..\..\thirdparty\libjpeg\jmemnobs.c" - > - </File> - <File RelativePath="..\..\thirdparty\libjpeg\jquant1.c" > </File> diff --git a/platform/win32/mupdf.sln b/platform/win32/mupdf.sln index a3b7c82e..47807a14 100644 --- a/platform/win32/mupdf.sln +++ b/platform/win32/mupdf.sln @@ -10,16 +10,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libthirdparty", "libthirdpa 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} - {22462382-B30D-42A5-BF07-EE1A35E25D21} = {22462382-B30D-42A5-BF07-EE1A35E25D21} - {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} {B0091365-C9BA-4F40-AE2B-EF93702871B2} = {B0091365-C9BA-4F40-AE2B-EF93702871B2} + {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} + {22462382-B30D-42A5-BF07-EE1A35E25D21} = {22462382-B30D-42A5-BF07-EE1A35E25D21} + {52DCAB29-C8EE-4422-954C-29AFA6B33E22} = {52DCAB29-C8EE-4422-954C-29AFA6B33E22} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mudraw", "mudraw.vcproj", "{0B51171B-B10E-4EAC-8FFA-19226A1828A3}" ProjectSection(ProjectDependencies) = postProject - {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} = {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} + {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mutool", "mutool.vcproj", "{00811970-815B-4F64-BC9D-219078B1F3AA}" @@ -31,8 +31,8 @@ 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 - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mujstest", "mujstest.vcproj", "{21E28758-E4D2-4B84-8EC5-B631CEE66B30}" @@ -44,8 +44,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfreeglut", "libfreeglut. EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf-gl", "mupdf-gl.vcproj", "{CE3A76A8-A28F-4991-8FB9-C9453D922037}" ProjectSection(ProjectDependencies) = postProject - {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} {A1B75D29-9F5C-4A0F-B368-322A10477D0C} = {A1B75D29-9F5C-4A0F-B368-322A10477D0C} + {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresources", "libresources.vcproj", "{52DCAB29-C8EE-4422-954C-29AFA6B33E22}" @@ -55,9 +55,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresources", "libresource EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "muraster", "muraster.vcproj", "{0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}" ProjectSection(ProjectDependencies) = postProject - {52DCAB29-C8EE-4422-954C-29AFA6B33E22} = {52DCAB29-C8EE-4422-954C-29AFA6B33E22} - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} = {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} = {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} + {52DCAB29-C8EE-4422-954C-29AFA6B33E22} = {52DCAB29-C8EE-4422-954C-29AFA6B33E22} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "javaviewerlib", "javaviewerlib.vcproj", "{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}" @@ -67,9 +67,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "javaviewerlib", "javaviewer EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "javaviewer", "javaviewer.vcproj", "{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}" ProjectSection(ProjectDependencies) = postProject - {52DCAB29-C8EE-4422-954C-29AFA6B33E22} = {52DCAB29-C8EE-4422-954C-29AFA6B33E22} - {3DB35F2D-9679-4DED-BA0C-240A4E6E6674} = {3DB35F2D-9679-4DED-BA0C-240A4E6E6674} {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} + {3DB35F2D-9679-4DED-BA0C-240A4E6E6674} = {3DB35F2D-9679-4DED-BA0C-240A4E6E6674} + {52DCAB29-C8EE-4422-954C-29AFA6B33E22} = {52DCAB29-C8EE-4422-954C-29AFA6B33E22} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluratech", "libluratech.vcproj", "{B0091365-C9BA-4F40-AE2B-EF93702871B2}" @@ -78,8 +78,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmuthreads", "libmuthread EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mu-office-lib", "mu-office-lib.vcproj", "{FFF91365-C9BA-4F40-AE2B-EF93702871B2}" ProjectSection(ProjectDependencies) = postProject - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} = {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} = {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mu-office-test", "mu-office-test.vcproj", "{FB51171B-B10E-4EAC-8FFA-19226A1828A3}" @@ -89,8 +89,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mu-office-test", "mu-office EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmutool", "libmutool.vcproj", "{FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}" ProjectSection(ProjectDependencies) = postProject - {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} = {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} + {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} = {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpkcs7", "libpkcs7.vcproj", "{22462382-B30D-42A5-BF07-EE1A35E25D21}" |