- Compile 64 and 32 bit variants on Linux.

- Give each variant of the native library a unique name.
This commit is contained in:
Adam Murdoch
2012-08-27 19:55:59 +10:00
parent 05a4cfe19b
commit f5dc6b80e1
3 changed files with 70 additions and 29 deletions

View File

@@ -50,7 +50,7 @@ public abstract class Platform {
@Override
public String getLibraryName() {
return "native-platform.dll";
return "native-win32.dll";
}
@Override
@@ -91,11 +91,7 @@ public abstract class Platform {
}
}
private static class Unix extends Posix {
@Override
public String getLibraryName() {
return "libnative-platform.so";
}
private abstract static class Unix extends Posix {
}
private static class Linux extends Unix {
@@ -106,9 +102,21 @@ public abstract class Platform {
}
return super.get(type);
}
@Override
public String getLibraryName() {
if (System.getProperty("os.arch").equals("amd64")) {
return "libnative-linux-amd64.so";
}
return "libnative-linux-i386.so";
}
}
private static class Solaris extends Unix {
@Override
public String getLibraryName() {
return "libnative-solaris.so";
}
}
private static class OsX extends Posix {
@@ -122,7 +130,7 @@ public abstract class Platform {
@Override
public String getLibraryName() {
return "libnative-platform.dylib";
return "libnative-osx-universal.dylib";
}
}