From b81cf0145641b03116a83052fed71ee0625ce638 Mon Sep 17 00:00:00 2001 From: DHrpcs3 Date: Sat, 26 Mar 2016 00:14:03 +0300 Subject: [PATCH] Fixed build for MSVC --- rpcs3.sln | 4 ++-- zlib.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rpcs3.sln b/rpcs3.sln index 1c84b1e4e3..180ae13212 100644 --- a/rpcs3.sln +++ b/rpcs3.sln @@ -200,14 +200,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenAL", "rpcs3\OpenAL.vcxp EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libpng", "libpng", "{A17D34F1-7E3E-4841-818D-3B7C6F5AF829}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng\projects\vstudio\libpng\libpng.vcxproj", "{D6973076-9317-4EF2-A0B8-B7A18AC0713E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "3rdparty\libpng\projects\vstudio\libpng\libpng.vcxproj", "{D6973076-9317-4EF2-A0B8-B7A18AC0713E}" ProjectSection(ProjectDependencies) = postProject {60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "zlib", "zlib", "{F0C19EFA-EDD0-43F2-97C1-18E865E96B4E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "libpng\projects\vstudio\zlib\zlib.vcxproj", "{60F89955-91C6-3A36-8000-13C592FEC2DF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rdparty\libpng\projects\vstudio\zlib\zlib.vcxproj", "{60F89955-91C6-3A36-8000-13C592FEC2DF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Vulkan", "Vulkan", "{09AD61F7-97FE-4FF8-8F7F-63FEA9B746F4}" EndProject diff --git a/zlib.props b/zlib.props index 653d7897ce..6957ff5f01 100644 --- a/zlib.props +++ b/zlib.props @@ -32,7 +32,7 @@ versions do not match. The zlib version used in this build is recorded below: --> - ..\..\..\..\wxWidgets\src\zlib\ + $(SolutionDir)wxWidgets\src\zlib\