From 54022cfa1c5c3274ecd320359169a389bfef55c6 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 18 Jun 2012 09:20:49 +0000 Subject: Fix compilation error for SCons Was missed some scons rules after recent collada changes --- source/blender/editors/io/CMakeLists.txt | 8 ++++---- source/blender/editors/io/SConscript | 11 +++++++++++ source/blender/editors/io/io_collada.h | 0 source/blender/editors/io/io_ops.c | 0 source/blender/editors/io/io_ops.h | 0 5 files changed, 15 insertions(+), 4 deletions(-) mode change 100755 => 100644 source/blender/editors/io/CMakeLists.txt create mode 100644 source/blender/editors/io/SConscript mode change 100755 => 100644 source/blender/editors/io/io_collada.h mode change 100755 => 100644 source/blender/editors/io/io_ops.c mode change 100755 => 100644 source/blender/editors/io/io_ops.h (limited to 'source/blender/editors/io') diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt old mode 100755 new mode 100644 index ceefb7f8a47..0c417c5dfb9 --- 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 old mode 100755 new mode 100644 diff --git a/source/blender/editors/io/io_ops.c b/source/blender/editors/io/io_ops.c old mode 100755 new mode 100644 diff --git a/source/blender/editors/io/io_ops.h b/source/blender/editors/io/io_ops.h old mode 100755 new mode 100644 -- cgit v1.2.3