diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2015-10-03 18:00:58 -0700 |
|---|---|---|
| committer | shuffle2 <godisgovernment@gmail.com> | 2015-10-03 18:00:58 -0700 |
| commit | a6f04b0e15af9ce261cc5bb190eb60a2bbaee804 (patch) | |
| tree | 233f28f1b4df9566667013f47c5e9a09920626e9 /Source/VSProps | |
| parent | 8bb35c85887eaef35ddcb7dfaae394f7d1165fe1 (diff) | |
| parent | f6795466e767ee11e3f2c7d93c8f51abeabd29af (diff) | |
Merge pull request #3091 from Tilka/mbedtls
Update mbed TLS (PolarSSL)
Diffstat (limited to 'Source/VSProps')
| -rw-r--r-- | Source/VSProps/Base.props | 2 | ||||
| -rw-r--r-- | Source/VSProps/QtCompile.props | 2 |
2 files changed, 2 insertions, 2 deletions
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 3b602c0a5d..3d72766eb6 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" |