dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

make sure iconv exists

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5902 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2009-01-10 22:51:43 +00:00
parent af046c0116
commit c88bf59a8d
2 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Contrib/Library/LibraryLocal/SConscript
View file

@ -19,7 +19,7 @@ libs_posix = Split("""
iconv iconv
""") """)
Import('BuildUtil BuildUtilEnv') Import('BuildUtil BuildUtilEnv GetAvailableLibs')
env = BuildUtilEnv(flags = ['$EXCEPTION_FLAG'], cross_platform = True) env = BuildUtilEnv(flags = ['$EXCEPTION_FLAG'], cross_platform = True)
@ -32,6 +32,6 @@ for s in required_files:
files.append(o) files.append(o)
if env['PLATFORM'] != 'win32': if env['PLATFORM'] != 'win32':
libs = libs_posix libs = GetAvailableLibs(env, libs_posix)
BuildUtil(target, files, libs, flags = ['$EXCEPTION_FLAG'], cross_platform = True) BuildUtil(target, files, libs, flags = ['$EXCEPTION_FLAG'], cross_platform = True)

18
SCons/utils.py
View file

@ -10,6 +10,22 @@ def AddAvailableLibs(env, libs):
conf.Finish() conf.Finish()
"""
Scans through a list list of libraries and adds
available libraries to the environment.
"""
def GetAvailableLibs(env, libs):
conf = env.Configure()
avail_libs = []
for lib in libs:
if conf.CheckLib(lib):
avail_libs.append(lib)
conf.Finish()
return avail_libs
""" """
Checks if a compiler flag is valid. Checks if a compiler flag is valid.
""" """
@ -71,4 +87,4 @@ Wrapper for env.Configure which adds two new tests:
def FlagsConfigure(env): def FlagsConfigure(env):
return env.Configure(custom_tests = { 'CheckCompileFlag' : check_compile_flag, 'CheckLinkFlag': check_link_flag }) return env.Configure(custom_tests = { 'CheckCompileFlag' : check_compile_flag, 'CheckLinkFlag': check_link_flag })
Export('AddAvailableLibs FlagsConfigure') Export('AddAvailableLibs FlagsConfigure GetAvailableLibs')