[taler-wallet-kotlin] branch master updated: add seperate def file for libsodium static (needed for ios only)

[gnunet]

This is an automated email from the git hooks/post-receive script.

jonathan-buchanan pushed a commit to branch master
in repository wallet-kotlin.

The following commit(s) were added to refs/heads/master by this push:
     new 7e445c5  add seperate def file for libsodium static (needed for ios 
only)
7e445c5 is described below

commit 7e445c534ed34bb8097920d3505130da5c3b1d17
Author: Jonathan Buchanan <jonathan.russ.buchanan@gmail.com>
AuthorDate: Tue Aug 4 02:14:55 2020 -0400

    add seperate def file for libsodium static (needed for ios only)
---
 build.gradle                                                 | 1 +
 src/nativeInterop/cinterop/{sodium.def => sodium-static.def} | 4 ++--
 src/nativeInterop/cinterop/sodium.def                        | 2 --
 3 files changed, 3 insertions(+), 4 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.def 
b/src/nativeInterop/cinterop/sodium-static.def
similarity index 68%
copy from src/nativeInterop/cinterop/sodium.def
copy to src/nativeInterop/cinterop/sodium-static.def
index ada5019..7000cbb 100644
--- a/src/nativeInterop/cinterop/sodium.def
+++ b/src/nativeInterop/cinterop/sodium-static.def
@@ -1,6 +1,6 @@
 headers = sodium.h
-#staticLibraries = libsodium.a
-#libraryPaths = /usr/local/lib /usr/lib64 /usr/lib/x86_64-linux-gnu
+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

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.