Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwin Coumans <blender@erwincoumans.com>2006-01-08 12:37:15 +0300
committerErwin Coumans <blender@erwincoumans.com>2006-01-08 12:37:15 +0300
commitc94455c14d28221f6e05f33ba42e23a5d3245a28 (patch)
tree733dfaccbbcd71cf66e2d33b1868f64f78189eeb
parent88a8508b347dda050557e72dfad105023e5095aa (diff)
more linux game engine work. hopefully works now!
-rw-r--r--SConstruct2
-rwxr-xr-xsource/gameengine/Converter/SConscript5
-rw-r--r--source/gameengine/Ketsji/BL_Material.cpp (renamed from source/gameengine/Converter/BL_Material.cpp)0
-rw-r--r--source/gameengine/Ketsji/BL_Material.h (renamed from source/gameengine/Converter/BL_Material.h)0
-rw-r--r--source/gameengine/Ketsji/BL_Shader.cpp (renamed from source/gameengine/Converter/BL_Shader.cpp)0
-rw-r--r--source/gameengine/Ketsji/BL_Shader.h (renamed from source/gameengine/Converter/BL_Shader.h)0
-rw-r--r--source/gameengine/Ketsji/BL_Texture.cpp (renamed from source/gameengine/Converter/BL_Texture.cpp)0
-rw-r--r--source/gameengine/Ketsji/BL_Texture.h (renamed from source/gameengine/Converter/BL_Texture.h)0
-rw-r--r--source/gameengine/Ketsji/KX_PythonInit.cpp2
-rw-r--r--source/gameengine/Ketsji/SConscript5
10 files changed, 7 insertions, 7 deletions
diff --git a/SConstruct b/SConstruct
index 963d76b68c5..e998ef82ebd 100644
--- a/SConstruct
+++ b/SConstruct
@@ -63,7 +63,7 @@ env = Environment (ENV = os.environ)
if sys.platform == 'linux2' or sys.platform == 'linux-i386':
use_international = 'true'
- use_gameengine = 'false'
+ use_gameengine = 'true'
use_openal = 'false'
use_fmod = 'false'
use_quicktime = 'false'
diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript
index 65b3d9d0a9d..361aeed4120 100755
--- a/source/gameengine/Converter/SConscript
+++ b/source/gameengine/Converter/SConscript
@@ -18,10 +18,7 @@ source_files = ['KX_IpoConvert.cpp',
'BL_DeformableGameObject.cpp',
'BL_BlenderDataConversion.cpp',
'BL_ArmatureObject.cpp',
- 'BL_ActionActuator.cpp',
- 'BL_Material.cpp',
- 'BL_Texture.cpp',
- 'BL_Shader.cpp'
+ 'BL_ActionActuator.cpp'
]
kx_converter_env.Append (CPPPATH = ['.',
diff --git a/source/gameengine/Converter/BL_Material.cpp b/source/gameengine/Ketsji/BL_Material.cpp
index b77750c1644..b77750c1644 100644
--- a/source/gameengine/Converter/BL_Material.cpp
+++ b/source/gameengine/Ketsji/BL_Material.cpp
diff --git a/source/gameengine/Converter/BL_Material.h b/source/gameengine/Ketsji/BL_Material.h
index a55756addb8..a55756addb8 100644
--- a/source/gameengine/Converter/BL_Material.h
+++ b/source/gameengine/Ketsji/BL_Material.h
diff --git a/source/gameengine/Converter/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp
index ec804228f61..ec804228f61 100644
--- a/source/gameengine/Converter/BL_Shader.cpp
+++ b/source/gameengine/Ketsji/BL_Shader.cpp
diff --git a/source/gameengine/Converter/BL_Shader.h b/source/gameengine/Ketsji/BL_Shader.h
index 19e0cb8e9b3..19e0cb8e9b3 100644
--- a/source/gameengine/Converter/BL_Shader.h
+++ b/source/gameengine/Ketsji/BL_Shader.h
diff --git a/source/gameengine/Converter/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp
index f03bfffc8ec..f03bfffc8ec 100644
--- a/source/gameengine/Converter/BL_Texture.cpp
+++ b/source/gameengine/Ketsji/BL_Texture.cpp
diff --git a/source/gameengine/Converter/BL_Texture.h b/source/gameengine/Ketsji/BL_Texture.h
index 51bf7270d2d..51bf7270d2d 100644
--- a/source/gameengine/Converter/BL_Texture.h
+++ b/source/gameengine/Ketsji/BL_Texture.h
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 924bb307da1..e2a11c0035e 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -71,7 +71,7 @@
#include "KX_Scene.h"
#include "SND_DeviceManager.h"
-#include "RAS_OpenGLRasterizer\RAS_GLExtensionManager.h"
+#include "RAS_OpenGLRasterizer/RAS_GLExtensionManager.h"
#include "KX_PyMath.h"
diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript
index 39a74083ff4..1dc5f0f7170 100644
--- a/source/gameengine/Ketsji/SConscript
+++ b/source/gameengine/Ketsji/SConscript
@@ -6,7 +6,10 @@ Import ('library_env')
ketsji_env = library_env.Copy ()
-source_files = ['KX_WorldIpoController.cpp',
+source_files = ['BL_Shader.cpp',
+ 'BL_Material.cpp',
+ 'BL_Texture.cpp',
+ 'KX_WorldIpoController.cpp',
'KX_WorldInfo.cpp',
'KX_VisibilityActuator.cpp',
'KX_VertexProxy.cpp',