Revision: 41667
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41667
Author: nazgul
Date: 2011-11-08 16:24:31 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
Don't compile AUD_JOSResampleReaderCoeff.cpp twice (it's included in
AUD_JOSResampleReader.cpp)
Patch from nico_ga, thanks!
Modified Paths:
--------------
trunk/blender/intern/audaspace/CMakeLists.txt
trunk/blender/intern/audaspace/SConscript
Modified: trunk/blender/intern/audaspace/CMakeLists.txt
===================================================================
--- trunk/blender/intern/audaspace/CMakeLists.txt 2011-11-08 16:09:20 UTC
(rev 41666)
+++ trunk/blender/intern/audaspace/CMakeLists.txt 2011-11-08 16:24:31 UTC
(rev 41667)
@@ -98,7 +98,6 @@
intern/AUD_IWriter.h
intern/AUD_JOSResampleFactory.cpp
intern/AUD_JOSResampleFactory.h
- intern/AUD_JOSResampleReaderCoeff.cpp
intern/AUD_JOSResampleReader.cpp
intern/AUD_JOSResampleReader.h
intern/AUD_LinearResampleFactory.cpp
Modified: trunk/blender/intern/audaspace/SConscript
===================================================================
--- trunk/blender/intern/audaspace/SConscript 2011-11-08 16:09:20 UTC (rev
41666)
+++ trunk/blender/intern/audaspace/SConscript 2011-11-08 16:24:31 UTC (rev
41667)
@@ -3,6 +3,8 @@
Import ('env')
sources = env.Glob('intern/*.cpp') + env.Glob('FX/*.cpp')
+# file already included in AUD_JOSResampleReader.cpp
+sources.remove('AUD_JOSResampleReaderCoeff.cpp')
incs = '. intern FX ' + env['BF_PTHREADS_INC']
defs = []
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs