[SCM] Packaging the irrlicht game engine branch, debian/use-system-libs.diff, updated. upstream/1.5-30-g94262f2
Christoph Egger
Christoph.Egger at gmx.de
Thu Jul 30 10:41:17 UTC 2009
The following commit has been merged in the debian/use-system-libs.diff branch:
commit 94262f249dc111b894a1ea8b5ee386e168112e6a
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date: Wed Jul 29 20:30:07 2009 +0200
Switch to system versions for glext headers as well
diff --git a/source/Irrlicht/CIrrDeviceLinux.h b/source/Irrlicht/CIrrDeviceLinux.h
index 0ca353b..7b5783b 100644
--- a/source/Irrlicht/CIrrDeviceLinux.h
+++ b/source/Irrlicht/CIrrDeviceLinux.h
@@ -21,7 +21,7 @@
#define GLX_GLXEXT_LEGACY 1
#include <GL/glx.h>
#ifdef _IRR_OPENGL_USE_EXTPOINTER_
-#include "glxext.h"
+#include <GL/glxext.h>
#endif
#endif
diff --git a/source/Irrlicht/COpenGLDriver.h b/source/Irrlicht/COpenGLDriver.h
index 3682a30..3d51b30 100644
--- a/source/Irrlicht/COpenGLDriver.h
+++ b/source/Irrlicht/COpenGLDriver.h
@@ -25,7 +25,7 @@
#if defined(_IRR_WINDOWS_API_)
#include <GL/gl.h>
- #include "glext.h"
+ #include <GL/glext.h>
#include "wglext.h"
#ifdef _MSC_VER
#pragma comment(lib, "OpenGL32.lib")
@@ -37,7 +37,7 @@
#endif
#include <OpenGL/gl.h>
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
- #include "glext.h"
+ #include <GL/glext.h>
#endif
#elif defined(_IRR_USE_SDL_DEVICE_)
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
@@ -49,7 +49,7 @@
#endif
#define NO_SDL_GLEXT
#include <SDL/SDL_opengl.h>
- #include "glext.h"
+ #include <GL/glext.h>
#else
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
#define GL_GLEXT_LEGACY 1
@@ -61,9 +61,9 @@
#include <GL/gl.h>
#include <GL/glx.h>
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
- #include "glext.h"
+ #include <GL/glext.h>
#undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
- #include "glxext.h"
+ #include <GL/glxext.h>
#endif
#endif
diff --git a/source/Irrlicht/COpenGLExtensionHandler.h b/source/Irrlicht/COpenGLExtensionHandler.h
index ade7b3a..a7f88ad 100644
--- a/source/Irrlicht/COpenGLExtensionHandler.h
+++ b/source/Irrlicht/COpenGLExtensionHandler.h
@@ -17,7 +17,7 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <GL/gl.h>
- #include "glext.h"
+ #include <GL/glext.h>
#ifdef _MSC_VER
#pragma comment(lib, "OpenGL32.lib")
#endif
@@ -28,7 +28,7 @@
#endif
#include <OpenGL/gl.h>
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
- #include "glext.h"
+ #include <GL/glext.h>
#endif
#elif defined(_IRR_USE_SDL_DEVICE_)
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
@@ -41,7 +41,7 @@
#define NO_SDL_GLEXT
#include <SDL/SDL_video.h>
#include <SDL/SDL_opengl.h>
- #include "glext.h"
+ #include <GL/glext.h>
#else
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
#define GL_GLEXT_LEGACY 1
@@ -53,9 +53,9 @@
#include <GL/gl.h>
#include <GL/glx.h>
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
- #include "glext.h"
+ #include <GL/glext.h>
#undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
- #include "glxext.h"
+ #include <GL/glxext.h>
#endif
#endif
diff --git a/source/Irrlicht/COpenGLSLMaterialRenderer.h b/source/Irrlicht/COpenGLSLMaterialRenderer.h
index ef7f58a..8526a31 100644
--- a/source/Irrlicht/COpenGLSLMaterialRenderer.h
+++ b/source/Irrlicht/COpenGLSLMaterialRenderer.h
@@ -12,7 +12,7 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <GL/gl.h>
- #include "glext.h"
+ #include <GL/glext.h>
#else
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
#define GL_GLEXT_LEGACY 1
@@ -23,7 +23,7 @@
#include <GL/gl.h>
#endif
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
- #include "glext.h"
+ #include <GL/glext.h>
#endif
#endif
diff --git a/source/Irrlicht/COpenGLShaderMaterialRenderer.h b/source/Irrlicht/COpenGLShaderMaterialRenderer.h
index c433de9..cc9d7eb 100644
--- a/source/Irrlicht/COpenGLShaderMaterialRenderer.h
+++ b/source/Irrlicht/COpenGLShaderMaterialRenderer.h
@@ -22,7 +22,7 @@
#include <GL/gl.h>
#endif
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
- #include "glext.h"
+ #include <GL/glext.h>
#endif
#endif
diff --git a/source/Irrlicht/COpenGLTexture.h b/source/Irrlicht/COpenGLTexture.h
index 6989395..b7a3032 100644
--- a/source/Irrlicht/COpenGLTexture.h
+++ b/source/Irrlicht/COpenGLTexture.h
@@ -16,7 +16,7 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <GL/gl.h>
- #include "glext.h"
+ #include <GL/glext.h>
#ifdef _MSC_VER
#pragma comment(lib, "OpenGL32.lib")
#pragma comment(lib, "GLu32.lib")
@@ -31,7 +31,7 @@
#include <GL/gl.h>
#endif
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
- #include "glext.h"
+ #include <GL/glext.h>
#endif
#endif
--
Packaging the irrlicht game engine
More information about the Pkg-games-commits
mailing list