From 54062c79b9ffd99ce193e5fe110f367cc6e75bc2 Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 24 Sep 2005 15:49:38 +0000 Subject: [PATCH] use AddAvailableLibs git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4290 212acab6-be3b-0410-9dea-997c60f758d6 --- SConstruct | 6 ++++++ Source/SConscript | 11 +++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/SConstruct b/SConstruct index 0b251c76..a59171cf 100644 --- a/SConstruct +++ b/SConstruct @@ -54,6 +54,12 @@ misc = [ defenv = Environment() Export('defenv') +###################################################################### +####### Includes ### +###################################################################### + +SConscript('SCons/utils.py') + ###################################################################### ####### Options ### ###################################################################### diff --git a/Source/SConscript b/Source/SConscript index 3706a4a0..54071757 100644 --- a/Source/SConscript +++ b/Source/SConscript @@ -54,16 +54,11 @@ libs = Split(""" iconv """) -Import('env') +Import('env AddAvailableLibs') -##### Configure +##### Use available libraries -conf = env.Configure() - -for lib in libs: - conf.CheckLib(lib) - -conf.Finish() +AddAvailableLibs(env, libs) ##### Configuration defines