diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-09-10 11:47:42 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-10 11:47:42 -0300 |
| commit | 7a27d5d9e7db4a52b1c9dcac474f6478d3c17efa (patch) | |
| tree | 3b8abf061381d192728ca10d0a51a30e93dd6d89 /drivers/builtin_openssl2/SCsub | |
| parent | c2b70fdd6947c397cf0ad3fd9aa1cceacaeb1ba3 (diff) | |
| parent | 15458c8e6a4945ab27f9aa4ca31fd1eeef0e2cb7 (diff) | |
Merge pull request #6363 from vnen/winrt
Fix the support for WinRT/UWP
Diffstat (limited to 'drivers/builtin_openssl2/SCsub')
| -rw-r--r-- | drivers/builtin_openssl2/SCsub | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/builtin_openssl2/SCsub b/drivers/builtin_openssl2/SCsub index bd0f428cfc..a28bc2922c 100644 --- a/drivers/builtin_openssl2/SCsub +++ b/drivers/builtin_openssl2/SCsub @@ -642,6 +642,7 @@ openssl_sources = [ #env.drivers_sources+=openssl_sources +env.Append(CPPPATH=["#drivers/builtin_openssl2"]) env_drivers.Append(CPPPATH=["#drivers/builtin_openssl2/crypto"]) env_drivers.Append(CPPPATH=["#drivers/builtin_openssl2/openssl"]) env_drivers.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/evp"]) @@ -650,6 +651,9 @@ env_drivers.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/modes"]) #env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/store"]) env_drivers.Append(CPPFLAGS=["-DOPENSSL_NO_ASM","-DOPENSSL_THREADS","-DL_ENDIAN"]) +if "platform" in env and env["platform"] == "winrt": + openssl_sources += ['winrt.cpp'] + # Workaround for compilation error with GCC/Clang when -Werror is too greedy (GH-4517) import os if not (os.name=="nt" and os.getenv("VSINSTALLDIR")!=None): # not Windows and not MSVC |