author | yippi |
Wed, 21 Jan 2009 10:51:07 +0000 | |
changeset 1641 | bee7722f9bdd |
permissions | -rw-r--r-- |
1641 | 1 |
--- pyglet-1.1.2/pyglet/lib.py-orig 2009-01-21 04:37:54.586130000 -0600 |
2 |
+++ pyglet-1.1.2/pyglet/lib.py 2009-01-21 04:38:21.296254000 -0600 |
|
3 |
@@ -95,8 +95,7 @@ class LibraryLoader(object): |
|
4 |
elif type(platform_names) is tuple: |
|
5 |
platform_names = list(platform_names) |
|
6 |
||
7 |
- if self.platform == 'linux2': |
|
8 |
- platform_names.extend(['lib%s.so' % n for n in names]) |
|
9 |
+ platform_names.extend(['lib%s.so' % n for n in names]) |
|
10 |
||
11 |
platform_names.extend(names) |
|
12 |
for name in platform_names: |
|
13 |
@@ -294,10 +293,6 @@ class LinuxLibraryLoader(LibraryLoader): |
|
14 |
||
15 |
return self._ld_so_cache.get(path) |
|
16 |
||
17 |
-if sys.platform == 'darwin': |
|
18 |
- loader = MachOLibraryLoader() |
|
19 |
-elif sys.platform == 'linux2': |
|
20 |
- loader = LinuxLibraryLoader() |
|
21 |
-else: |
|
22 |
- loader = LibraryLoader() |
|
23 |
+loader = LinuxLibraryLoader() |
|
24 |
+ |
|
25 |
load_library = loader.load_library |