Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-06-18 13:20:49 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-06-18 13:20:49 +0400
commit54022cfa1c5c3274ecd320359169a389bfef55c6 (patch)
treee50a9d0b2cae698396c81d8561d0cb565fe29af7 /source/blender/editors/io
parente60adbb57d773d3126a4ea53d7c4a453b1daf66b (diff)
Fix compilation error for SCons
Was missed some scons rules after recent collada changes
Diffstat (limited to 'source/blender/editors/io')
-rw-r--r--[-rwxr-xr-x]source/blender/editors/io/CMakeLists.txt8
-rw-r--r--source/blender/editors/io/SConscript11
-rw-r--r--[-rwxr-xr-x]source/blender/editors/io/io_collada.h0
-rw-r--r--[-rwxr-xr-x]source/blender/editors/io/io_ops.c0
-rw-r--r--[-rwxr-xr-x]source/blender/editors/io/io_ops.h0
5 files changed, 15 insertions, 4 deletions
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