From bcd5d1c9ed084dec77b9801938016791bd4aa38d Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Fri, 6 May 2005 13:37:18 +0000 Subject: * integrate bFTGL with Scons * add some ENV = os.environ's here and there (help those who have msvc toolkit installed) Note for OSX users: check from your config.opts the correct info for the precompiled ftgl lib is used. --- tools/scons/bs/bs_libs.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/scons/bs/bs_libs.py b/tools/scons/bs/bs_libs.py index 3783b926dfb..aa6b3996723 100644 --- a/tools/scons/bs/bs_libs.py +++ b/tools/scons/bs/bs_libs.py @@ -41,8 +41,11 @@ def international_libs(env): env.Append (LIBS=bs_globals.user_options_dict['FREETYPE_LIBRARY']) env.Append (LIBPATH=bs_globals.user_options_dict['FREETYPE_LIBPATH']) env.Append (LIBS=['blender_FTF']) - env.Append (LIBS=bs_globals.user_options_dict['FTGL_LIBRARY']) - env.Append (LIBPATH=bs_globals.user_options_dict['FTGL_LIBPATH']) + if sys.platform=='darwin': + env.Append (LIBS=bs_globals.user_options_dict['FTGL_LIBRARY']) + env.Append (LIBPATH=bs_globals.user_options_dict['FTGL_LIBPATH']) + else: + env.Append (LIBS=['extern_ftgl']) env.Append (LIBS=bs_globals.user_options_dict['FREETYPE_LIBRARY']) def blender_libs(env): -- cgit v1.2.3