diff options
| author | Ariel Manzur <ariel@godotengine.org> | 2016-05-21 19:31:58 -0300 |
|---|---|---|
| committer | Ariel Manzur <ariel@godotengine.org> | 2016-05-21 19:31:58 -0300 |
| commit | 6cf2353305922f3464ff91ae1b137e747e1d2961 (patch) | |
| tree | 02eda3ddd260691867ad70ccac5b7f91e289ca7f /drivers/builtin_openssl2 | |
| parent | 87e8e8d37298a126214679dfdbe3ef7db3543fd5 (diff) | |
using 1 env for all drivers
Diffstat (limited to 'drivers/builtin_openssl2')
| -rw-r--r-- | drivers/builtin_openssl2/SCsub | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/builtin_openssl2/SCsub b/drivers/builtin_openssl2/SCsub index 06d6b07c11..13a844c39a 100644 --- a/drivers/builtin_openssl2/SCsub +++ b/drivers/builtin_openssl2/SCsub @@ -1,5 +1,4 @@ Import('env') -Import('env_ssl') openssl_sources = [ "ssl/t1_lib.c", @@ -642,17 +641,17 @@ openssl_sources = [ #env.drivers_sources+=openssl_sources -env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto"]) -env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/openssl"]) -env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/evp"]) -env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/asn1"]) -env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/modes"]) +env.Append(CPPPATH=["#drivers/builtin_openssl2/crypto"]) +env.Append(CPPPATH=["#drivers/builtin_openssl2/openssl"]) +env.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/evp"]) +env.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/asn1"]) +env.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/modes"]) #env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/store"]) -env_ssl.Append(CPPFLAGS=["-DOPENSSL_NO_ASM","-DOPENSSL_THREADS","-DL_ENDIAN"]) +env.Append(CPPFLAGS=["-DOPENSSL_NO_ASM","-DOPENSSL_THREADS","-DL_ENDIAN"]) # 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 - env_ssl.Append(CFLAGS=["-Wno-error=implicit-function-declaration"]) + env.Append(CFLAGS=["-Wno-error=implicit-function-declaration"]) -env_ssl.add_source_files(env.drivers_sources,openssl_sources) +env.add_source_files(env.drivers_sources,openssl_sources) |