summaryrefslogtreecommitdiff
path: root/drivers/SCsub
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/SCsub')
-rw-r--r--drivers/SCsub15
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");