[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11113] branches/soc-2007-maike: GLEW integration

[Miguel Torres Lima]

Revision: 11113
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11113
Author:   maike
Date:     2007-06-28 20:35:42 +0200 (Thu, 28 Jun 2007)

Log Message:
-----------
GLEW integration

Modified Paths:
--------------
    branches/soc-2007-maike/source/blender/src/Makefile
    branches/soc-2007-maike/source/blender/src/SConscript
    branches/soc-2007-maike/source/nan_definitions.mk
    branches/soc-2007-maike/tools/btools.py

Modified: branches/soc-2007-maike/source/blender/src/Makefile
===================================================================
--- branches/soc-2007-maike/source/blender/src/Makefile	2007-06-28 18:34:27 UTC (rev 11112)
+++ branches/soc-2007-maike/source/blender/src/Makefile	2007-06-28 18:35:42 UTC (rev 11113)
@@ -86,6 +86,7 @@
 CPPFLAGS += -I$(NAN_DECIMATION)/include
 CPPFLAGS += -I$(NAN_BSP)/include
 CPPFLAGS += -I$(NAN_OPENNL)/include
+CPPFLAGS += -I$(NAN_GLEW)/include
 
 CPPFLAGS += -I../readstreamglue
 CPPFLAGS += -I../include

Modified: branches/soc-2007-maike/source/blender/src/SConscript
===================================================================
--- branches/soc-2007-maike/source/blender/src/SConscript	2007-06-28 18:34:27 UTC (rev 11112)
+++ branches/soc-2007-maike/source/blender/src/SConscript	2007-06-28 18:35:42 UTC (rev 11113)
@@ -24,7 +24,7 @@
 incs += ' #/intern/decimation/extern ../blenloader ../python'
 incs += ' ../../kernel/gen_system #/intern/SoundSystem ../readstreamglue ../nodes'
 incs += ' ../quicktime #/intern/elbeem/extern'
-incs += ' #/intern/ghost #/intern/opennl/extern'
+incs += ' #/intern/ghost #/intern/opennl/extern #/extern/glew/include'
 
 
 incs += ' ' + env['BF_PYTHON_INC']

Modified: branches/soc-2007-maike/source/nan_definitions.mk
===================================================================
--- branches/soc-2007-maike/source/nan_definitions.mk	2007-06-28 18:34:27 UTC (rev 11112)
+++ branches/soc-2007-maike/source/nan_definitions.mk	2007-06-28 18:35:42 UTC (rev 11113)
@@ -94,6 +94,7 @@
     export NAN_OPENNL ?= $(LCGDIR)/opennl
     export NAN_ELBEEM ?= $(LCGDIR)/elbeem
     export NAN_SUPERLU ?= $(LCGDIR)/superlu
+	export NAN_GLEW ?= $(LCGDIR)/glew
     ifeq ($(FREE_WINDOWS), true)
       export NAN_FTGL ?= $(LCGDIR)/gcc/ftgl
       export NAN_FFMPEG ?= $(LCGDIR)/gcc/ffmpeg

Modified: branches/soc-2007-maike/tools/btools.py
===================================================================
--- branches/soc-2007-maike/tools/btools.py	2007-06-28 18:34:27 UTC (rev 11112)
+++ branches/soc-2007-maike/tools/btools.py	2007-06-28 18:35:42 UTC (rev 11113)
@@ -37,7 +37,7 @@
             'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH',
             'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC', 'BF_OPENGL_LINKFLAGS',
             'WITH_BF_FTGL', 'BF_FTGL', 'BF_FTGL_INC', 'BF_FTGL_LIB',
-            'WITH_BF_FFMPEG',
+            'WITH_BF_FFMPEG', 'BF_GLEW', 'BF_GLEW_INC', 'BF_GLEW_LIB',
             'WITH_BF_PLAYER',
             'CFLAGS', 'CCFLAGS', 'CPPFLAGS', 
             'REL_CFLAGS', 'REL_CCFLAGS',
@@ -255,6 +255,10 @@
         ('BF_OPENGL_LIBPATH', 'OpenGL library path', ''),
         ('BF_OPENGL_LIB_STATIC', 'OpenGL static libraries', ''),
         ('BF_OPENGL_LINKFLAGS', 'OpenGL link flags', ''),
+
+        ('BF_GLEW', 'GLEW base dir', ''),
+        ('BF_GLEW_INC', 'GLEW include path', ''),
+        ('BF_GLEW_LIB', 'GLEW library', ''),
         
         (BoolOption('WITH_BF_FTGL', 'Use FTGL if true', 'true')),
         ('BF_FTGL', 'FTGL base path', ''),