diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-12 23:06:17 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-15 11:50:41 +0200 |
| commit | 422196759f93df249db38619f136cabd5dcf42cd (patch) | |
| tree | 1e5846507af0f8f1bc7ca294ccfb0d4ac3392d17 /SConstruct | |
| parent | d9a291f6411f2e571c181da0ac89f550ba73f681 (diff) | |
openssl: Move to a module and split thirdparty lib
Same rationale as the previous commits.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/SConstruct b/SConstruct index 2c92078ae7..e52e224de7 100644 --- a/SConstruct +++ b/SConstruct @@ -131,7 +131,7 @@ opts.Add('xml','XML Save/Load support (yes/no)','yes') opts.Add('libpng','libpng library for image loader support (system/builtin)','builtin') opts.Add('libwebp','libwebp library for webp module (system/builtin)','builtin') opts.Add('builtin_zlib','Use built-in zlib (yes/no)','yes') -opts.Add('openssl','Use OpenSSL (yes/no/builtin)','no') +opts.Add('openssl','OpenSSL library for openssl module (system/builtin)','builtin') opts.Add('musepack','Musepack Audio (yes/no)','yes') opts.Add('enet','ENet library (system/builtin)','builtin') opts.Add("CXX", "C++ Compiler") @@ -322,11 +322,6 @@ if selected_platform in platform_list: if (env['musepack']=='yes'): env.Append(CPPFLAGS=['-DMUSEPACK_ENABLED']); - #if (env['openssl']!='no'): - # env.Append(CPPFLAGS=['-DOPENSSL_ENABLED']); - # if (env['openssl']=="builtin"): - # env.Append(CPPPATH=['#drivers/builtin_openssl2']) - if (env["builtin_zlib"]=='yes'): env.Append(CPPPATH=['#drivers/builtin_zlib/zlib']) |