diff options
author | Joseph Eagar <joeedh@gmail.com> | 2011-02-27 09:19:40 +0300 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2011-02-27 09:19:40 +0300 |
commit | f01261d040be27337db9f9996d648a279c89b7c4 (patch) | |
tree | c448230939b3c90d53ce8852dd00925d6052e3a4 /source/blender/blenpluginapi | |
parent | dcaeda5c4e3a0687251b8511de4f2e8b85ef75c0 (diff) | |
parent | 2198cfdb2deec8b2e85e242c74a032f43d0b26ca (diff) |
merge with/from trunk at r35190
Diffstat (limited to 'source/blender/blenpluginapi')
-rw-r--r-- | source/blender/blenpluginapi/CMakeLists.txt | 35 | ||||
-rw-r--r-- | source/blender/blenpluginapi/Makefile | 34 | ||||
-rw-r--r-- | source/blender/blenpluginapi/SConscript | 6 | ||||
-rw-r--r-- | source/blender/blenpluginapi/documentation.h | 2 | ||||
-rw-r--r-- | source/blender/blenpluginapi/iff.h | 2 | ||||
-rw-r--r-- | source/blender/blenpluginapi/intern/Makefile | 50 | ||||
-rw-r--r-- | source/blender/blenpluginapi/intern/pluginapi.c | 7 |
7 files changed, 31 insertions, 105 deletions
diff --git a/source/blender/blenpluginapi/CMakeLists.txt b/source/blender/blenpluginapi/CMakeLists.txt index 2699b3b7c3b..1e3a3398861 100644 --- a/source/blender/blenpluginapi/CMakeLists.txt +++ b/source/blender/blenpluginapi/CMakeLists.txt @@ -24,19 +24,30 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC intern/*.c) - -SET(INC - . .. ../../../intern/guardedalloc ../blenlib ../imbuf ../makesdna +set(INC + . + .. + ../blenlib + ../imbuf + ../makesdna + ../blenloader + ../../../intern/guardedalloc ) -IF(WIN32) - SET(INC ${INC} ${PTHREADS_INC}) -ENDIF(WIN32) +set(SRC + intern/pluginapi.c + + documentation.h + externdef.h + floatpatch.h + iff.h + plugin.h + util.h +) -IF(WITH_QUICKTIME) - SET(INC ${INC} ${QUICKTIME_INC}) - ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +if(WITH_CODEC_QUICKTIME) + list(APPEND INC ${QUICKTIME_INC}) + add_definitions(-DWITH_QUICKTIME) +endif() -BLENDERLIB(bf_blenpluginapi "${SRC}" "${INC}") +blender_add_lib(bf_blenpluginapi "${SRC}" "${INC}") diff --git a/source/blender/blenpluginapi/Makefile b/source/blender/blenpluginapi/Makefile deleted file mode 100644 index c91161d8cfd..00000000000 --- a/source/blender/blenpluginapi/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# -# $Id$ -# -# ***** 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) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# -# Bounces make to subdirectories. - -SOURCEDIR = source/blender/blenpluginapi -DIRS = intern - -include nan_subdirs.mk diff --git a/source/blender/blenpluginapi/SConscript b/source/blender/blenpluginapi/SConscript index 77faaa7b7f4..178f470e080 100644 --- a/source/blender/blenpluginapi/SConscript +++ b/source/blender/blenpluginapi/SConscript @@ -3,15 +3,15 @@ Import ('env') sources = env.Glob('intern/*.c') -incs = '. .. #/intern/guardedalloc ../blenlib ../imbuf ../makesdna' +incs = '. .. #/intern/guardedalloc ../blenlib ../imbuf ../makesdna ../blenloader' defs = [] incs += ' ' + env["BF_PTHREADS_INC"] if env['WITH_BF_QUICKTIME']: - defs.append('WITH_QUICKTIME') - incs += ' ' + env['BF_QUICKTIME_INC'] + defs.append('WITH_QUICKTIME') + incs += ' ' + env['BF_QUICKTIME_INC'] if env['OURPLATFORM'] == 'linux2': cflags='-pthread' diff --git a/source/blender/blenpluginapi/documentation.h b/source/blender/blenpluginapi/documentation.h index bf964d792b6..3bf43a6bc9b 100644 --- a/source/blender/blenpluginapi/documentation.h +++ b/source/blender/blenpluginapi/documentation.h @@ -1,4 +1,4 @@ -/** +/* * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** diff --git a/source/blender/blenpluginapi/iff.h b/source/blender/blenpluginapi/iff.h index b8628b00575..668d14508ec 100644 --- a/source/blender/blenpluginapi/iff.h +++ b/source/blender/blenpluginapi/iff.h @@ -81,7 +81,7 @@ typedef struct ImBuf { int refcounter; /* reference counter for multiple users */ } ImBuf; -LIBIMPORT struct ImBuf *allocImBuf(short,short,uchar,uint,uchar); +LIBIMPORT struct ImBuf *allocImBuf(short,short,uchar,uint); LIBIMPORT struct ImBuf *dupImBuf(struct ImBuf *); LIBIMPORT void freeImBuf(struct ImBuf*); diff --git a/source/blender/blenpluginapi/intern/Makefile b/source/blender/blenpluginapi/intern/Makefile deleted file mode 100644 index 696462f3f46..00000000000 --- a/source/blender/blenpluginapi/intern/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# -# $Id$ -# -# ***** 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) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# -# - -LIBNAME = blenpluginapi -DIR = $(OCGDIR)/blender/$(LIBNAME) - -include nan_compile.mk - -CFLAGS += $(LEVEL_1_C_WARNINGS) - -# path to our own external headerfiles. On win2k this needs to be -# longer, to avoid the util.h include problem -CPPFLAGS += -I.. -CPPFLAGS += -I../.. - -# also do dna -CPPFLAGS += -I../../makesdna -# path to blenlib -CPPFLAGS += -I../../blenlib -# path to imbuf -CPPFLAGS += -I../../imbuf -CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include - diff --git a/source/blender/blenpluginapi/intern/pluginapi.c b/source/blender/blenpluginapi/intern/pluginapi.c index 9e739f7927d..ab21e5a96fc 100644 --- a/source/blender/blenpluginapi/intern/pluginapi.c +++ b/source/blender/blenpluginapi/intern/pluginapi.c @@ -1,4 +1,4 @@ -/** +/* * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** @@ -101,10 +101,9 @@ LIBEXPORT void freeT(void *vmemh) LIBEXPORT struct ImBuf *allocImBuf(short x, short y, uchar d, - uint flags, - uchar bitmap) + uint flags) { - return IMB_allocImBuf(x, y, d, flags, bitmap); + return IMB_allocImBuf(x, y, d, flags); } |