diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-09-08 20:15:42 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-09-08 20:15:42 +0400 |
| commit | d9ffc99e66d659ac887d801b9cc071b4c3f9b8ab (patch) | |
| tree | d88e83b5a9edab115081641d26c811b6aa22296a /build_files/buildbot/config/user-config-glibc211-x86_64.py | |
| parent | 551ebaa3dd758bc1975548c28766bfa3159d3846 (diff) | |
| parent | b1490e39dd1017e51984d8a34d226e869bbb25df (diff) | |
Merge branch 'master' into soc-2014-viewport_fxsoc-2014-viewport_fx
I have resolved some differences, for instance selection code which was more or less a stub, to be
the same as master. This will have to be fixed later.
Conflicts:
CMakeLists.txt
intern/ghost/CMakeLists.txt
intern/ghost/intern/GHOST_SystemWin32.cpp
intern/ghost/intern/GHOST_Window.cpp
intern/ghost/intern/GHOST_WindowWin32.cpp
intern/ghost/intern/GHOST_WindowX11.cpp
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/intern/math_matrix.c
source/blender/gpu/CMakeLists.txt
source/blender/gpu/GPU_select.h
source/blender/gpu/intern/gpu_buffers.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_extensions.c
source/blender/gpu/intern/gpu_select.c
source/blender/gpu/shaders/gpu_shader_simple_vert.glsl
source/blender/nodes/CMakeLists.txt
Diffstat (limited to 'build_files/buildbot/config/user-config-glibc211-x86_64.py')
| -rw-r--r-- | build_files/buildbot/config/user-config-glibc211-x86_64.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build_files/buildbot/config/user-config-glibc211-x86_64.py b/build_files/buildbot/config/user-config-glibc211-x86_64.py index d94923cc39d..f07c447bf29 100644 --- a/build_files/buildbot/config/user-config-glibc211-x86_64.py +++ b/build_files/buildbot/config/user-config-glibc211-x86_64.py @@ -22,7 +22,7 @@ BF_OPENCOLLADA_LIB_STATIC = '${BF_OPENCOLLADA}/lib/libOpenCOLLADAStreamWriter.a '${BF_OPENCOLLADA}/lib/libOpenCOLLADAFramework.a ' + \ '${BF_OPENCOLLADA}/lib/libOpenCOLLADABaseUtils.a ' + \ '${BF_OPENCOLLADA}/lib/libGeneratedSaxParser.a ' + \ - '${BF_OPENCOLLADA}/lib/libUTF.a ${BF_OPENCOLLADA}/lib/libMathMLSolver.a ' + \ + '${BF_OPENCOLLADA}/lib/libMathMLSolver.a ' + \ '${BF_OPENCOLLADA}/lib/libbuffer.a ${BF_OPENCOLLADA}/lib/libftoa.a ' + \ '/usr/lib/libxml2.a /usr/lib/libexpat.a /usr/lib/libpcre.a' BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib /home/sources/staticlibs/lib64' @@ -134,8 +134,8 @@ BF_OSL_COMPILER = '${BF_OSL}/bin/oslc' WITH_BF_LLVM = True WITH_BF_STATICLLVM = False -BF_LLVM = '/opt/lib/llvm-3.1' -BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc LLVMX86Info LLVMX86AsmPrinter ' + \ +BF_LLVM = '/opt/lib/llvm-3.4.2' +BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc LLVMObject LLVMX86Info LLVMX86AsmPrinter ' + \ 'LLVMX86Utils LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMInstCombine LLVMTransformUtils LLVMipa LLVMAnalysis LLVMExecutionEngine ' + \ 'LLVMTarget LLVMMC LLVMCore LLVMSupport' BF_LLVM_LIBPATH = '${BF_LLVM}/lib' |