summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Buchanan <jonathan.russ.buchanan@gmail.com>2020-08-04 02:14:55 -0400
committerJonathan Buchanan <jonathan.russ.buchanan@gmail.com>2020-08-04 02:14:55 -0400
commit7e445c534ed34bb8097920d3505130da5c3b1d17 (patch)
treef63f78bd9dab72bf8fdd927558a55859d8e478e9
parente3fb6f93d05b8d8148cc3958b59bc16741fc32f9 (diff)
downloadwallet-kotlin-7e445c534ed34bb8097920d3505130da5c3b1d17.tar.gz
wallet-kotlin-7e445c534ed34bb8097920d3505130da5c3b1d17.tar.bz2
wallet-kotlin-7e445c534ed34bb8097920d3505130da5c3b1d17.zip
add seperate def file for libsodium static (needed for ios only)
-rw-r--r--build.gradle1
-rw-r--r--src/nativeInterop/cinterop/sodium-static.def6
-rw-r--r--src/nativeInterop/cinterop/sodium.def2
3 files changed, 7 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle
index a4239f1..e0b1a1b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,6 +56,7 @@ kotlin {
compilations.main.cinterops {
sodium {
packageName 'org.libsodium'
+ defFile project.file("src/nativeInterop/cinterop/sodium-static.def")
}
}
binaries {
diff --git a/src/nativeInterop/cinterop/sodium-static.def b/src/nativeInterop/cinterop/sodium-static.def
new file mode 100644
index 0000000..7000cbb
--- /dev/null
+++ b/src/nativeInterop/cinterop/sodium-static.def
@@ -0,0 +1,6 @@
+headers = sodium.h
+staticLibraries = libsodium.a
+libraryPaths = /usr/local/lib /usr/lib64 /usr/lib/x86_64-linux-gnu
+headerFilter = sodium.h sodium/**
+compilerOpts = -I/usr/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu/
+linkerOpts = -lsodium -L/usr/lib/x86_64-linux-gnu -L/usr/lib64/ -L/usr/local/lib
diff --git a/src/nativeInterop/cinterop/sodium.def b/src/nativeInterop/cinterop/sodium.def
index ada5019..1c90295 100644
--- a/src/nativeInterop/cinterop/sodium.def
+++ b/src/nativeInterop/cinterop/sodium.def
@@ -1,6 +1,4 @@
headers = sodium.h
-#staticLibraries = libsodium.a
-#libraryPaths = /usr/local/lib /usr/lib64 /usr/lib/x86_64-linux-gnu
headerFilter = sodium.h sodium/**
compilerOpts = -I/usr/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu/
linkerOpts = -lsodium -L/usr/lib/x86_64-linux-gnu -L/usr/lib64/ -L/usr/local/lib