From a92d9807237a024106b67f045822679f7ee4df54 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 14 Mar 2009 21:18:50 +0000
Subject: merge with current trunk (just update)

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1634 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 unicode/src/lib/JEDI-SDL/OpenGL/Pas/gl.pas  | 2 +-
 unicode/src/lib/JEDI-SDL/OpenGL/Pas/glu.pas | 2 +-
 unicode/src/lib/JEDI-SDL/OpenGL/Pas/glx.pas | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'unicode/src/lib/JEDI-SDL')

diff --git a/unicode/src/lib/JEDI-SDL/OpenGL/Pas/gl.pas b/unicode/src/lib/JEDI-SDL/OpenGL/Pas/gl.pas
index 2dc99df5..d1231cdd 100644
--- a/unicode/src/lib/JEDI-SDL/OpenGL/Pas/gl.pas
+++ b/unicode/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/unicode/src/lib/JEDI-SDL/OpenGL/Pas/glu.pas b/unicode/src/lib/JEDI-SDL/OpenGL/Pas/glu.pas
index 29647d12..876270ff 100644
--- a/unicode/src/lib/JEDI-SDL/OpenGL/Pas/glu.pas
+++ b/unicode/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/unicode/src/lib/JEDI-SDL/OpenGL/Pas/glx.pas b/unicode/src/lib/JEDI-SDL/OpenGL/Pas/glx.pas
index f43a4e4c..9f36d2b5 100644
--- a/unicode/src/lib/JEDI-SDL/OpenGL/Pas/glx.pas
+++ b/unicode/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