[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29621] trunk/blender/source/blender/ editors/armature: Update build systems for automatic weighting changes.
Brecht Van Lommel
brecht at blender.org
Tue Jun 22 17:12:00 CEST 2010
Revision: 29621
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29621
Author: blendix
Date: 2010-06-22 17:12:00 +0200 (Tue, 22 Jun 2010)
Log Message:
-----------
Update build systems for automatic weighting changes.
(merge from render25 branch)
Modified Paths:
--------------
trunk/blender/source/blender/editors/armature/CMakeLists.txt
trunk/blender/source/blender/editors/armature/Makefile
trunk/blender/source/blender/editors/armature/SConscript
Modified: trunk/blender/source/blender/editors/armature/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/armature/CMakeLists.txt 2010-06-22 15:10:57 UTC (rev 29620)
+++ trunk/blender/source/blender/editors/armature/CMakeLists.txt 2010-06-22 15:12:00 UTC (rev 29621)
@@ -27,7 +27,6 @@
../../blenlib
../../makesdna
../../makesrna
- ../../render/extern/include
../../windowmanager
../../../../intern/guardedalloc
../../../../intern/opennl/extern
Modified: trunk/blender/source/blender/editors/armature/Makefile
===================================================================
--- trunk/blender/source/blender/editors/armature/Makefile 2010-06-22 15:10:57 UTC (rev 29620)
+++ trunk/blender/source/blender/editors/armature/Makefile 2010-06-22 15:12:00 UTC (rev 29621)
@@ -50,7 +50,6 @@
CPPFLAGS += -I../../python
CPPFLAGS += -I../../gpu
CPPFLAGS += -I../../makesrna
-CPPFLAGS += -I../../render/extern/include
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
# own include
Modified: trunk/blender/source/blender/editors/armature/SConscript
===================================================================
--- trunk/blender/source/blender/editors/armature/SConscript 2010-06-22 15:10:57 UTC (rev 29620)
+++ trunk/blender/source/blender/editors/armature/SConscript 2010-06-22 15:12:00 UTC (rev 29621)
@@ -5,7 +5,6 @@
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../render/extern/include'
incs += ' ../../gpu ../../makesrna #/intern/opennl/extern'
if env['OURPLATFORM'] == 'linux2':
More information about the Bf-blender-cvs
mailing list