merge with trunk at r31523
[blender.git] / source / blender / makesrna / intern / SConscript
index 8caabb3b1c355e1100f76b64679f0974a8bd2580..cdb9cdd3126444491f59c9675100174751061852 100644 (file)
@@ -33,7 +33,7 @@ incs = '#/intern/guardedalloc ../../blenlib ../../blenkernel'
 incs += ' ../../imbuf ../../makesdna ../../makesrna ../../ikplugin'
 incs += ' ../../windowmanager ../../editors/include'
 incs += ' ../../render/extern/include ../../bmesh'
-incs += ' #/intern/audaspace/intern'
+incs += ' #/intern/audaspace/intern '
 
 if env['WITH_BF_OPENEXR']:
        defs.append('WITH_OPENEXR')
@@ -47,6 +47,12 @@ if env['WITH_BF_OPENJPEG']:
 if env['WITH_BF_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_FFMPEG']:
        defs.append('WITH_FFMPEG')
        incs += ' ' + env['BF_FFMPEG_INC']
@@ -84,7 +90,7 @@ if not env['WITH_BF_PYTHON']:
 
 if env['OURPLATFORM'] == 'linux2':
        cflags='-pthread'
-       incs += ' ../../../extern/binreloc/include'
+       incs += ' ../../../extern/binreloc/include'
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
        incs += ' ' + env['BF_PTHREADS_INC']
@@ -146,7 +152,7 @@ if env['OURPLATFORM'] != 'linuxcross':
        if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'):
                rna.Command (generated_files, '', "\"" + root_build_dir+os.sep+"makesrna.exe\" \""  + build_dir )
        else:
-               rna.Command (generated_files, '', root_build_dir+os.sep+"makesrna "  + build_dir)
+               rna.Command (generated_files, '', "\"" + root_build_dir+os.sep+"makesrna\" \""  + build_dir + '"' )
 else:
        rna.Command (generated_files, '', root_build_dir+os.sep+"makesrna.exe "  + build_dir)