A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to unify the native lib location between cmake and java
[simgrid.git]
/
src
/
bindings
/
java
/
org
/
simgrid
/
NativeLib.java
diff --git
a/src/bindings/java/org/simgrid/NativeLib.java
b/src/bindings/java/org/simgrid/NativeLib.java
index f3102c09a79af688212740bc76e7adafdc380ef4..54dad77a52e1f3adfd651dfbccfcc267e1b676af 100644
(file)
--- a/
src/bindings/java/org/simgrid/NativeLib.java
+++ b/
src/bindings/java/org/simgrid/NativeLib.java
@@
-20,13
+20,12
@@
public final class NativeLib {
if (arch.matches("^i[3-6]86$"))
arch = "x86";
if (arch.matches("^i[3-6]86$"))
arch = "x86";
- else if (arch.equalsIgnoreCase("
amd
64"))
- arch = "
x86_
64";
+ else if (arch.equalsIgnoreCase("
x86_
64"))
+ arch = "
amd
64";
if (os.toLowerCase().startsWith("win")){
os = "Windows";
if (os.toLowerCase().startsWith("win")){
os = "Windows";
- arch = "x86";
- }else if (os.contains("OS X"))
+ } else if (os.contains("OS X"))
os = "Darwin";
os = os.replace(' ', '_');
os = "Darwin";
os = os.replace(' ', '_');