Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-11-09 21:18:37 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-11-09 21:18:37 +0400
commit1ff2018842554209697d23ed83577af8ed39eb54 (patch)
tree0e54661f43745427f44b04d5ddc391e2297adad5 /build_files/buildbot
parentbc5ec4e69cf3308c2563239c0e8372b853800a78 (diff)
Enable Cycles for buildbot
Diffstat (limited to 'build_files/buildbot')
-rw-r--r--build_files/buildbot/config/user-config-i686.py21
-rw-r--r--build_files/buildbot/config/user-config-player-i686.py6
-rw-r--r--build_files/buildbot/config/user-config-player-x86_64.py6
-rw-r--r--build_files/buildbot/config/user-config-x86_64.py21
4 files changed, 38 insertions, 16 deletions
diff --git a/build_files/buildbot/config/user-config-i686.py b/build_files/buildbot/config/user-config-i686.py
index 080fd8d6123..0a35babeaf5 100644
--- a/build_files/buildbot/config/user-config-i686.py
+++ b/build_files/buildbot/config/user-config-i686.py
@@ -34,7 +34,7 @@ BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/
# Don't depend on system's libstdc++
WITH_BF_STATICCXX = True
-BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.3.2/libstdc++.a'
+BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.3.4/libstdc++.a'
WITH_BF_OPENAL = True
WITH_BF_STATICOPENAL = True
@@ -92,9 +92,22 @@ WITH_BF_STATICFFTW3 = True
# JACK
WITH_BF_JACK = True
+# Cycles
+WITH_BF_CYCLES = True
+
+WITH_BF_OIIO = True
+BF_OIIO = '/opt/oiio'
+BF_OIIO_INC = '/opt/oiio/include'
+BF_OIIO_LIB = 'OpenImageIO IlmImf'
+BF_OIIO_LIBPATH = '/opt/oiio/lib'
+
+WITH_BF_BOOST = True
+BF_BOOST = '/opt/boost'
+BF_BOOST_INC = '/opt/boost/include'
+BF_BOOST_LIB = 'libboost_date_time libboost_filesystem libboost_regex libboost_system libboost_thread'
+BF_BOOST_LIBPATH = '/opt/boost/lib'
+
# Compilation and optimization
BF_DEBUG = False
-REL_CFLAGS = []
-REL_CXXFLAGS = []
-REL_CCFLAGS = ['-O2'] # C & C++
+REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++
PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib32']
diff --git a/build_files/buildbot/config/user-config-player-i686.py b/build_files/buildbot/config/user-config-player-i686.py
index 204732376fa..2be6a253736 100644
--- a/build_files/buildbot/config/user-config-player-i686.py
+++ b/build_files/buildbot/config/user-config-player-i686.py
@@ -28,7 +28,7 @@ BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/
# Don't depend on system's libstdc++
WITH_BF_STATICCXX = True
-BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.3.2/libstdc++.a'
+BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.3.4/libstdc++.a'
WITH_BF_OPENAL = True
WITH_BF_STATICOPENAL = True
@@ -85,7 +85,5 @@ WITH_BF_JACK = True
# Compilation and optimization
BF_DEBUG = False
-REL_CFLAGS = []
-REL_CXXFLAGS = []
-REL_CCFLAGS = ['-O2'] # C & C++
+REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++
PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib32']
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 cc0ba209a44..6a58b614321 100644
--- a/build_files/buildbot/config/user-config-player-x86_64.py
+++ b/build_files/buildbot/config/user-config-player-x86_64.py
@@ -28,7 +28,7 @@ BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/
# Don't depend on system's libstdc++
WITH_BF_STATICCXX = True
-BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.3.2/libstdc++.a'
+BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.3.4/libstdc++.a'
WITH_BF_OPENAL = True
WITH_BF_STATICOPENAL = True
@@ -85,7 +85,5 @@ WITH_BF_JACK = True
# Compilation and optimization
BF_DEBUG = False
-REL_CFLAGS = []
-REL_CXXFLAGS = []
-REL_CCFLAGS = ['-O2'] # C & C++
+REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++
PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']
diff --git a/build_files/buildbot/config/user-config-x86_64.py b/build_files/buildbot/config/user-config-x86_64.py
index 4698ffdce15..c3c1f0b9d90 100644
--- a/build_files/buildbot/config/user-config-x86_64.py
+++ b/build_files/buildbot/config/user-config-x86_64.py
@@ -34,7 +34,7 @@ BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/
# Don't depend on system's libstdc++
WITH_BF_STATICCXX = True
-BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.3.2/libstdc++.a'
+BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.3.4/libstdc++.a'
WITH_BF_OPENAL = True
WITH_BF_STATICOPENAL = True
@@ -92,9 +92,22 @@ WITH_BF_STATICFFTW3 = True
# JACK
WITH_BF_JACK = True
+# Cycles
+WITH_BF_CYCLES = True
+
+WITH_BF_OIIO = True
+BF_OIIO = '/opt/oiio'
+BF_OIIO_INC = '/opt/oiio/include'
+BF_OIIO_LIB = 'OpenImageIO IlmImf'
+BF_OIIO_LIBPATH = '/opt/oiio/lib'
+
+WITH_BF_BOOST = True
+BF_BOOST = '/opt/boost'
+BF_BOOST_INC = '/opt/boost/include'
+BF_BOOST_LIB = 'libboost_date_time libboost_filesystem libboost_regex libboost_system libboost_thread'
+BF_BOOST_LIBPATH = '/opt/boost/lib'
+
# Compilation and optimization
BF_DEBUG = False
-REL_CFLAGS = []
-REL_CXXFLAGS = []
-REL_CCFLAGS = ['-O2'] # C & C++
+REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++
PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']