diff options
| author | Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> | 2015-08-24 21:33:00 -0300 |
|---|---|---|
| committer | Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> | 2015-08-24 21:33:00 -0300 |
| commit | 54291c655db3346aedb875b3c375c0f759d90043 (patch) | |
| tree | a188d763d25ceb0b1d12590f1f6f71633c4a79c7 /SConstruct | |
| parent | 3a83337420c3e6c7e5f3a52cee49aa2eb17cab2d (diff) | |
| parent | 0d77277a860f56b5f596c3d930ec2209cee95517 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 9cd1da7f45..9cce6edd81 100644 --- a/SConstruct +++ b/SConstruct @@ -220,14 +220,14 @@ if selected_platform in platform_list: env.Append(LINKFLAGS=string.split(str(LINKFLAGS))) - detect.configure(env) - - flag_list = platform_flags[selected_platform] for f in flag_list: if not (f[0] in ARGUMENTS): # allow command line to override platform flags env[f[0]] = f[1] + #must happen after the flags, so when flags are used by configure, stuff happens (ie, ssl on x11) + detect.configure(env) + #env['platform_libsuffix'] = env['LIBSUFFIX'] suffix="."+selected_platform |