From a462d69bbf771e49d2fa49589608c375376b42ed Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Thu, 20 Dec 2012 07:57:26 +0000 Subject: Another big patch set by Bastien Montagne, thanks a lot! * Made Freestyle optional (turned on by default). * Fix for missing bpath.c updates in the previous merge of trunk changes. --- SConstruct | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index 4630b7b8c87..0a91de4e410 100644 --- a/SConstruct +++ b/SConstruct @@ -269,6 +269,7 @@ if 'blenderlite' in B.targets: target_env_defs['WITH_BF_PYTHON'] = False target_env_defs['WITH_BF_3DMOUSE'] = False target_env_defs['WITH_BF_LIBMV'] = False + target_env_defs['WITH_BF_FREESTYLE'] = False # Merge blenderlite, let command line to override for k,v in target_env_defs.iteritems(): @@ -675,6 +676,10 @@ if env['OURPLATFORM']!='darwin': if VERSION_RELEASE_CYCLE == "release" and "addons_contrib" in dn: dn.remove('addons_contrib') + # do not install freestyle if disabled + if not env['WITH_BF_FREESTYLE'] and "freestyle" in dn: + dn.remove("freestyle") + dir = os.path.join(env['BF_INSTALLDIR'], VERSION) dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):] -- cgit v1.2.3