From c94455c14d28221f6e05f33ba42e23a5d3245a28 Mon Sep 17 00:00:00 2001
From: Erwin Coumans <blender@erwincoumans.com>
Date: Sun, 8 Jan 2006 09:37:15 +0000
Subject: [PATCH] more linux game engine work. hopefully works now!

---
 SConstruct                                              | 2 +-
 source/gameengine/Converter/SConscript                  | 5 +----
 source/gameengine/{Converter => Ketsji}/BL_Material.cpp | 0
 source/gameengine/{Converter => Ketsji}/BL_Material.h   | 0
 source/gameengine/{Converter => Ketsji}/BL_Shader.cpp   | 0
 source/gameengine/{Converter => Ketsji}/BL_Shader.h     | 0
 source/gameengine/{Converter => Ketsji}/BL_Texture.cpp  | 0
 source/gameengine/{Converter => Ketsji}/BL_Texture.h    | 0
 source/gameengine/Ketsji/KX_PythonInit.cpp              | 2 +-
 source/gameengine/Ketsji/SConscript                     | 5 ++++-
 10 files changed, 7 insertions(+), 7 deletions(-)
 rename source/gameengine/{Converter => Ketsji}/BL_Material.cpp (100%)
 rename source/gameengine/{Converter => Ketsji}/BL_Material.h (100%)
 rename source/gameengine/{Converter => Ketsji}/BL_Shader.cpp (100%)
 rename source/gameengine/{Converter => Ketsji}/BL_Shader.h (100%)
 rename source/gameengine/{Converter => Ketsji}/BL_Texture.cpp (100%)
 rename source/gameengine/{Converter => Ketsji}/BL_Texture.h (100%)

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
similarity index 100%
rename from source/gameengine/Converter/BL_Material.cpp
rename to source/gameengine/Ketsji/BL_Material.cpp
diff --git a/source/gameengine/Converter/BL_Material.h b/source/gameengine/Ketsji/BL_Material.h
similarity index 100%
rename from source/gameengine/Converter/BL_Material.h
rename to source/gameengine/Ketsji/BL_Material.h
diff --git a/source/gameengine/Converter/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp
similarity index 100%
rename from source/gameengine/Converter/BL_Shader.cpp
rename to source/gameengine/Ketsji/BL_Shader.cpp
diff --git a/source/gameengine/Converter/BL_Shader.h b/source/gameengine/Ketsji/BL_Shader.h
similarity index 100%
rename from source/gameengine/Converter/BL_Shader.h
rename to source/gameengine/Ketsji/BL_Shader.h
diff --git a/source/gameengine/Converter/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp
similarity index 100%
rename from source/gameengine/Converter/BL_Texture.cpp
rename to source/gameengine/Ketsji/BL_Texture.cpp
diff --git a/source/gameengine/Converter/BL_Texture.h b/source/gameengine/Ketsji/BL_Texture.h
similarity index 100%
rename from source/gameengine/Converter/BL_Texture.h
rename to 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',