fix potential crasher: malloc->calloc
[blender.git] / source / blender / blenkernel / SConscript
index a6705653769d9659a2649cdd4cee8cf662fa0f4d..bbc66ac14ea41473839476a28772a9d9b81251a4 100644 (file)
@@ -20,62 +20,71 @@ incs += ' ' + env['BF_ZLIB_INC']
 defs = [ 'GLEW_STATIC' ]
 
 if not env['WITH_BF_PYTHON']:
-       defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 else:
-       incs += ' ../python'
-       incs += ' ' + env['BF_PYTHON_INC']
-       if env['BF_DEBUG']:
-               defs.append('_DEBUG')
+    incs += ' ../python'
+    incs += ' ' + env['BF_PYTHON_INC']
+    if env['BF_DEBUG']:
+        defs.append('_DEBUG')
 
 if env['WITH_BF_QUICKTIME']:
-       incs += ' ../quicktime'
+    incs += ' ../quicktime'
 
 if env['WITH_BF_SDL']:
-       incs += ' ' + env['BF_SDL_INC']
+    incs += ' ' + env['BF_SDL_INC']
 else:
-       defs.append('DISABLE_SDL')
+    defs.append('DISABLE_SDL')
 
 if env['WITH_BF_OPENEXR']:
-       defs.append('WITH_OPENEXR')
+    defs.append('WITH_OPENEXR')
 
 if env['WITH_BF_TIFF']:
-       defs.append('WITH_TIFF')
+    defs.append('WITH_TIFF')
 
 if env['WITH_BF_OPENJPEG']:
-       defs.append('WITH_OPENJPEG')
+    defs.append('WITH_OPENJPEG')
 
 if env['WITH_BF_DDS']:
-       defs.append('WITH_DDS')
+    defs.append('WITH_DDS')
+
+if env['WITH_BF_CINEON']:
+    defs.append('WITH_CINEON')
+
+if env['WITH_BF_HDR']:
+    defs.append('WITH_HDR')
+
+if env['WITH_BF_JACK']:
+    defs.append('WITH_JACK')
 
 if env['WITH_BF_FFMPEG']:
-       defs.append('WITH_FFMPEG')
-       incs += ' ' + env['BF_FFMPEG_INC']
+    defs.append('WITH_FFMPEG')
+    incs += ' ' + env['BF_FFMPEG_INC']
 
 if env['WITH_BF_QUICKTIME']:
-       defs.append('WITH_QUICKTIME')
-       incs += ' ' + env['BF_QUICKTIME_INC']
+    defs.append('WITH_QUICKTIME')
+    incs += ' ' + env['BF_QUICKTIME_INC']
 
 if env['WITH_BF_BULLET']:
-       defs.append('USE_BULLET')
+    defs.append('USE_BULLET')
 
 if env['OURPLATFORM'] == 'darwin':
     if env['WITH_BF_OPENMP']:
        defs.append('PARALLEL=1')
 
 if env['BF_NO_ELBEEM']:
-       defs.append('DISABLE_ELBEEM')
+    defs.append('DISABLE_ELBEEM')
 
 if env['WITH_BF_LCMS']:
-       defs.append('WITH_LCMS')
-       incs += ' ' + env['BF_LCMS_INC']
+    defs.append('WITH_LCMS')
+    incs += ' ' + env['BF_LCMS_INC']
 
 if env['WITH_BF_LZO']:
-       incs += ' #/extern/lzo/minilzo'
-       defs.append('WITH_LZO')
+    incs += ' #/extern/lzo/minilzo'
+    defs.append('WITH_LZO')
 
 if env['WITH_BF_LZMA']:
-       incs += ' #/extern/lzma'
-       defs.append('WITH_LZMA')
+    incs += ' #/extern/lzma'
+    defs.append('WITH_LZMA')
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']