[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31054] branches/soc-2010-nicolasbishop: = = Ptex ==

[Nicholas Bishop]

Revision: 31054
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31054
Author:   nicholasbishop
Date:     2010-08-05 03:42:34 +0200 (Thu, 05 Aug 2010)

Log Message:
-----------
== Ptex ==

Hopefully fixes building with scons

Modified Paths:
--------------
    branches/soc-2010-nicolasbishop/extern/SConscript
    branches/soc-2010-nicolasbishop/source/blender/blenloader/SConscript
    branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/SConscript
    branches/soc-2010-nicolasbishop/source/blender/gpu/SConscript

Modified: branches/soc-2010-nicolasbishop/extern/SConscript
===================================================================
--- branches/soc-2010-nicolasbishop/extern/SConscript	2010-08-05 00:53:02 UTC (rev 31053)
+++ branches/soc-2010-nicolasbishop/extern/SConscript	2010-08-05 01:42:34 UTC (rev 31054)
@@ -3,6 +3,7 @@
 Import('env')
 
 SConscript(['glew/SConscript'])
+SConscript(['ptex/SConscript'])
 
 if env['WITH_BF_BULLET']:
     SConscript(['bullet2/src/SConscript'])

Modified: branches/soc-2010-nicolasbishop/source/blender/blenloader/SConscript
===================================================================
--- branches/soc-2010-nicolasbishop/source/blender/blenloader/SConscript	2010-08-05 00:53:02 UTC (rev 31053)
+++ branches/soc-2010-nicolasbishop/source/blender/blenloader/SConscript	2010-08-05 01:42:34 UTC (rev 31054)
@@ -6,6 +6,7 @@
 incs = '. #/intern/guardedalloc ../blenlib ../blenkernel'
 incs += ' ../makesdna ../readblenfile ../editors/include'
 incs += ' ../render/extern/include ../makesrna'
+incs += ' #/extern/ptex'
 
 incs += ' ' + env['BF_ZLIB_INC']
 

Modified: branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/SConscript
===================================================================
--- branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/SConscript	2010-08-05 00:53:02 UTC (rev 31053)
+++ branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/SConscript	2010-08-05 01:42:34 UTC (rev 31054)
@@ -9,6 +9,7 @@
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../render/extern/include'
 incs += ' ../../gpu ../../makesrna'
+incs += ' #/extern/ptex'
 
 if env['OURPLATFORM'] == 'linux2':
 	cflags='-pthread'

Modified: branches/soc-2010-nicolasbishop/source/blender/gpu/SConscript
===================================================================
--- branches/soc-2010-nicolasbishop/source/blender/gpu/SConscript	2010-08-05 00:53:02 UTC (rev 31053)
+++ branches/soc-2010-nicolasbishop/source/blender/gpu/SConscript	2010-08-05 01:42:34 UTC (rev 31054)
@@ -7,6 +7,7 @@
 
 incs = '../blenlib ../blenkernel ../makesdna ../include'
 incs += ' #/extern/glew/include #intern/guardedalloc #intern/smoke/extern ../imbuf .'
+incs += ' #/extern/ptex'
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']