diff --git a/.gitignore b/.gitignore index 76adba415..f673a488b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ out/ *.so *.dll *.exe +*.zip +pscrypto-lib/ diff --git a/build.sbt b/build.sbt index 1e68e2b1f..93ebb6e0c 100644 --- a/build.sbt +++ b/build.sbt @@ -18,6 +18,12 @@ lazy val commonSettings = Seq( ) ) +lazy val pscryptoSettings = Seq( + unmanagedClasspath in Test += (baseDirectory in ThisBuild).value / "pscrypto-lib", + unmanagedClasspath in Runtime += (baseDirectory in ThisBuild).value / "pscrypto-lib", + unmanagedResources in Runtime += (baseDirectory in ThisBuild).value / "pscrypto-lib" +) + lazy val root = (project in file(".")). settings(commonSettings: _*). aggregate(pslogin, common) @@ -26,10 +32,13 @@ lazy val pslogin = (project in file("pslogin")). settings(commonSettings: _*). settings( name := "pslogin" - ).settings(packAutoSettings: _*).dependsOn(common) + ). + settings(pscryptoSettings: _*). + settings(packAutoSettings: _*).dependsOn(common) lazy val common = (project in file("common")). settings(commonSettings: _*). settings( name := "common" - ) + ). + settings(pscryptoSettings: _*) diff --git a/common/src/main/scala/net/psforever/crypto/CryptoInterface.scala b/common/src/main/scala/net/psforever/crypto/CryptoInterface.scala index 5e60d6600..f14238807 100644 --- a/common/src/main/scala/net/psforever/crypto/CryptoInterface.scala +++ b/common/src/main/scala/net/psforever/crypto/CryptoInterface.scala @@ -43,7 +43,12 @@ object CryptoInterface { val classpathEntries = classpath.split(File.pathSeparator) val myLibraryPath = System.getProperty("user.dir") + val jnaLibrary = System.getProperty("jna.library.path") + val javaLibrary = System.getProperty("java.library.path") println("User dir: " + myLibraryPath) + println("JNA Lib: " + jnaLibrary) + println("Java Lib: " + javaLibrary) + print("Classpath: ") classpathEntries.foreach(println) println("Required data model: " + System.getProperty("sun.arch.data.model"))