diff options
-rw-r--r-- | source/blender/editors/SConscript | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | source/blender/editors/io/CMakeLists.txt | 8 | ||||
-rw-r--r-- | source/blender/editors/io/SConscript | 11 | ||||
-rw-r--r--[-rwxr-xr-x] | source/blender/editors/io/io_collada.h | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | source/blender/editors/io/io_ops.c | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | source/blender/editors/io/io_ops.h | 0 | ||||
-rw-r--r-- | source/blender/editors/space_api/SConscript | 2 |
7 files changed, 17 insertions, 5 deletions
diff --git a/source/blender/editors/SConscript b/source/blender/editors/SConscript index d08b496f0ef..6233ea0dc39 100644 --- a/source/blender/editors/SConscript +++ b/source/blender/editors/SConscript @@ -6,6 +6,7 @@ SConscript(['datafiles/SConscript', 'space_api/SConscript', 'util/SConscript', 'interface/SConscript', + 'io/SConscript', 'animation/SConscript', 'armature/SConscript', 'mask/SConscript', diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt index ceefb7f8a47..0c417c5dfb9 100755..100644 --- a/source/blender/editors/io/CMakeLists.txt +++ b/source/blender/editors/io/CMakeLists.txt @@ -33,10 +33,10 @@ set(INC set(SRC io_collada.c - io_ops.c - - io_collada.h - io_ops.h + io_ops.c + + io_collada.h + io_ops.h ) if(WITH_OPENCOLLADA) diff --git a/source/blender/editors/io/SConscript b/source/blender/editors/io/SConscript new file mode 100644 index 00000000000..fd766ddacdc --- /dev/null +++ b/source/blender/editors/io/SConscript @@ -0,0 +1,11 @@ +#!/usr/bin/python + +Import ('env') + +sources = env.Glob('*.c') +defs = [] + +incs = '../include ../../blenfont ../../blenkernel ../../blenlib ../../blenloader ../../bmesh' +incs += '../../makesdna ../../makesrna ../../windowmanager ../../collada' + +env.BlenderLib ( 'bf_editor_io', sources, Split(incs), defines=defs, libtype=['core','player'], priority=[330,210] ) diff --git a/source/blender/editors/io/io_collada.h b/source/blender/editors/io/io_collada.h index 4f53ec99de0..4f53ec99de0 100755..100644 --- a/source/blender/editors/io/io_collada.h +++ b/source/blender/editors/io/io_collada.h diff --git a/source/blender/editors/io/io_ops.c b/source/blender/editors/io/io_ops.c index a06d54c2918..a06d54c2918 100755..100644 --- a/source/blender/editors/io/io_ops.c +++ b/source/blender/editors/io/io_ops.c diff --git a/source/blender/editors/io/io_ops.h b/source/blender/editors/io/io_ops.h index dd494eb77eb..dd494eb77eb 100755..100644 --- a/source/blender/editors/io/io_ops.h +++ b/source/blender/editors/io/io_ops.h diff --git a/source/blender/editors/space_api/SConscript b/source/blender/editors/space_api/SConscript index 6bf901cf8ad..9b818b074ba 100644 --- a/source/blender/editors/space_api/SConscript +++ b/source/blender/editors/space_api/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenlib ../../blenkernel ../../blenloader ../../makesdna' +incs = '../include ../io ../../blenlib ../../blenkernel ../../blenloader ../../makesdna' incs += ' ../../windowmanager ../../python ../../makesrna ../../bmesh' incs += ' #/intern/guardedalloc #/extern/glew/include' |