Merge 3bfa152 into e2c01aa

deltachat · Oct 4, 2018 · 73f5465 · 73f5465
2 parents e2c01aa + 3bfa152
commit 73f5465
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -8,10 +8,11 @@
           "libraries": [
             "../deltachat-core/builddir/src/libdeltachat.a",
             "../deltachat-core/builddir/libs/libetpan/libetpan.a",
+            "../deltachat-core/builddir/libs/cyrussasl/libsals2.a",
+            "../deltachat-core/builddir/libs/zlib-1.2.11/libz.a",
             "../deltachat-core/builddir/libs/netpgp/libnetpgp.a",
-            "-lsasl2",
-            "-lssl",
-            "-lsqlite3",
+            "../deltachat-core/builddir/libs/openssl/libcrypto.a",
+            "../deltachat-core/builddir/libs/sqlite/libsqlite.a",
             "-lpthread"
           ]
         }]

diff --git a/scripts/rebuild-all.js b/scripts/rebuild-all.js
@@ -14,7 +14,10 @@ log(`>> Creating ${coreBuildDir}`)
 mkdirp.sync(coreBuildDir)
 
 const mesonOpts = { cwd: coreBuildDir }
-const mesonArgs = [ '--default-library=static' ]
+const mesonArgs = [
+  '--default-library=static',
+  '--wrap-mode=forcefallback'
+]
 if (verbose) mesonOpts.stdio = 'inherit'
 spawn('meson', mesonArgs, mesonOpts)