From 13bda0cbf32a97d1ab13932a09ee8a64aac40de7 Mon Sep 17 00:00:00 2001 From: unknown <> Date: Fri, 15 Mar 2024 20:51:46 -0400 Subject: [PATCH] OS dependent library loading --- src/main/java/electrosphere/FluidSim.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/electrosphere/FluidSim.java b/src/main/java/electrosphere/FluidSim.java index 6db026b..c744503 100644 --- a/src/main/java/electrosphere/FluidSim.java +++ b/src/main/java/electrosphere/FluidSim.java @@ -24,10 +24,16 @@ import org.lwjgl.system.MemoryUtil; */ public class FluidSim { + /** + * Load fluid sim library + */ static { - // System.out.println(System.getProperty("user.dir")); - // System.load(System.getProperty("user.dir") + "/shared-folder/libfluidsim.dll"); - System.load(new File("./shared-folder/libfluidsim.dll").toPath().toAbsolutePath().toString()); + String osName = System.getProperty("os.name"); + if(osName.contains("win")){ + System.load(new File("./shared-folder/libfluidsim.dll").toPath().toAbsolutePath().toString()); + } else if(osName.contains("nix")){ + System.load(new File("./shared-folder/libfluidsim.so").toPath().toAbsolutePath().toString()); + } } public static final int DIM = 18;