diff options
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/SConscript | 100 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/cineon/SConscript | 46 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/dds/SConscript | 47 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/oiio/SConscript | 49 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/openexr/SConscript | 49 | ||||
| -rw-r--r-- | source/blender/imbuf/readme.txt | 4 |
6 files changed, 1 insertions, 294 deletions
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript deleted file mode 100644 index ccee3ebcc85..00000000000 --- a/source/blender/imbuf/SConscript +++ /dev/null @@ -1,100 +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 os -Import ('env') - -sources = env.Glob('intern/*.c') - -incs = [ - '.', - '#/intern/opencolorio', - '#/intern/ffmpeg', - '#/intern/guardedalloc', - '#/intern/memutil', - '../avi', - '../blenkernel', - '../blenlib', - '../blenloader', - '../makesdna', - '../makesrna', - env['BF_JPEG_INC'], - env['BF_PNG_INC'], - env['BF_TIFF_INC'], - env['BF_ZLIB_INC'], - ] -incs = ' '.join(incs) - -defs = [] - -if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): - incs += ' ' + env['BF_PTHREADS_INC'] - incs += ' ../../../intern/utfconv' - -if env['WITH_BF_OIIO']: - defs.append('WITH_OPENIMAGEIO') - -if env['WITH_BF_OPENEXR']: - defs.append('WITH_OPENEXR') -else: - sources.append(os.path.join('intern', 'openexr', 'openexr_stub.cpp')) - -if env['WITH_BF_TIFF']: - defs.append('WITH_TIFF') -else: - sources.remove(os.path.join('intern', 'tiff.c')) - -if env['WITH_BF_DDS']: - defs.append('WITH_DDS') - -if env['WITH_BF_CINEON']: - defs.append('WITH_CINEON') - -if env['WITH_BF_HDR']: - defs.append('WITH_HDR') -else: - sources.remove(os.path.join('intern', 'radiance_hdr.c')) - -if env['WITH_BF_FFMPEG']: - defs.append('WITH_FFMPEG') - incs += ' ' + env['BF_FFMPEG_INC'] - -if env['WITH_BF_OPENJPEG']: - defs.append('WITH_OPENJPEG') - incs += ' ' + env['BF_OPENJPEG_INC'] -else: - sources.remove(os.path.join('intern', 'jp2.c')) - -if env['WITH_BF_REDCODE']: - defs.append('WITH_REDCODE') - incs += ' ' + env['BF_REDCODE_INC'] - -if env['WITH_BF_QUICKTIME']: - incs += ' ../quicktime ' + env['BF_QUICKTIME_INC'] - defs.append('WITH_QUICKTIME') - -env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [185,115] ) diff --git a/source/blender/imbuf/intern/cineon/SConscript b/source/blender/imbuf/intern/cineon/SConscript deleted file mode 100644 index 037a7fec1bc..00000000000 --- a/source/blender/imbuf/intern/cineon/SConscript +++ /dev/null @@ -1,46 +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') - -source_files = env.Glob('*.c') - -incs = ['.', - '../../../blenkernel', - '../../', - '..', - '../../../blenlib', - 'intern/include', - '#/intern/guardedalloc', - '../../../makesdna'] - -defs = [] - -if env['WITH_BF_CINEON']: - defs.append('WITH_CINEON') - -env.BlenderLib ('bf_imbuf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [220,175]) diff --git a/source/blender/imbuf/intern/dds/SConscript b/source/blender/imbuf/intern/dds/SConscript deleted file mode 100644 index 960e15f8e55..00000000000 --- a/source/blender/imbuf/intern/dds/SConscript +++ /dev/null @@ -1,47 +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') - -source_files = ['dds_api.cpp', 'DirectDrawSurface.cpp', 'Stream.cpp', 'BlockDXT.cpp', 'ColorBlock.cpp', 'Image.cpp', 'FlipDXT.cpp'] - -incs = [ - '.', - '..', - '../..', - '../../../makesdna', - '../../../blenkernel', - '../../../blenlib', - 'intern/include', - '#/intern/guardedalloc', - '#/intern/utfconv' - ] - - -defs = ['WITH_DDS'] - -env.BlenderLib ('bf_imbuf_dds', source_files, incs, defs, libtype=['core','player'], priority = [230,190]) diff --git a/source/blender/imbuf/intern/oiio/SConscript b/source/blender/imbuf/intern/oiio/SConscript deleted file mode 100644 index 82b47e9c46b..00000000000 --- a/source/blender/imbuf/intern/oiio/SConscript +++ /dev/null @@ -1,49 +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) 2013, Blender Foundation -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): -# -# ***** END GPL LICENSE BLOCK ***** - -Import ('env') - -source_files = ['openimageio_api.cpp'] - -incs = ['.', - '../../../blenkernel', - '../../', - '..', - '../../../blenlib', - 'intern/include', - '#/intern/guardedalloc', - '../../../makesdna', - '#/intern/utfconv'] - -incs += Split(env['BF_OIIO_INC']) - -defs = ['WITH_OPENIMAGEIO'] - -if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): - incs.append(env['BF_PTHREADS_INC']) - -env.BlenderLib ('bf_imbuf_openimageio', source_files, incs, defs, libtype=['core','player'], priority = [225,180]) diff --git a/source/blender/imbuf/intern/openexr/SConscript b/source/blender/imbuf/intern/openexr/SConscript deleted file mode 100644 index ac38c0458d9..00000000000 --- a/source/blender/imbuf/intern/openexr/SConscript +++ /dev/null @@ -1,49 +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') - -source_files = ['openexr_api.cpp'] - -incs = ['.', - '../../../blenkernel', - '../../', - '..', - '../../../blenlib', - 'intern/include', - '#/intern/guardedalloc', - '../../../makesdna', - '#/intern/utfconv'] - -incs += Split(env['BF_OPENEXR_INC']) - -defs = ['WITH_OPENEXR'] - -if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): - incs.append(env['BF_PTHREADS_INC']) - -env.BlenderLib ('bf_imbuf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [225,180]) diff --git a/source/blender/imbuf/readme.txt b/source/blender/imbuf/readme.txt index 181d5485310..d50cb8c781d 100644 --- a/source/blender/imbuf/readme.txt +++ b/source/blender/imbuf/readme.txt @@ -38,10 +38,8 @@ and add your extension so that your format gets recognized in the thumbnails. Step 6: Alter the build process: -For scons you need to edit blender/source/blender/imbuf/SConscript +For cmake you need to edit blender/source/blender/imbuf/CMakeLists.txt and add in your additional files to source_files. -For msvp you need to edit blender/projectfiles/blender/imbuf/BL_imbuf.dsp -and add in your additional files. If you have any external library info you will also need to add that to the various build processes. |