diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-12 06:37:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-12 06:37:28 +0400 |
| commit | 8fb067af93cfd2c64968e1919d75a323c8e01531 (patch) | |
| tree | dd9679cf50ab5227e6870b3a650ec9b5a37257c6 /intern/SConscript | |
| parent | cc1259178b95d084a7ca9e83c90ef0ab97b7fa86 (diff) | |
code cleanup: avoid confusion with utfconv lib - was configuring this windows only lib on non windows platforms (scons only).
Diffstat (limited to 'intern/SConscript')
| -rw-r--r-- | intern/SConscript | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/intern/SConscript b/intern/SConscript index 71821bd9e99..d7c3715349b 100644 --- a/intern/SConscript +++ b/intern/SConscript @@ -3,7 +3,6 @@ Import ('env') SConscript(['audaspace/SConscript', 'string/SConscript', - 'utfconv/SConscript', # XXX - why use this on UNIX? 'ghost/SConscript', 'guardedalloc/SConscript', 'moto/SConscript', @@ -21,10 +20,10 @@ SConscript(['audaspace/SConscript', # getting it to compile is difficult # intern/bsp has been used anyway, so # perhaps get rid of intern/csg? -NEW_CSG='false' +NEW_CSG = 'false' if env ['WITH_BF_REMESH']: - SConscript(['dualcon/SConscript']) + SConscript(['dualcon/SConscript']) if env['WITH_BF_FLUID']: SConscript(['elbeem/SConscript']) @@ -32,7 +31,10 @@ if env['WITH_BF_FLUID']: if env['WITH_BF_CYCLES']: SConscript(['cycles/SConscript']) -if NEW_CSG=='false': +if NEW_CSG == 'false': SConscript(['bsp/SConscript']) else: SConscript(['csg/SConscript']) + +if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): + SConscript(['utfconv/SConscript']) |