diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-10-18 09:45:47 +0400 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-10-18 09:45:47 +0400 |
commit | 88446eeca4b6f9d31928a538e3a39d04f1d06976 (patch) | |
tree | 069b6135aa98b631a1e37485562190bd0428d084 /SConstruct | |
parent | 134e5622193cd4eb168b0457208ed6794b5935df (diff) |
Patch 5105 by Joshua Leung (Aligorith), slightly modified by me
* Add WITH_BF_YAFRAY, which per default is 'true', so no visible changes for developers (and users).
Set WITH_BF_YAFRAY to 'false', and you'll save some major compile time :) Also handy if you're strapped for memory and compilation fails on yafray compilation due
to this.
- this commit also has a few whitespace changes and
- made BF_NO_ELBEEM a proper BoolOption. This will be renamed to WITH_BF_ELBEEM in the near future...
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/SConstruct b/SConstruct index 46a563300ec..017fed45921 100644 --- a/SConstruct +++ b/SConstruct @@ -92,10 +92,10 @@ quickie = B.arguments.get('BF_QUICK', None) quickdebug = B.arguments.get('BF_QUICKDEBUG', None) if quickdebug: - B.quickdebug=string.split(quickdebug, ',') + B.quickdebug=string.split(quickdebug, ',') else: - B.quickdebug=[] - + B.quickdebug=[] + if quickie: B.quickie=string.split(quickie,',') else: @@ -120,9 +120,9 @@ env.SConscriptChdir(0) cc = B.arguments.get('CC', None) cxx = B.arguments.get('CXX', None) if cc: - env['CC'] = cc + env['CC'] = cc if cxx: - env['CXX'] = cxx + env['CXX'] = cxx if env['CC'] in ['cl', 'cl.exe'] and sys.platform=='win32': platform = 'win32-vc' @@ -161,15 +161,15 @@ opts = btools.read_opts(optfiles, B.arguments) opts.Update(env) # disable elbeem (fluidsim) compilation? -if env['BF_NO_ELBEEM'] == 'true': - env['CPPFLAGS'].append('-DDISABLE_ELBEEM') - env['CXXFLAGS'].append('-DDISABLE_ELBEEM') - env['CCFLAGS'].append('-DDISABLE_ELBEEM') +if env['BF_NO_ELBEEM'] == 1: + env['CPPFLAGS'].append('-DDISABLE_ELBEEM') + env['CXXFLAGS'].append('-DDISABLE_ELBEEM') + env['CCFLAGS'].append('-DDISABLE_ELBEEM') #check for additional debug libnames if env.has_key('BF_DEBUG_LIBS'): - B.quickdebug += env['BF_DEBUG_LIBS'] + B.quickdebug += env['BF_DEBUG_LIBS'] printdebug = B.arguments.get('BF_LISTDEBUG', 0) @@ -181,8 +181,8 @@ if env['OURPLATFORM'] == 'linux2' : #include "AL/alut.h" int main(int argc, char **argv) { - alutGetMajorVersion(); - return 0; + alutGetMajorVersion(); + return 0; } """ |