diff options
| author | Ariel Manzur <ariel@godotengine.org> | 2016-05-06 22:43:22 -0300 |
|---|---|---|
| committer | Ariel Manzur <ariel@godotengine.org> | 2016-05-06 22:43:22 -0300 |
| commit | baaa74f2153403044ab7570b920bc01317f8a047 (patch) | |
| tree | a4647b5a7cfc3e549aeba6e0ccefdb2dffa855b4 /drivers/builtin_openssl2 | |
| parent | 62c17d65a8ad808bb712e64df2f16ecfb193c9be (diff) | |
cloning env for builtin_openssl _and_ openssl :)
Diffstat (limited to 'drivers/builtin_openssl2')
| -rw-r--r-- | drivers/builtin_openssl2/SCsub | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/builtin_openssl2/SCsub b/drivers/builtin_openssl2/SCsub index 8c24a5a9c2..38880030b1 100644 --- a/drivers/builtin_openssl2/SCsub +++ b/drivers/builtin_openssl2/SCsub @@ -1,4 +1,5 @@ Import('env') +Import('env_ssl') openssl_sources = [ "nocpuid.c", @@ -642,17 +643,14 @@ openssl_sources = [ #env.drivers_sources+=openssl_sources -env_bossl = env.Clone() +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_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/store"]) +env_ssl.Append(CPPFLAGS=["-DOPENSSL_NO_ASM","-DOPENSSL_THREADS","-DL_ENDIAN"]) -env_bossl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto"]) -env_bossl.Append(CPPPATH=["#drivers/builtin_openssl2/openssl"]) -env_bossl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/evp"]) -env_bossl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/asn1"]) -env_bossl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/modes"]) -#env_bossl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/store"]) -env_bossl.Append(CPPFLAGS=["-DOPENSSL_NO_ASM","-DOPENSSL_THREADS","-DL_ENDIAN"]) +env_ssl.add_source_files(env.drivers_sources,openssl_sources) -env_bossl.add_source_files(env.drivers_sources,openssl_sources) - -Export('env_bossl') |