1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
Description: fix library extension
The extension for libraries on Linux systems is .so. This
package does not use the prebuilt libs with .lib extension,
but the libraries available in the system.
Forwarded: not-needed
Author: Sebastian Reichel <sre@debian.org>
Last-Update: 2013-01-06
--- a/support/sdk/java/net/tinyos/util/TOSLibraryLoader.java
+++ b/support/sdk/java/net/tinyos/util/TOSLibraryLoader.java
@@ -123,17 +123,17 @@
if(os.toLowerCase().startsWith("linux")) {
// Linux
if(arch.toLowerCase().equals("x86") || arch.toLowerCase().equals("i386")) {
- libFile = "linux_x86_" + libName;
+ libFile = "lib" + libName + "-32.so";
} else if(arch.toLowerCase().equals("ppc")) {
// not currently supported
//libFile = "linux_ppc_" + libName;
} else if(arch.toLowerCase().equals("amd64")) {
- libFile = "linux_amd64_" + libName;
+ libFile = "lib" + libName + "-64.so";
}
} else if(os.toLowerCase().startsWith("windows")) {
// Windows
if(arch.toLowerCase().equals("x86") || arch.toLowerCase().equals("i386")) {
- libFile = "windows_x86_" + libName;
+ libFile = "windows_x86_" + libName + ".lib";
} else if(arch.toLowerCase().equals("ppc")) {
// not currently supported
//libFile = "windows_ppc_" + libName;
@@ -142,9 +142,8 @@
//libFile = "windows_amd64_" + libName;
}
} else if(os.toLowerCase().startsWith("mac os x")) {
- libFile = "macosx_universal_" + libName;
+ libFile = "macosx_universal_" + libName + ".lib";
}
- if(libFile != null) libFile += ".lib";
if(libFile == null) {
ok = false;
|
