From 0cb5b69ba8fd5ec367d139b8ac3dd2fa82c2ab1d Mon Sep 17 00:00:00 2001 From: divverent Date: Wed, 26 Sep 2012 12:48:42 +0000 Subject: [PATCH] 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 --- cl_screen.c | 2 +- world.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cl_screen.c b/cl_screen.c index b5b974ff..dfc55618 100644 --- 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); - 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 f7ab6ec4..abacf51d 100644 --- 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 -- 2.39.2