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/SCsub | |
| parent | 62c17d65a8ad808bb712e64df2f16ecfb193c9be (diff) | |
cloning env for builtin_openssl _and_ openssl :)
Diffstat (limited to 'drivers/SCsub')
| -rw-r--r-- | drivers/SCsub | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/SCsub b/drivers/SCsub index 701738c9f8..63f37698fb 100644 --- a/drivers/SCsub +++ b/drivers/SCsub @@ -11,9 +11,20 @@ SConscript('pulseaudio/SCsub'); SConscript('windows/SCsub'); SConscript('gles2/SCsub'); SConscript('gl_context/SCsub'); -SConscript('openssl/SCsub'); SConscript('pnm/SCsub'); +if (env['openssl']!='no'): + env_ssl = env.Clone() + Export('env_ssl') + + env_ssl.Append(CPPFLAGS=['-DOPENSSL_ENABLED']); + if (env['openssl']=="builtin"): + env_ssl.Append(CPPPATH=['#drivers/builtin_openssl2']) + SConscript("builtin_openssl2/SCsub"); + + SConscript('openssl/SCsub') + + if (env["png"]=="yes"): SConscript("png/SCsub"); if (env["jpg"]=="yes"): @@ -26,8 +37,6 @@ SConscript("pvr/SCsub"); SConscript("etc1/SCsub") if (env["builtin_zlib"]=="yes"): SConscript("builtin_zlib/SCsub"); -if (env["openssl"]=="builtin"): - SConscript("builtin_openssl2/SCsub"); SConscript("rtaudio/SCsub"); SConscript("nedmalloc/SCsub"); |