[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22322] branches/blender2.5/blender/source /blender/makesrna: fftw + smoke: fifxing define (making it work with scons)

[Daniel Genrich]

Revision: 22322
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22322
Author:   genscher
Date:     2009-08-09 16:13:33 +0200 (Sun, 09 Aug 2009)

Log Message:
-----------
fftw + smoke: fifxing define (making it work with scons)

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/makesrna/SConscript
    branches/blender2.5/blender/source/blender/makesrna/intern/SConscript

Modified: branches/blender2.5/blender/source/blender/makesrna/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/SConscript	2009-08-09 13:20:12 UTC (rev 22321)
+++ branches/blender2.5/blender/source/blender/makesrna/SConscript	2009-08-09 14:13:33 UTC (rev 22322)
@@ -1,43 +1,40 @@
-#!/usr/bin/python
-Import ('env')
-
-objs = []
-
-o = SConscript('intern/SConscript')
-objs += o
-
-incs = '#/intern/guardedalloc ../blenkernel ../blenlib ../makesdna intern .'
-incs += ' ../windowmanager ../editors/include ../imbuf'
-incs += ' ../render/extern/include'
-
-defs = []
-
-if env['WITH_BF_OPENEXR']:
-	defs.append('WITH_OPENEXR')
-
-if env['WITH_BF_OPENJPEG']:
-	defs.append('WITH_OPENJPEG')
-
-if env['WITH_BF_DDS']:
-	defs.append('WITH_DDS')
-
-if env['WITH_BF_FFMPEG']:
-	defs.append('WITH_FFMPEG')
-	incs += ' ' + env['BF_FFMPEG_INC']
-
-if env['WITH_BF_OGG']:
-	defs.append('WITH_OGG')
-
-if env['WITH_BF_QUICKTIME']:
-	defs.append('WITH_QUICKTIME')
-
-if env['WITH_BF_LCMS']:
-	defs.append('WITH_LCMS')
-
-if env['WITH_BF_GAMEENGINE']:
-	defs.append('GAMEBLENDER=1')
-	
-if env['WITH_BF_FFTW3']:
-    defs.append('FFTW3=1')
-
-env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core'], priority = [195] )
+#!/usr/bin/python
+Import ('env')
+
+objs = []
+
+o = SConscript('intern/SConscript')
+objs += o
+
+incs = '#/intern/guardedalloc ../blenkernel ../blenlib ../makesdna intern .'
+incs += ' ../windowmanager ../editors/include ../imbuf'
+incs += ' ../render/extern/include'
+
+defs = []
+
+if env['WITH_BF_OPENEXR']:
+	defs.append('WITH_OPENEXR')
+
+if env['WITH_BF_OPENJPEG']:
+	defs.append('WITH_OPENJPEG')
+
+if env['WITH_BF_DDS']:
+	defs.append('WITH_DDS')
+
+if env['WITH_BF_FFMPEG']:
+	defs.append('WITH_FFMPEG')
+	incs += ' ' + env['BF_FFMPEG_INC']
+
+if env['WITH_BF_OGG']:
+	defs.append('WITH_OGG')
+
+if env['WITH_BF_QUICKTIME']:
+	defs.append('WITH_QUICKTIME')
+
+if env['WITH_BF_LCMS']:
+	defs.append('WITH_LCMS')
+
+if env['WITH_BF_GAMEENGINE']:
+	defs.append('GAMEBLENDER=1')
+
+env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core'], priority = [195] )

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/SConscript	2009-08-09 13:20:12 UTC (rev 22321)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/SConscript	2009-08-09 14:13:33 UTC (rev 22322)
@@ -58,6 +58,9 @@
 
 if env['WITH_BF_GAMEENGINE']:
 	defs.append('GAMEBLENDER=1')
+	
+if env['WITH_BF_FFTW3']:
+    defs.append('FFTW3=1')
 
 makesrna_tool.Append(CPPDEFINES=defs)