[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16783] trunk/blender/extern/fftw/ SConscript: scons/mingw compiling fix for fftw commit:

Joshua Leung aligorith at gmail.com
Sun Sep 28 13:57:47 CEST 2008


Revision: 16783
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16783
Author:   aligorith
Date:     2008-09-28 13:56:47 +0200 (Sun, 28 Sep 2008)

Log Message:
-----------
scons/mingw compiling fix for fftw commit:

Split the sources into several libs so that the linker could cope.

(Note to Genscher: the makefile seems to have some hardcoded paths to things on your computer)

Modified Paths:
--------------
    trunk/blender/extern/fftw/SConscript

Modified: trunk/blender/extern/fftw/SConscript
===================================================================
--- trunk/blender/extern/fftw/SConscript	2008-09-28 11:24:09 UTC (rev 16782)
+++ trunk/blender/extern/fftw/SConscript	2008-09-28 11:56:47 UTC (rev 16783)
@@ -3,11 +3,21 @@
 
 Import('env')
 
-sources = env.Glob('api/*.c') + env.Glob('kernel/*.c') + env.Glob('dft/*.c') + env.Glob('rdft/*.c') + env.Glob('reodft/*.c') 
-sources +=  env.Glob('dft/codelets/*.c')  + env.Glob('dft/codelets/standard/*.c') 
-sources += env.Glob('rdft/codelets/*.c') + env.Glob('rdft/codelets/hc2r/*.c') + env.Glob('rdft/codelets/r2hc/*.c') + env.Glob('rdft/codelets/r2r/*.c')
 defs = []
 cflags = []
 incs = 'api kernel dft rdft reodft . dft/codelets/standard dft/codelets rdft/codelets rdft/codelets/hc2r rdft/codelets/r2hc rdft/codelets/r2r'
 
-env.BlenderLib ( libname='extern_fftw', sources=sources, includes=Split(incs), defines=Split(defs), libtype=['intern','player'], priority=[45, 75] , compileflags = cflags)
+api= env.Glob('api/*.c') 
+kernel= env.Glob('kernel/*.c')
+dft= env.Glob('dft/*.c') + env.Glob('dft/codelets/*.c') + env.Glob('dft/codelets/standard/*.c') 
+rdft= env.Glob('rdft/*.c') + env.Glob('rdft/codelets/*.c')
+rdft2= env.Glob('rdft/codelets/hc2r/*.c') + env.Glob('rdft/codelets/r2hc/*.c') + env.Glob('rdft/codelets/r2r/*.c')
+reodft= env.Glob('reodft/*.c')
+
+
+env.BlenderLib ( libname='extern_fftw_api', sources=api, includes=Split(incs), defines=Split(defs), libtype=['intern','player'], priority=[45, 75] , compileflags = cflags)
+env.BlenderLib ( libname='extern_fftw_kernel', sources=kernel, includes=Split(incs), defines=Split(defs), libtype=['intern','player'], priority=[45, 75] , compileflags = cflags)
+env.BlenderLib ( libname='extern_fftw_dft', sources=dft, includes=Split(incs), defines=Split(defs), libtype=['intern','player'], priority=[45, 75] , compileflags = cflags)
+env.BlenderLib ( libname='extern_fftw_rdft', sources=rdft, includes=Split(incs), defines=Split(defs), libtype=['intern','player'], priority=[45, 75] , compileflags = cflags)
+env.BlenderLib ( libname='extern_fftw_rdft2', sources=rdft2, includes=Split(incs), defines=Split(defs), libtype=['intern','player'], priority=[45, 75] , compileflags = cflags)
+env.BlenderLib ( libname='extern_fftw_reodft', sources=reodft, includes=Split(incs), defines=Split(defs), libtype=['intern','player'], priority=[45, 75] , compileflags = cflags)





More information about the Bf-blender-cvs mailing list