also unifies the native path between cmake and java on windows

diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java
index 54dad77..4e61de9 100644 (file)
--- a/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@ -22,6 +22,8 @@ public final class NativeLib {
                        arch = "x86";
                else if (arch.equalsIgnoreCase("x86_64"))
                        arch = "amd64";
+               else if (arch.equalsIgnoreCase("AMD64"))
+                       arch = "amd64";
 
                if (os.toLowerCase().startsWith("win")){
                        os = "Windows";

diff --git a/tools/cmake/MakeJava.cmake b/tools/cmake/MakeJava.cmake
index 4d93dbc..c8a52f9 100644 (file)
--- a/tools/cmake/MakeJava.cmake
+++ b/tools/cmake/MakeJava.cmake
@@ -76,7 +76,8 @@ set(JAVA_NATIVE_PATH NATIVE/${CMAKE_SYSTEM_NAME}/${CMAKE_SYSTEM_PROCESSOR})
 if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^i[3-6]86$")
   set(JAVA_NATIVE_PATH NATIVE/${CMAKE_SYSTEM_NAME}/x86)
 endif()
-if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
+if(  (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64") OR
+     (${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")     )
   set(JAVA_NATIVE_PATH NATIVE/${CMAKE_SYSTEM_NAME}/amd64)
 endif()