Revision: 48025
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48025
Author: nazgul
Date: 2012-06-18 09:20:49 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
Fix compilation error for SCons
Was missed some scons rules after recent collada changes
Modified Paths:
--------------
trunk/blender/source/blender/editors/SConscript
trunk/blender/source/blender/editors/io/CMakeLists.txt
trunk/blender/source/blender/editors/io/io_collada.h
trunk/blender/source/blender/editors/io/io_ops.c
trunk/blender/source/blender/editors/io/io_ops.h
trunk/blender/source/blender/editors/space_api/SConscript
Added Paths:
-----------
trunk/blender/source/blender/editors/io/SConscript
Property Changed:
----------------
trunk/blender/source/blender/editors/io/CMakeLists.txt
trunk/blender/source/blender/editors/io/io_collada.h
trunk/blender/source/blender/editors/io/io_ops.c
trunk/blender/source/blender/editors/io/io_ops.h
Modified: trunk/blender/source/blender/editors/SConscript
===================================================================
--- trunk/blender/source/blender/editors/SConscript 2012-06-18 05:32:44 UTC
(rev 48024)
+++ trunk/blender/source/blender/editors/SConscript 2012-06-18 09:20:49 UTC
(rev 48025)
@@ -6,6 +6,7 @@
'space_api/SConscript',
'util/SConscript',
'interface/SConscript',
+ 'io/SConscript',
'animation/SConscript',
'armature/SConscript',
'mask/SConscript',
Modified: trunk/blender/source/blender/editors/io/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/io/CMakeLists.txt 2012-06-18
05:32:44 UTC (rev 48024)
+++ trunk/blender/source/blender/editors/io/CMakeLists.txt 2012-06-18
09:20:49 UTC (rev 48025)
@@ -33,10 +33,10 @@
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)
Property changes on: trunk/blender/source/blender/editors/io/CMakeLists.txt
___________________________________________________________________
Deleted: svn:executable
- *
Added: trunk/blender/source/blender/editors/io/SConscript
===================================================================
--- trunk/blender/source/blender/editors/io/SConscript
(rev 0)
+++ trunk/blender/source/blender/editors/io/SConscript 2012-06-18 09:20:49 UTC
(rev 48025)
@@ -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] )
Property changes on: trunk/blender/source/blender/editors/io/io_collada.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/blender/source/blender/editors/io/io_ops.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/blender/source/blender/editors/io/io_ops.h
___________________________________________________________________
Deleted: svn:executable
- *
Modified: trunk/blender/source/blender/editors/space_api/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_api/SConscript 2012-06-18
05:32:44 UTC (rev 48024)
+++ trunk/blender/source/blender/editors/space_api/SConscript 2012-06-18
09:20:49 UTC (rev 48025)
@@ -3,7 +3,7 @@
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'
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
