Linux 64 support for FMU

[simantics/fmil.git] / org.simantics.fmil.core / src / org / simantics / fmil / core / FMIL.java

diff --git a/org.simantics.fmil.core/src/org/simantics/fmil/core/FMIL.java b/org.simantics.fmil.core/src/org/simantics/fmil/core/FMIL.java
index 3a7c031dc2522a60d8d1ff2e2028947a0e16cb8b..fa09a71c4e2536af375ba8b4b0c65cf6a6839b89 100644 (file)
--- a/org.simantics.fmil.core/src/org/simantics/fmil/core/FMIL.java
+++ b/org.simantics.fmil.core/src/org/simantics/fmil/core/FMIL.java
@@ -61,7 +61,7 @@ public class FMIL {
                 simulatorFMIUrl = FileLocator.find(b, new Path("libraries/FMUSimulator.dll"), null);
             } else if(env.os == OSType.LINUX) {
                 sharedFMILIBUrl = FileLocator.find(b, new Path("libraries/libfmilib_shared.so"), null);
-                simulatorFMIUrl = FileLocator.find(b, new Path("libraries/FMUSimulator.so"), null);
+                simulatorFMIUrl = FileLocator.find(b, new Path("libraries/libFMUSimulator.so"), null);
             }
 
             libraries[0] = new File(FileLocator.toFileURL(sharedFMILIBUrl).getPath());
@@ -206,8 +206,8 @@ public class FMIL {
 
             try {
                 String tmpPath = tempDir.getAbsolutePath();
-                if(!tmpPath.endsWith("\\"))
-                    tmpPath = tmpPath + "\\";
+                if(!tmpPath.endsWith("\\") && !tmpPath.endsWith("/"))
+                    tmpPath = tmpPath + "/";
                 id = loadFMUFile_(path, tmpPath);
                 
                 getAllVariables();
@@ -221,6 +221,7 @@ public class FMIL {
             } catch (UnsatisfiedLinkError err) {
                 throw new FMILException(UNSATISFIED_LINK, err);
             } catch (Exception e) {
+               LOGGER.error(e.getMessage());
                 throw new FMILException(e.getMessage());
             }
         }