use library versions 2 and 3 of ODE too. It seems compatible.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11852 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_screen.c b/cl_screen.c
index b5b974ff9ec0ad9609a4d6304a7ca7c32ea2cb71..dfc556187ece9948d970244709d5f7f938e2275f 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -2115,7 +2115,7 @@ static void SCR_DrawLoadingScreen (qboolean clear)
        if(loadingscreentexture)
        {
                R_Mesh_PrepareVertices_Generic_Arrays(4, loadingscreentexture_vertex3f, NULL, loadingscreentexture_texcoord2f);
        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);
                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 f7ab6ec453836d3c1baeffe07117103f649b8c83..abacf51d2ee614111f26d68ee9ea2cd02e08724d 100644 (file)
--- a/world.c
+++ b/world.c
@@ -1474,10 +1474,16 @@ static void World_Physics_Init(void)
        const char* dllnames [] =
        {
 # if defined(WIN32)
        const char* dllnames [] =
        {
 # if defined(WIN32)

+               "libode3.dll",
+               "libode2.dll",

                "libode1.dll",
 # elif defined(MACOSX)
                "libode1.dll",
 # elif defined(MACOSX)

+               "libode.3.dylib",
+               "libode.2.dylib",

                "libode.1.dylib",
 # else
                "libode.1.dylib",
 # else

+               "libode.so.3",
+               "libode.so.2",

                "libode.so.1",
 # endif
                NULL
                "libode.so.1",
 # endif
                NULL