diff options
| author | Tillmann Karras <tilkax@gmail.com> | 2015-09-24 01:03:08 +0200 |
|---|---|---|
| committer | Tillmann Karras <tilkax@gmail.com> | 2015-09-25 03:46:41 +0200 |
| commit | ac5f56df7edc58eae3f00a61b6bef3096a0575bc (patch) | |
| tree | b979f10c7b170d8fa1f50a797f397f7ac446ab6f /Source | |
| parent | f70da0e889ed422b66c02f88c7d956f22364004f (diff) | |
mbedTLS: adapt Dolphin's Visual Studio files
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Common/Common.vcxproj | 2 | ||||
| -rw-r--r-- | Source/Core/Core/Core.vcxproj | 2 | ||||
| -rw-r--r-- | Source/Core/DiscIO/DiscIO.vcxproj | 4 | ||||
| -rw-r--r-- | Source/VSProps/Base.props | 2 | ||||
| -rw-r--r-- | Source/VSProps/QtCompile.props | 2 | ||||
| -rw-r--r-- | Source/dolphin-emu.sln | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index fe95d75289..055a86c0f6 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -177,7 +177,7 @@ <ProjectReference Include="$(ExternalsDir)enet\enet.vcxproj"> <Project>{cbc76802-c128-4b17-bf6c-23b08c313e5e}</Project> </ProjectReference> - <ProjectReference Include="$(ExternalsDir)polarssl\visualc\PolarSSL.vcxproj"> + <ProjectReference Include="$(ExternalsDir)mbedtls\mbedTLS.vcxproj"> <Project>{bdb6578b-0691-4e80-a46c-df21639fd3b8}</Project> </ProjectReference> <ProjectReference Include="SCMRevGen.vcxproj"> diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index e6d9c3851d..5e54a4fab7 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -453,7 +453,7 @@ <ProjectReference Include="$(ExternalsDir)miniupnpc\miniupnpc.vcxproj"> <Project>{31643fdb-1bb8-4965-9de7-000fc88d35ae}</Project> </ProjectReference> - <ProjectReference Include="$(ExternalsDir)polarssl\visualc\PolarSSL.vcxproj"> + <ProjectReference Include="$(ExternalsDir)mbedtls\mbedTLS.vcxproj"> <Project>{bdb6578b-0691-4e80-a46c-df21639fd3b8}</Project> </ProjectReference> <ProjectReference Include="$(ExternalsDir)portaudio\build\portaudio.vcxproj"> diff --git a/Source/Core/DiscIO/DiscIO.vcxproj b/Source/Core/DiscIO/DiscIO.vcxproj index 3250c37531..2927bc4781 100644 --- a/Source/Core/DiscIO/DiscIO.vcxproj +++ b/Source/Core/DiscIO/DiscIO.vcxproj @@ -78,7 +78,7 @@ <Text Include="CMakeLists.txt" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(ExternalsDir)polarssl\visualc\PolarSSL.vcxproj"> + <ProjectReference Include="$(ExternalsDir)mbedtls\mbedTLS.vcxproj"> <Project>{bdb6578b-0691-4e80-a46c-df21639fd3b8}</Project> </ProjectReference> <ProjectReference Include="$(ExternalsDir)zlib\zlib.vcxproj"> @@ -91,4 +91,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props index 4730347a86..86ad26a5ad 100644 --- a/Source/VSProps/Base.props +++ b/Source/VSProps/Base.props @@ -41,7 +41,7 @@ <AdditionalIncludeDirectories>$(ExternalsDir)libusb\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ExternalsDir)LZO;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ExternalsDir)miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <AdditionalIncludeDirectories>$(ExternalsDir)polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ExternalsDir)mbedtls\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ExternalsDir)portaudio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ExternalsDir)SFML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ExternalsDir)SOIL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> diff --git a/Source/VSProps/QtCompile.props b/Source/VSProps/QtCompile.props index 9a21863036..21026de600 100644 --- a/Source/VSProps/QtCompile.props +++ b/Source/VSProps/QtCompile.props @@ -89,7 +89,7 @@ in order to prevent the trailing slash from escaping the doublequote after value replacement. --> <MocIncludes>"-I$(QtIncludeDir)QtWidgets" "-I$(QtIncludeDir)QtGui" "-I$(QtIncludeDir)QtCore" "-I$(QtIncludeDir) " "-I$(QtToolOutDir) " -I.</MocIncludes> - <MocIncludes>"-I$(ExternalsDir)xxhash" "-I$(ExternalsDir)zlib" "-I$(ExternalsDir)SOIL" "-I$(ExternalsDir)SFML\include" "-I$(ExternalsDir)portaudio\include" "-I$(ExternalsDir)polarssl\include" "-I$(ExternalsDir)miniupnpc\src" "-I$(ExternalsDir)LZO" "-I$(ExternalsDir)libusbx\libusb" "-I$(ExternalsDir)libpng" "-I$(ExternalsDir)GL" "-I$(ExternalsDir)Bochs_disasm" "-I$(ExternalsDir) " "-I$(CoreDir) " $(MocIncludes)</MocIncludes> + <MocIncludes>"-I$(ExternalsDir)xxhash" "-I$(ExternalsDir)zlib" "-I$(ExternalsDir)SOIL" "-I$(ExternalsDir)SFML\include" "-I$(ExternalsDir)portaudio\include" "-I$(ExternalsDir)mbedtls\include" "-I$(ExternalsDir)miniupnpc\src" "-I$(ExternalsDir)LZO" "-I$(ExternalsDir)libusbx\libusb" "-I$(ExternalsDir)libpng" "-I$(ExternalsDir)GL" "-I$(ExternalsDir)Bochs_disasm" "-I$(ExternalsDir) " "-I$(CoreDir) " $(MocIncludes)</MocIncludes> </PropertyGroup> <Target Name="QtMoc" BeforeTargets="ClCompile" diff --git a/Source/dolphin-emu.sln b/Source/dolphin-emu.sln index b76f08f3e9..f80da90dc2 100644 --- a/Source/dolphin-emu.sln +++ b/Source/dolphin-emu.sln @@ -45,7 +45,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "..\Externals\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxWidgets", "..\Externals\wxWidgets3\build\msw\wx_base.vcxproj", "{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PolarSSL", "..\Externals\polarssl\visualc\PolarSSL.vcxproj", "{BDB6578B-0691-4E80-A46C-DF21639FD3B8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbedTLS", "..\Externals\mbedtls\mbedTLS.vcxproj", "{BDB6578B-0691-4E80-A46C-DF21639FD3B8}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SCMRevGen", "Core\Common\SCMRevGen.vcxproj", "{41279555-F94F-4EBC-99DE-AF863C10C5C4}" EndProject |
