Add multi-arch binaries for Windows/macOS/Linux

dennisameling · May 2, 2021 · 5f28c4b · 5f28c4b
1 parent 7ecf70b
commit 5f28c4b
Show file tree

Hide file tree

Showing 14 changed files with 7 additions and 5 deletions.
diff --git a/dist/zkgroup/internal/Native.js b/dist/zkgroup/internal/Native.js
diff --git a/libzkgroup-arm64.dll b/libzkgroup-arm64.dll
diff --git a/libzkgroup-arm64.dylib b/libzkgroup-arm64.dylib
diff --git a/libzkgroup-arm64.so b/libzkgroup-arm64.so
diff --git a/libzkgroup-ia32.dll b/libzkgroup-ia32.dll
diff --git a/libzkgroup-ia32.so b/libzkgroup-ia32.so
diff --git a/libzkgroup-x64.dll b/libzkgroup-x64.dll
diff --git a/libzkgroup-x64.dylib b/libzkgroup-x64.dylib
diff --git a/libzkgroup-x64.so b/libzkgroup-x64.so
diff --git a/libzkgroup.dll b/libzkgroup.dll
diff --git a/libzkgroup.dylib b/libzkgroup.dylib
diff --git a/libzkgroup.so b/libzkgroup.so
diff --git a/package.json b/package.json
@@ -8,9 +8,9 @@
     "dist/zkgroup",
     "dist/index.d.ts",
     "zkgroup/modules",
-    "libzkgroup.dylib",
-    "libzkgroup.dll",
-    "libzkgroup.so"
+    "libzkgroup-*.dylib",
+    "libzkgroup-*.dll",
+    "libzkgroup-*.so"
   ],
   "scripts": {
     "build": "tsc",

diff --git a/zkgroup/internal/Native.ts b/zkgroup/internal/Native.ts
@@ -1,6 +1,7 @@
 import { join, resolve } from 'path';
 import { Library } from 'ffi-napi';
 import FFICompatArray, { FFICompatArrayType } from './FFICompatArray';
+import * as process from 'process';
 
 type IntType = number;
 type UInt32Type = number;
@@ -15,7 +16,7 @@ export const RANDOM_LENGTH = 32;
 const rootPath = resolve(`${__dirname}/../../../`);
 
 // We need to do things differently if we are in an app.asar, common in the Electron world
-const libraryPath = join(rootPath.replace('app.asar', 'app.asar.unpacked'), 'libzkgroup');
+const libraryPath = join(rootPath.replace('app.asar', 'app.asar.unpacked'), 'libzkgroup-' + process.arch);
 
 
 interface NativeCalls {