diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-09-01 17:37:21 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-09-01 17:38:22 +0400 |
| commit | f0653c3d3f1b24b45e6f1c5ac659bf130b58af3f (patch) | |
| tree | 82721843c274829a1441ad7291809545955db90c /intern/opencl/SConscript | |
| parent | a8d2a6faf3beaf8363bd71c65c59e0ed1a1e7b5c (diff) | |
| parent | 575cbf0172508eb9d846f1c62027a9c0f4fddd34 (diff) | |
Merge branch 'master' into soc-2014-viewport_context
Also fix scons issues with SDL. There is still a linking problem
somewhere but i expect this is an issue in master as well.
Conflicts:
intern/cycles/SConscript
intern/ghost/CMakeLists.txt
intern/ghost/intern/GHOST_WindowX11.cpp
source/blender/nodes/CMakeLists.txt
Diffstat (limited to 'intern/opencl/SConscript')
| -rw-r--r-- | intern/opencl/SConscript | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/intern/opencl/SConscript b/intern/opencl/SConscript deleted file mode 100644 index 41a6d720098..00000000000 --- a/intern/opencl/SConscript +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env python -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# The Original Code is Copyright (C) 2006, Blender Foundation -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Nathan Letwory. -# -# ***** END GPL LICENSE BLOCK ***** - -Import ('env') - -sources = env.Glob('intern/*.c') - -incs = '.' - -env.BlenderLib ( 'bf_intern_opencl', sources, Split(incs), libtype=['core','player'], priority = [192,192] ) |