use library versions 2 and 3 of ODE too. It seems compatible.
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 26 Sep 2012 12:48:42 +0000 (12:48 +0000)
committerdivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 26 Sep 2012 12:48:42 +0000 (12:48 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11852 d7cf8633-e32d-0410-b094-e92efae38249

cl_screen.c
world.c

index b5b974f..dfc5561 100644 (file)
@@ -2115,7 +2115,7 @@ static void SCR_DrawLoadingScreen (qboolean clear)
        if(loadingscreentexture)
        {
                R_Mesh_PrepareVertices_Generic_Arrays(4, loadingscreentexture_vertex3f, NULL, loadingscreentexture_texcoord2f);
-               R_SetupShader_Generic(loadingscreentexture, NULL, GL_MODULATE, 1, false, true, true);
+               R_SetupShader_Generic(loadingscreentexture, NULL, GL_MODULATE, 1, true, true, true);
                R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
        }
        R_Mesh_PrepareVertices_Generic_Arrays(4, loadingscreenpic_vertex3f, NULL, loadingscreenpic_texcoord2f);
diff --git a/world.c b/world.c
index f7ab6ec..abacf51 100644 (file)
--- a/world.c
+++ b/world.c
@@ -1474,10 +1474,16 @@ static void World_Physics_Init(void)
        const char* dllnames [] =
        {
 # if defined(WIN32)
+               "libode3.dll",
+               "libode2.dll",
                "libode1.dll",
 # elif defined(MACOSX)
+               "libode.3.dylib",
+               "libode.2.dylib",
                "libode.1.dylib",
 # else
+               "libode.so.3",
+               "libode.so.2",
                "libode.so.1",
 # endif
                NULL