From 500ed11176dd759e90b6a9e463743dfbbb17c192 Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 11 Nov 2008 21:04:09 +0000 Subject: libGL.so changed to libGL.so.1 as on fedora with nvidia cards /usr/lib/libGL.so is not usable. There is an additional directory /usr/lib/nvidia with the correct libs but it does not contain libGL.so, just libGL.so.1. So the latter is mandatory. -> We really should use the pkg_config values instead of hard-coded links :( git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1515 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/JEDI-SDL/OpenGL/Pas/gl.pas | 2 +- src/lib/JEDI-SDL/OpenGL/Pas/glu.pas | 2 +- src/lib/JEDI-SDL/OpenGL/Pas/glx.pas | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/lib/JEDI-SDL/OpenGL') diff --git a/src/lib/JEDI-SDL/OpenGL/Pas/gl.pas b/src/lib/JEDI-SDL/OpenGL/Pas/gl.pas index 2dc99df5..d1231cdd 100644 --- a/src/lib/JEDI-SDL/OpenGL/Pas/gl.pas +++ b/src/lib/JEDI-SDL/OpenGL/Pas/gl.pas @@ -131,7 +131,7 @@ const {$IFDEF DARWIN} GLLibName = '/System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib'; {$ELSE} - GLLibName = 'libGL.so'; + GLLibName = 'libGL.so.1'; {$ENDIF} {$ENDIF} diff --git a/src/lib/JEDI-SDL/OpenGL/Pas/glu.pas b/src/lib/JEDI-SDL/OpenGL/Pas/glu.pas index 29647d12..876270ff 100644 --- a/src/lib/JEDI-SDL/OpenGL/Pas/glu.pas +++ b/src/lib/JEDI-SDL/OpenGL/Pas/glu.pas @@ -140,7 +140,7 @@ const {$IFDEF DARWIN} GLuLibName = '/System/Library/Frameworks/OpenGL.framework/Libraries/libGLU.dylib'; {$ELSE} - GLuLibName = 'libGLU.so'; + GLuLibName = 'libGLU.so.1'; {$ENDIF} {$ENDIF} diff --git a/src/lib/JEDI-SDL/OpenGL/Pas/glx.pas b/src/lib/JEDI-SDL/OpenGL/Pas/glx.pas index f43a4e4c..9f36d2b5 100644 --- a/src/lib/JEDI-SDL/OpenGL/Pas/glx.pas +++ b/src/lib/JEDI-SDL/OpenGL/Pas/glx.pas @@ -266,8 +266,7 @@ end; function InitGLX: Boolean; begin - Result := InitGLXFromLibrary('libGL.so') or - InitGLXFromLibrary('libGL.so.1') or + Result := InitGLXFromLibrary('libGL.so.1') or InitGLXFromLibrary('libMesaGL.so') or InitGLXFromLibrary('libMesaGL.so.3'); end; -- cgit v1.2.3