Tree - rpms/blender - src.fedoraproject.org

eclipseo / rpms / blender

Forked from rpms/blender 17 days ago
Files

Commit: d6e5b998293dd25c7d8da57d60f512650e3e0713
Blob Blame History Raw
diff -up blender/intern/ghost/SConscript.ext blender/intern/ghost/SConscript
--- blender/intern/ghost/SConscript.ext	2011-03-30 18:27:34.017803998 +0200
+++ blender/intern/ghost/SConscript	2011-03-30 18:27:34.020804004 +0200
@@ -60,7 +60,7 @@ else:
 if env['BF_GHOST_DEBUG']:
     defs.append('BF_GHOST_DEBUG')
 
-incs = '. ../string #extern/glew/include #source/blender/imbuf #source/blender/makesdna ' + env['BF_OPENGL_INC']
+incs = '. ../string  #source/blender/imbuf #source/blender/makesdna ' + env['BF_OPENGL_INC']
 if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'):
     incs = env['BF_WINTAB_INC'] + ' ' + incs
 
diff -up blender/source/blender/editors/include/BIF_gl.h.ext blender/source/blender/editors/include/BIF_gl.h
--- blender/source/blender/editors/include/BIF_gl.h.ext	2011-03-30 18:45:25.993804002 +0200
+++ blender/source/blender/editors/include/BIF_gl.h	2011-03-30 18:45:53.857803973 +0200
@@ -35,7 +35,7 @@
 #ifndef BIF_GL_H
 #define BIF_GL_H
 
-#include "../../../../extern/glew/include/GL/glew.h"
+#include <GL/glew.h>
 
 	/*
 	 * these should be phased out. cpack should be replaced in
diff -up blender/source/blender/editors/space_console/SConscript.ext blender/source/blender/editors/space_console/SConscript
--- blender/source/blender/editors/space_console/SConscript.ext	2011-03-30 18:27:31.117804004 +0200
+++ blender/source/blender/editors/space_console/SConscript	2011-03-30 18:27:31.119804004 +0200
@@ -6,7 +6,7 @@ defs = []
 
 incs = [
     '../include',
-    '#extern/glew/include',
+    '',
     '#/intern/guardedalloc',
     '../../makesdna',
     '../../makesrna',
diff -up blender/source/blender/editors/space_node/SConscript.ext blender/source/blender/editors/space_node/SConscript
--- blender/source/blender/editors/space_node/SConscript.ext	2011-03-30 18:27:31.558804005 +0200
+++ blender/source/blender/editors/space_node/SConscript	2011-03-30 18:27:31.561804000 +0200
@@ -5,7 +5,7 @@ sources = env.Glob('*.c')
 
 incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
 incs += ' ../../nodes ../../render/extern/include ../../blenloader'
-incs += ' ../../windowmanager #intern/guardedalloc #extern/glew/include'
+incs += ' ../../windowmanager #intern/guardedalloc '
 defs = []
 cf = []
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
diff -up blender/source/blender/python/SConscript.ext blender/source/blender/python/SConscript
--- blender/source/blender/python/SConscript.ext	2011-03-30 18:27:30.524804012 +0200
+++ blender/source/blender/python/SConscript	2011-03-30 18:27:30.526804007 +0200
@@ -6,7 +6,7 @@ Import ('env')
 
 incs = '. ../editors/include ../makesdna ../makesrna ../blenlib ../blenkernel ../nodes'
 incs += ' ../imbuf ../blenloader ../render/extern/include ../windowmanager'
-incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include'
+incs += ' #intern/guardedalloc #intern/memutil '
 incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC']
 
 is_debug = (env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG'])
diff -up blender/source/gameengine/BlenderRoutines/SConscript.ext blender/source/gameengine/BlenderRoutines/SConscript
--- blender/source/gameengine/BlenderRoutines/SConscript.ext	2011-03-30 18:27:33.144804003 +0200
+++ blender/source/gameengine/BlenderRoutines/SConscript	2011-03-30 18:27:33.147804000 +0200
@@ -19,7 +19,7 @@ incs += ' #source/gameengine/SceneGraph 
 incs += ' #source/gameengine/Physics/Bullet'
 incs += ' #source/gameengine/Network/LoopBackNetwork'
 incs += ' #source/blender/misc #source/blender/blenloader'
-incs += ' #extern/glew/include #source/blender/gpu'
+incs += '  #source/blender/gpu'
 incs += ' #source/blender/windowmanager'
 
 if env['WITH_BF_FFMPEG']:
diff -up blender/source/gameengine/GamePlayer/common/SConscript.ext blender/source/gameengine/GamePlayer/common/SConscript
--- blender/source/gameengine/GamePlayer/common/SConscript.ext	2011-03-30 18:27:33.226804023 +0200
+++ blender/source/gameengine/GamePlayer/common/SConscript	2011-03-30 18:27:33.228804012 +0200
@@ -43,7 +43,7 @@ incs = ['.',
         '#source/blender/misc',
         '#source/blender/blenloader',
         '#source/blender/gpu',
-        '#extern/glew/include']
+        '']
 
 defs = [ 'GLEW_STATIC' ]
 
diff -up blender/source/gameengine/GamePlayer/ghost/SConscript.ext blender/source/gameengine/GamePlayer/ghost/SConscript
--- blender/source/gameengine/GamePlayer/ghost/SConscript.ext	2011-03-30 18:27:33.182804003 +0200
+++ blender/source/gameengine/GamePlayer/ghost/SConscript	2011-03-30 18:27:33.184804003 +0200
@@ -39,7 +39,7 @@ incs = ['.',
         '#source/blender/misc',
         '#source/blender/blenloader',
         '#source/blender/gpu',
-        '#extern/glew/include']
+        '']
 
 defs = [ 'GLEW_STATIC' ]
 
diff -up blender/source/gameengine/Ketsji/SConscript.ext blender/source/gameengine/Ketsji/SConscript
--- blender/source/gameengine/Ketsji/SConscript.ext	2011-03-30 18:27:33.077804003 +0200
+++ blender/source/gameengine/Ketsji/SConscript	2011-03-30 18:27:33.080804004 +0200
@@ -18,7 +18,7 @@ incs += ' #source/blender/makesdna #sour
 incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions #source/gameengine/Network'
 incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common'
 incs += ' #source/gameengine/Physics/Dummy'
-incs += ' #source/blender/misc #source/blender/blenloader #extern/glew/include #source/blender/gpu'
+incs += ' #source/blender/misc #source/blender/blenloader  #source/blender/gpu'
 
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_OPENGL_INC']
diff -up blender/source/gameengine/Physics/Bullet/SConscript.ext blender/source/gameengine/Physics/Bullet/SConscript
--- blender/source/gameengine/Physics/Bullet/SConscript.ext	2011-03-30 18:27:32.884804005 +0200
+++ blender/source/gameengine/Physics/Bullet/SConscript	2011-03-30 18:27:32.886804004 +0200
@@ -7,7 +7,7 @@ incs = '. ../common'
 incs += ' #source/kernel/gen_system'
 incs += ' #intern/string'
 incs += ' #intern/moto/include'
-incs += ' #extern/glew/include'
+incs += ' '
 incs += ' #source/gameengine/Rasterizer'
 incs += ' #source/gameengine/Ketsji'
 incs += ' #source/gameengine/Expressions'
diff -up blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript.ext blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
--- blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript.ext	2011-03-30 18:27:33.559804003 +0200
+++ blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript	2011-03-30 18:27:33.562804001 +0200
@@ -6,7 +6,7 @@ sources = env.Glob('*.cpp')
 defs = [ 'GLEW_STATIC' ]
 
 incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/Rasterizer #source/gameengine/BlenderRoutines '
-incs += ' #source/blender/gpu #extern/glew/include ' + env['BF_OPENGL_INC']
+incs += ' #source/blender/gpu  ' + env['BF_OPENGL_INC']
 incs += ' #source/blender/gameengine/Ketsji #source/gameengine/SceneGraph #source/blender/makesdna #source/blender/blenkernel'
 incs += ' #intern/guardedalloc #source/blender/blenlib'
 
diff -up blender/source/gameengine/Rasterizer/SConscript.ext blender/source/gameengine/Rasterizer/SConscript
--- blender/source/gameengine/Rasterizer/SConscript.ext	2011-03-30 18:27:33.505804004 +0200
+++ blender/source/gameengine/Rasterizer/SConscript	2011-03-30 18:27:33.507804003 +0200
@@ -4,7 +4,7 @@ Import ('env')
 sources = env.Glob('*.cpp')
 
 
-incs = '. #intern/guardedalloc #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/BlenderRoutines #extern/glew/include #source/gameengine/Expressions #source/gameengine/SceneGraph #source/blender/blenkernel #source/blender/makesdna'
+incs = '. #intern/guardedalloc #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/BlenderRoutines  #source/gameengine/Expressions #source/gameengine/SceneGraph #source/blender/blenkernel #source/blender/makesdna'
 
 defs = [ 'GLEW_STATIC' ]
 
diff -up blender/source/gameengine/VideoTexture/SConscript.ext blender/source/gameengine/VideoTexture/SConscript
--- blender/source/gameengine/VideoTexture/SConscript.ext	2011-03-30 18:27:33.112804003 +0200
+++ blender/source/gameengine/VideoTexture/SConscript	2011-03-30 18:27:33.114804003 +0200
@@ -12,7 +12,7 @@ incs += ' #source/gameengine/BlenderRout
 incs += ' #source/blender/editors/include #source/blender/blenlib #source/blender/blenkernel'
 incs += ' #source/blender/makesdna #source/blender/imbuf #source/blender/python #source/blender/python/generic'
 incs += ' #source/blender/gpu #source/kernel/gen_system #intern/string #intern/moto/include'
-incs += ' #intern/guardedalloc #extern/glew/include'
+incs += ' #intern/guardedalloc '
 
 defs = [] 
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc','win32-mingw'):
eclipseo / rpms / blender

Source Code

Files
