diff options
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 19c5d8ce8a..de7256f6bc 100644 --- a/SConstruct +++ b/SConstruct @@ -205,8 +205,9 @@ for p in platform_list: flag_list = platform_flags[p] for f in flag_list: - env[f[0]] = f[1] - print(f[0]+":"+f[1]) + if not (f[0] in ARGUMENTS): # allow command line to override platform flags + env[f[0]] = f[1] + print(f[0]+":"+f[1]) env.module_list=[] @@ -229,7 +230,7 @@ for p in platform_list: if (env['openssl']!='no'): env.Append(CPPFLAGS=['-DOPENSSL_ENABLED']); if (env['openssl']=="builtin"): - env.Append(CPPPATH=['#drivers/builtin_openssl']) + env.Append(CPPPATH=['#drivers/builtin_openssl2']) if (env["old_scenes"]=='yes'): |