fix build issue with ssl, closes #2384
This commit is contained in:
parent
4b40f9228b
commit
700fdf5c0c
2 changed files with 4 additions and 3 deletions
|
@ -220,14 +220,14 @@ if selected_platform in platform_list:
|
||||||
|
|
||||||
env.Append(LINKFLAGS=string.split(str(LINKFLAGS)))
|
env.Append(LINKFLAGS=string.split(str(LINKFLAGS)))
|
||||||
|
|
||||||
detect.configure(env)
|
|
||||||
|
|
||||||
|
|
||||||
flag_list = platform_flags[selected_platform]
|
flag_list = platform_flags[selected_platform]
|
||||||
for f in flag_list:
|
for f in flag_list:
|
||||||
if not (f[0] in ARGUMENTS): # allow command line to override platform flags
|
if not (f[0] in ARGUMENTS): # allow command line to override platform flags
|
||||||
env[f[0]] = f[1]
|
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']
|
#env['platform_libsuffix'] = env['LIBSUFFIX']
|
||||||
|
|
||||||
suffix="."+selected_platform
|
suffix="."+selected_platform
|
||||||
|
|
|
@ -126,6 +126,7 @@ def configure(env):
|
||||||
env.ParseConfig('pkg-config x11 --cflags --libs')
|
env.ParseConfig('pkg-config x11 --cflags --libs')
|
||||||
env.ParseConfig('pkg-config xinerama --cflags --libs')
|
env.ParseConfig('pkg-config xinerama --cflags --libs')
|
||||||
env.ParseConfig('pkg-config xcursor --cflags --libs')
|
env.ParseConfig('pkg-config xcursor --cflags --libs')
|
||||||
|
|
||||||
if (env["openssl"]=="yes"):
|
if (env["openssl"]=="yes"):
|
||||||
env.ParseConfig('pkg-config openssl --cflags --libs')
|
env.ParseConfig('pkg-config openssl --cflags --libs')
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue