[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53967] trunk/blender/source/blender/ collada/SConscript: Fix compile with collada enabled

[jens verwiebe]

Revision: 53967
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53967
Author:   jensverwiebe
Date:     2013-01-21 17:38:11 +0000 (Mon, 21 Jan 2013)
Log Message:
-----------
Fix compile with collada enabled

Modified Paths:
--------------
    trunk/blender/source/blender/collada/SConscript

Modified: trunk/blender/source/blender/collada/SConscript
===================================================================
--- trunk/blender/source/blender/collada/SConscript     2013-01-21 17:25:08 UTC 
(rev 53966)
+++ trunk/blender/source/blender/collada/SConscript     2013-01-21 17:38:11 UTC 
(rev 53967)
@@ -33,9 +33,9 @@
 # TODO sanitize inc path building
 # relative paths to include dirs, space-separated, string
 if  env['OURPLATFORM']=='darwin':
-    incs = '../blenlib ../blenkernel ../windowmanager ../blenloader 
../makesdna ../makesrna ../editors/include ../imbuf 
../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter 
[OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework 
[OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser 
'.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
+    incs = '../ikplugin ../../../intern/iksolver/extern ../blenlib 
../blenkernel ../windowmanager ../blenloader ../makesdna ../makesrna 
../editors/include ../imbuf ../../../intern/guardedalloc 
[OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils 
[OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader 
[OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', 
env['BF_OPENCOLLADA_INC'])
 else:
-    incs = '../blenlib ../blenkernel ../windowmanager ../makesdna 
../blenloader ../makesrna ../editors/include ../imbuf 
../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include 
[OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include 
[OPENCOLLADA]/COLLADASaxFrameworkLoader/include 
[OPENCOLLADA]/GeneratedSaxParser/include '.replace('[OPENCOLLADA]', 
env['BF_OPENCOLLADA_INC'])
+    incs = '../ikplugin ../../../intern/iksolver/extern ../blenlib 
../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna 
../editors/include ../imbuf ../../../intern/guardedalloc 
[OPENCOLLADA]/COLLADAStreamWriter/include 
[OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include 
[OPENCOLLADA]/COLLADASaxFrameworkLoader/include 
[OPENCOLLADA]/GeneratedSaxParser/include '.replace('[OPENCOLLADA]', 
env['BF_OPENCOLLADA_INC'])
 
 if env['BF_BUILDINFO']:
     defs.append('WITH_BUILDINFO')

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs