[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55651] trunk/blender/source/blender/ collada/SConscript: scon update for new collada libraries

Gaia Clary gaia.clary at machinimatrix.org
Thu Mar 28 19:04:07 CET 2013


Revision: 55651
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55651
Author:   gaiaclary
Date:     2013-03-28 18:04:07 +0000 (Thu, 28 Mar 2013)
Log Message:
-----------
scon update for new collada libraries

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

Modified: trunk/blender/source/blender/collada/SConscript
===================================================================
--- trunk/blender/source/blender/collada/SConscript	2013-03-28 18:03:01 UTC (rev 55650)
+++ trunk/blender/source/blender/collada/SConscript	2013-03-28 18:04:07 UTC (rev 55651)
@@ -47,22 +47,13 @@
     '../bmesh',
     '#/intern/guardedalloc',
 ]
-if  env['OURPLATFORM']=='darwin':
-    incs += [
-        env['BF_OPENCOLLADA_INC'] + '/COLLADAStreamWriter',
-        env['BF_OPENCOLLADA_INC'] + '/COLLADABaseUtils',
-        env['BF_OPENCOLLADA_INC'] + '/COLLADAFramework',
-        env['BF_OPENCOLLADA_INC'] + '/COLLADASaxFrameworkLoader',
-        env['BF_OPENCOLLADA_INC'] + '/GeneratedSaxParser',
-    ]
-else:
-    incs += [
-        env['BF_OPENCOLLADA_INC'] + '/COLLADAStreamWriter/include',
-        env['BF_OPENCOLLADA_INC'] + '/COLLADABaseUtils/include',
-        env['BF_OPENCOLLADA_INC'] + '/COLLADAFramework/include',
-        env['BF_OPENCOLLADA_INC'] + '/COLLADASaxFrameworkLoader/include',
-        env['BF_OPENCOLLADA_INC'] + '/GeneratedSaxParser/include',
-    ]
+incs += [
+    env['BF_OPENCOLLADA_INC'] + '/COLLADAStreamWriter',
+    env['BF_OPENCOLLADA_INC'] + '/COLLADABaseUtils',
+    env['BF_OPENCOLLADA_INC'] + '/COLLADAFramework',
+    env['BF_OPENCOLLADA_INC'] + '/COLLADASaxFrameworkLoader',
+    env['BF_OPENCOLLADA_INC'] + '/GeneratedSaxParser',
+]
 
 if env['BF_BUILDINFO']:
     defs.append('WITH_BUILDINFO')




More information about the Bf-blender-cvs mailing list