From 6c3e4b77bf3693f3e63d1437c4375b96bd009bbf Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 14 Nov 2011 05:52:06 +0000 Subject: [PATCH] Fix #29245: BuilderBot can't build anymore Buildbot is using different settings for blender and player, enable fftw library in rules for player now. --- build_files/buildbot/config/user-config-i686.py | 3 +++ build_files/buildbot/config/user-config-player-i686.py | 5 +++++ build_files/buildbot/config/user-config-player-x86_64.py | 5 +++++ build_files/buildbot/config/user-config-x86_64.py | 3 +++ 4 files changed, 16 insertions(+) diff --git a/build_files/buildbot/config/user-config-i686.py b/build_files/buildbot/config/user-config-i686.py index eb3e321140f..99af7f3fa04 100644 --- a/build_files/buildbot/config/user-config-i686.py +++ b/build_files/buildbot/config/user-config-i686.py @@ -109,6 +109,9 @@ BF_BOOST_INC = '${BF_BOOST}/include' BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a' BF_BOOST_LIBPATH = '${BF_BOOST}/lib' +# Ocean Simulation +WITH_BF_OCEANSIM = True + # Compilation and optimization BF_DEBUG = False REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++ diff --git a/build_files/buildbot/config/user-config-player-i686.py b/build_files/buildbot/config/user-config-player-i686.py index fc875831223..3445ae59bda 100644 --- a/build_files/buildbot/config/user-config-player-i686.py +++ b/build_files/buildbot/config/user-config-player-i686.py @@ -86,6 +86,11 @@ WITH_BF_JACK = True # Motion Tracking WITH_BF_LIBMV = False +# Ocean Simulation +WITH_BF_FFTW3 = True +WITH_BF_STATICFFTW3 = True +WITH_BF_OCEANSIM = True + # Compilation and optimization BF_DEBUG = False REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++ diff --git a/build_files/buildbot/config/user-config-player-x86_64.py b/build_files/buildbot/config/user-config-player-x86_64.py index 64dc93608d9..6ec56865c26 100644 --- a/build_files/buildbot/config/user-config-player-x86_64.py +++ b/build_files/buildbot/config/user-config-player-x86_64.py @@ -86,6 +86,11 @@ WITH_BF_JACK = True # Motion Tracking WITH_BF_LIBMV = False +# Ocean Simulation +WITH_BF_FFTW3 = True +WITH_BF_STATICFFTW3 = True +WITH_BF_OCEANSIM = True + # Compilation and optimization BF_DEBUG = False REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++ diff --git a/build_files/buildbot/config/user-config-x86_64.py b/build_files/buildbot/config/user-config-x86_64.py index e7667b6c2ca..a607be286f9 100644 --- a/build_files/buildbot/config/user-config-x86_64.py +++ b/build_files/buildbot/config/user-config-x86_64.py @@ -109,6 +109,9 @@ BF_BOOST_INC = '${BF_BOOST}/include' BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a' BF_BOOST_LIBPATH = '${BF_BOOST}/lib' +# Ocean Simulation +WITH_BF_OCEANSIM = True + # Compilation and optimization BF_DEBUG = False REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++