Index: trunk/Extensions/Terrain/Source/terrain.cpp
===================================================================
--- trunk/Extensions/Terrain/Source/terrain.cpp	(Revision 298)
+++ trunk/Extensions/Terrain/Source/terrain.cpp	(Arbeitskopie)
@@ -19,6 +19,7 @@
 
 #include "utDebug.h"
 
+#include <cstring>
 
 namespace Horde3DTerrain
 {
Index: trunk/Extensions/Terrain/Sample/Content/terrains/terrain1/terrain1.scene.xml
===================================================================
--- trunk/Extensions/Terrain/Sample/Content/terrains/terrain1/terrain1.scene.xml	(Revision 298)
+++ trunk/Extensions/Terrain/Sample/Content/terrains/terrain1/terrain1.scene.xml	(Arbeitskopie)
@@ -1,2 +1,2 @@
-<Terrain name="Terrain1" sx="1024.0" sy="300.0" sz="1024.0" heightmap="terrains/terrain1/heightmap.tga" material="terrains/terrain1/terrain1.material.xml" />
+<Terrain name="Terrain1" sx="4196.0" sy="300.0" sz="4196.0" heightmap="terrains/terrain1/Terrain.png" material="terrains/terrain1/terrain1.material.xml" />
 
Index: trunk/Extensions/Terrain/Sample/Content/terrains/terrain1/terrain1.material.xml
===================================================================
--- trunk/Extensions/Terrain/Sample/Content/terrains/terrain1/terrain1.material.xml	(Revision 298)
+++ trunk/Extensions/Terrain/Sample/Content/terrains/terrain1/terrain1.material.xml	(Arbeitskopie)
@@ -1,7 +1,7 @@
 <Material>
 	<Shader source="shaders/terrain.shader"/>
 	
-	<Sampler name="heightNormMap" map="terrains/terrain1/heightmap.tga" allowCompression="false" />
+	<Sampler name="heightNormMap" map="terrains/terrain1/Terrain.png" allowCompression="false" />
 	<Sampler name="detailMap" map="terrains/terrain1/detail.jpg" />
 	
 	<Uniform name="sunDir" a="1.0" b="-1.0" c="0.0" />
Index: trunk/Horde3D/Source/Shared/utXML.h
===================================================================
--- trunk/Horde3D/Source/Shared/utXML.h	(Revision 298)
+++ trunk/Horde3D/Source/Shared/utXML.h	(Arbeitskopie)
@@ -20,6 +20,7 @@
 
 #include <stdio.h>
 #include "rapidxml.h"
+#include <cstring>
 
 
 inline void rapidxml::parse_error_handler( const char *what, void *where )
Index: trunk/Horde3D/Source/Horde3DEngine/egGeometry.cpp
===================================================================
--- trunk/Horde3D/Source/Horde3DEngine/egGeometry.cpp	(Revision 298)
+++ trunk/Horde3D/Source/Horde3DEngine/egGeometry.cpp	(Arbeitskopie)
@@ -19,6 +19,7 @@
 
 #include "utDebug.h"
 
+#include <cstring>
 
 namespace Horde3D {
 
Index: trunk/Horde3D/Source/Horde3DEngine/egMaterial.cpp
===================================================================
--- trunk/Horde3D/Source/Horde3DEngine/egMaterial.cpp	(Revision 298)
+++ trunk/Horde3D/Source/Horde3DEngine/egMaterial.cpp	(Arbeitskopie)
@@ -18,6 +18,7 @@
 
 #include "utDebug.h"
 
+#include <cstring>
 
 namespace Horde3D {
 
Index: trunk/Horde3D/Source/Horde3DEngine/egModel.cpp
===================================================================
--- trunk/Horde3D/Source/Horde3DEngine/egModel.cpp	(Revision 298)
+++ trunk/Horde3D/Source/Horde3DEngine/egModel.cpp	(Arbeitskopie)
@@ -18,7 +18,9 @@
 
 #include "utDebug.h"
 
+#include <cstring>
 
+
 namespace Horde3D {
 
 using namespace std;
Index: trunk/Horde3D/Source/Horde3DEngine/egRenderer.cpp
===================================================================
--- trunk/Horde3D/Source/Horde3DEngine/egRenderer.cpp	(Revision 298)
+++ trunk/Horde3D/Source/Horde3DEngine/egRenderer.cpp	(Arbeitskopie)
@@ -20,6 +20,7 @@
 
 #include "utDebug.h"
 
+#include <cstring>
 
 namespace Horde3D {
 
Index: trunk/Horde3D/Source/Horde3DEngine/egShader.cpp
===================================================================
--- trunk/Horde3D/Source/Horde3DEngine/egShader.cpp	(Revision 298)
+++ trunk/Horde3D/Source/Horde3DEngine/egShader.cpp	(Arbeitskopie)
@@ -18,6 +18,7 @@
 
 #include "utDebug.h"
 
+#include <cstring>
 
 namespace Horde3D {
 
Index: trunk/Horde3D/Source/Horde3DEngine/egCamera.cpp
===================================================================
--- trunk/Horde3D/Source/Horde3DEngine/egCamera.cpp	(Revision 298)
+++ trunk/Horde3D/Source/Horde3DEngine/egCamera.cpp	(Arbeitskopie)
@@ -16,6 +16,7 @@
 
 #include "utDebug.h"
 
+#include <cstring>
 
 namespace Horde3D {
 
Index: trunk/Horde3D/Source/Horde3DEngine/egTexture.cpp
===================================================================
--- trunk/Horde3D/Source/Horde3DEngine/egTexture.cpp	(Revision 298)
+++ trunk/Horde3D/Source/Horde3DEngine/egTexture.cpp	(Arbeitskopie)
@@ -18,6 +18,7 @@
 
 #include "utDebug.h"
 
+#include <cstring>
 
 namespace Horde3D {
 
Index: trunk/Horde3D/Samples/glfw/lib/x11/x11_glext.c
===================================================================
--- trunk/Horde3D/Samples/glfw/lib/x11/x11_glext.c	(Revision 298)
+++ trunk/Horde3D/Samples/glfw/lib/x11/x11_glext.c	(Arbeitskopie)
@@ -38,6 +38,7 @@
 // We support four different ways for getting addresses for GL/GLX
 // extension functions: glXGetProcAddress, glXGetProcAddressARB,
 // glXGetProcAddressEXT, and dlsym
+#define _GLFW_HAS_GLXGETPROCADDRESSARB
 #if   defined( _GLFW_HAS_GLXGETPROCADDRESSARB )
  #define _glfw_glXGetProcAddress(x) glXGetProcAddressARB(x)
 #elif defined( _GLFW_HAS_GLXGETPROCADDRESS )