Two errors caused by previous commit;
authorCharlie Carley <snailrose@gmail.com>
Tue, 23 Jan 2007 13:25:20 +0000 (13:25 +0000)
committerCharlie Carley <snailrose@gmail.com>
Tue, 23 Jan 2007 13:25:20 +0000 (13:25 +0000)
One related to extension handling on Linux, the other is a fix for compiling with Irix and STL

source/gameengine/Ketsji/BL_Texture.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp

index 6841bb2f9590e0f1a00a0de2b1ef1bb9e549b41a..4a5a426e9e88d4d326c86be6a2fc8cc21f9efe6b 100644 (file)
@@ -248,7 +248,7 @@ bool BL_Texture::InitCubeMap(int unit,  EnvMap *cubemap)
        BL_TextureObject obj;
        obj.gl_texture = mTexture;
        obj.ref_buffer = cubemap->ima;
-       g_textureManager.insert(std::make_pair(cubemap->ima->id.name, obj));
+       g_textureManager.insert(std::pair<char*, BL_TextureObject>((char*)cubemap->ima->id.name, obj));
 
 
        bool needs_split = false;
index 8014c4ebd2ac4102202493aeb7f00d68aaad00f4..c8ed2dd6960c95eda0d024af23d10fb4b833a57e 100644 (file)
@@ -191,7 +191,7 @@ static void bglInitEntryPoints (void)
        {
                if (!libGL)
                {
-                       libGL = dlopen("libGL.so", RTLD_GLOBAL);
+                       libGL = dlopen("libGL.so", RTLD_LAZY|RTLD_GLOBAL);
                        if (libGL)
                                bglGetProcAddress = (PFNBGLXGETPROCADDRESSARBPROC) (dlsym(libGL, "glXGetProcAddressARB"));
                        else