From 5235c43efb5a241152634c45ef1d8ccbc6d311b6 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 2 Oct 2015 15:38:09 +0200 Subject: [PATCH] [win+java] fix the name of libwinpthread-1.dll --- src/bindings/java/org/simgrid/msg/Msg.java | 2 +- src/bindings/java/org/simgrid/surf/SurfJNI.java | 2 +- src/bindings/java/surf.i | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bindings/java/org/simgrid/msg/Msg.java b/src/bindings/java/org/simgrid/msg/Msg.java index f47e945316..d46b4d86e5 100644 --- a/src/bindings/java/org/simgrid/msg/Msg.java +++ b/src/bindings/java/org/simgrid/msg/Msg.java @@ -18,7 +18,7 @@ public final class Msg { return; if (System.getProperty("os.name").toLowerCase().startsWith("win")) - NativeLib.nativeInit("winpthread"); + NativeLib.nativeInit("winpthread-1"); NativeLib.nativeInit("simgrid"); NativeLib.nativeInit("simgrid-java"); diff --git a/src/bindings/java/org/simgrid/surf/SurfJNI.java b/src/bindings/java/org/simgrid/surf/SurfJNI.java index abd3a25f48..277db31da4 100644 --- a/src/bindings/java/org/simgrid/surf/SurfJNI.java +++ b/src/bindings/java/org/simgrid/surf/SurfJNI.java @@ -14,7 +14,7 @@ public class SurfJNI { static { if (System.getProperty("os.name").toLowerCase().startsWith("win")) - NativeLib.nativeInit("winpthread"); + NativeLib.nativeInit("winpthread-1"); NativeLib.nativeInit("simgrid"); NativeLib.nativeInit("surf-java"); Runtime.getRuntime().addShutdownHook( diff --git a/src/bindings/java/surf.i b/src/bindings/java/surf.i index f5ef7097fd..2332cbc26e 100644 --- a/src/bindings/java/surf.i +++ b/src/bindings/java/surf.i @@ -17,7 +17,7 @@ import org.simgrid.NativeLib; %pragma(java) jniclasscode=%{ static { if (System.getProperty("os.name").toLowerCase().startsWith("win")) - NativeLib.nativeInit("winpthread"); + NativeLib.nativeInit("winpthread-1"); NativeLib.nativeInit("simgrid"); NativeLib.nativeInit("surf-java"); Runtime.getRuntime().addShutdownHook( -- 2.20.1