diff -Naur ogre/RenderSystems/GL/src/GLX/Makefile.am ogre.oden/RenderSystems/GL/src/GLX/Makefile.am --- ogre/RenderSystems/GL/src/GLX/Makefile.am 2008-06-12 10:10:57.000000000 -0400 +++ ogre.oden/RenderSystems/GL/src/GLX/Makefile.am 2008-11-14 10:55:44.000000000 -0500 @@ -11,3 +11,5 @@ OgreGLXWindow.cpp \ OgreGLXRenderTexture.cpp \ OgreGLXContext.cpp + +libsupport_la_LIBADD = -lGLEW diff -Naur ogre/RenderSystems/GL/src/GLX/Makefile.in ogre.oden/RenderSystems/GL/src/GLX/Makefile.in --- ogre/RenderSystems/GL/src/GLX/Makefile.in 2008-11-04 07:32:51.000000000 -0500 +++ ogre.oden/RenderSystems/GL/src/GLX/Makefile.in 2008-11-14 10:55:59.000000000 -0500 @@ -50,7 +50,7 @@ CONFIG_HEADER = $(top_builddir)/OgreMain/include/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -libsupport_la_LIBADD = +libsupport_la_LIBADD = -lGLEW am_libsupport_la_OBJECTS = OgreGLXGLSupport.lo OgreGLXWindow.lo \ OgreGLXRenderTexture.lo OgreGLXContext.lo libsupport_la_OBJECTS = $(am_libsupport_la_OBJECTS) diff -Naur ogre/RenderSystems/GL/src/GLX/OgreGLXGLSupport.cpp ogre.oden/RenderSystems/GL/src/GLX/OgreGLXGLSupport.cpp --- ogre/RenderSystems/GL/src/GLX/OgreGLXGLSupport.cpp 2008-06-12 10:10:57.000000000 -0400 +++ ogre.oden/RenderSystems/GL/src/GLX/OgreGLXGLSupport.cpp 2008-11-14 12:00:52.000000000 -0500 @@ -39,7 +39,9 @@ #include <X11/extensions/Xrandr.h> -GLenum glxewContextInit(Ogre::GLSupport *glSupport); +extern "C" { +GLenum glxewContextInit(); +} static Display *_currentDisplay; static Display *_getCurrentDisplay(void) { return _currentDisplay; } @@ -942,7 +944,7 @@ glXGetCurrentDisplay = (PFNGLXGETCURRENTDISPLAYPROC)_getCurrentDisplay; - if (glxewContextInit(this) != GLEW_OK) + if (glxewContextInit() != GLEW_OK) { XCloseDisplay (mGLDisplay); XCloseDisplay (mXDisplay); diff -Naur ogre/RenderSystems/GL/src/Makefile.am ogre.oden/RenderSystems/GL/src/Makefile.am --- ogre/RenderSystems/GL/src/Makefile.am 2008-08-22 06:35:06.000000000 -0400 +++ ogre.oden/RenderSystems/GL/src/Makefile.am 2008-11-14 10:55:14.000000000 -0500 @@ -33,8 +33,7 @@ OgreGLFBORenderTexture.cpp \ OgreGLPBRenderTexture.cpp \ OgreGLFBOMultiRenderTarget.cpp \ - OgreGLFrameBufferObject.cpp \ - glew.cpp + OgreGLFrameBufferObject.cpp RenderSystem_GL_la_LDFLAGS = -module $(PLUGIN_FLAGS) -L$(top_builddir)/OgreMain/src -Wl,-z,defs RenderSystem_GL_la_LIBADD = \ @@ -42,4 +41,4 @@ $(top_builddir)/RenderSystems/GL/src/GLSL/src/libGLSL.la \ $(top_builddir)/RenderSystems/GL/src/nvparse/libnvparse.la \ $(top_builddir)/RenderSystems/GL/src/atifs/src/libatifs.la \ - $(GL_LIBS) $(GLSUPPORT_LIBS) -lOgreMain $(OGRE_THREAD_LIBS) + $(GL_LIBS) $(GLSUPPORT_LIBS) -lOgreMain $(OGRE_THREAD_LIBS) -lGLEW diff -Naur ogre/RenderSystems/GL/src/Makefile.in ogre/RenderSystems/GL/src/Makefile.in.orig --- ogre/RenderSystems/GL/src/Makefile.in.orig 2009-07-26 12:31:25.000000000 +0200 +++ ogre/RenderSystems/GL/src/Makefile.in 2009-08-22 22:32:31.000000000 +0200 @@ -70,7 +70,7 @@ OgreGLPixelFormat.lo OgreGLRenderTexture.lo \ OgreGLRenderToVertexBuffer.lo OgreGLFBORenderTexture.lo \ OgreGLPBRenderTexture.lo OgreGLFBOMultiRenderTarget.lo \ - OgreGLFrameBufferObject.lo glew.lo + OgreGLFrameBufferObject.lo RenderSystem_GL_la_OBJECTS = $(am_RenderSystem_GL_la_OBJECTS) RenderSystem_GL_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ @@ -285,12 +285,11 @@ OgreGLContext.cpp \ OgreGLPixelFormat.cpp \ OgreGLRenderTexture.cpp \ - OgreGLRenderToVertexBuffer.cpp \ + OgreGLRenderToVertexBuffer.cpp \ OgreGLFBORenderTexture.cpp \ OgreGLPBRenderTexture.cpp \ OgreGLFBOMultiRenderTarget.cpp \ - OgreGLFrameBufferObject.cpp \ - glew.cpp + OgreGLFrameBufferObject.cpp RenderSystem_GL_la_LDFLAGS = -module $(PLUGIN_FLAGS) -L$(top_builddir)/OgreMain/src -Wl,-z,defs RenderSystem_GL_la_LIBADD = \ @@ -298,7 +297,7 @@ $(top_builddir)/RenderSystems/GL/src/GLSL/src/libGLSL.la \ $(top_builddir)/RenderSystems/GL/src/nvparse/libnvparse.la \ $(top_builddir)/RenderSystems/GL/src/atifs/src/libatifs.la \ - $(GL_LIBS) $(GLSUPPORT_LIBS) -lOgreMain $(OGRE_THREAD_LIBS) + $(GL_LIBS) $(GLSUPPORT_LIBS) -lOgreMain $(OGRE_THREAD_LIBS) -lGLEW all: all-recursive @@ -392,7 +391,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OgreGLSupport.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OgreGLTexture.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OgreGLTextureManager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glew.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff -Naur ogre/RenderSystems/GL/src/OgreGLRenderSystem.cpp ogre.oden/RenderSystems/GL/src/OgreGLRenderSystem.cpp --- ogre/RenderSystems/GL/src/OgreGLRenderSystem.cpp 2008-09-13 13:33:33.000000000 -0400 +++ ogre.oden/RenderSystems/GL/src/OgreGLRenderSystem.cpp 2008-11-14 10:55:14.000000000 -0500 @@ -54,7 +54,6 @@ // Convenience macro from ARB_vertex_buffer_object spec #define VBO_BUFFER_OFFSET(i) ((char *)NULL + (i)) -GLenum glewContextInit (Ogre::GLSupport *glSupport); namespace Ogre { @@ -1001,11 +1000,9 @@ LogManager::getSingleton().logMessage("***************************"); // Get extension function pointers - glewContextInit(mGLSupport); + glewInit(); } - - //----------------------------------------------------------------------- MultiRenderTarget * GLRenderSystem::createMultiRenderTarget(const String & name) {