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