Merge pull request #152 from cconlon/jniDylib
Standardize JNI library name on OSX to .dylibpull/155/head
commit
c96f4e1eb4
|
@ -92,7 +92,7 @@
|
||||||
|
|
||||||
<target name="cleanjni">
|
<target name="cleanjni">
|
||||||
<delete>
|
<delete>
|
||||||
<fileset dir="${lib.dir}" includes="*.jnilib"/>
|
<fileset dir="${lib.dir}" includes="*.dylib"/>
|
||||||
<fileset dir="${lib.dir}" includes="*.so"/>
|
<fileset dir="${lib.dir}" includes="*.so"/>
|
||||||
<fileset dir="${native.dir}" includes="*.o"/>
|
<fileset dir="${native.dir}" includes="*.o"/>
|
||||||
</delete>
|
</delete>
|
||||||
|
|
2
java.sh
2
java.sh
|
@ -74,7 +74,7 @@ if [ "$OS" == "Darwin" ] ; then
|
||||||
fi
|
fi
|
||||||
javaIncludes="-I$javaHome/include -I$javaHome/include/darwin -I$WOLFSSL_INSTALL_DIR/include"
|
javaIncludes="-I$javaHome/include -I$javaHome/include/darwin -I$WOLFSSL_INSTALL_DIR/include"
|
||||||
javaLibs="-dynamiclib"
|
javaLibs="-dynamiclib"
|
||||||
jniLibName="libwolfssljni.jnilib"
|
jniLibName="libwolfssljni.dylib"
|
||||||
cflags=""
|
cflags=""
|
||||||
elif [ "$OS" == "Linux" ] ; then
|
elif [ "$OS" == "Linux" ] ; then
|
||||||
echo " Detected Linux host OS"
|
echo " Detected Linux host OS"
|
||||||
|
|
Loading…
Reference in New Issue