git » sdk » commit 643d06e

Fix browser build, update Makefile

author Stephen Paul Weber
2024-04-16 17:16:48 UTC
committer Stephen Paul Weber
2024-04-16 17:16:48 UTC
parent 0ee7860e3dc5a77bbdd8c34a297866ed6a30fddb

Fix browser build, update Makefile

Makefile +8 -8
browser.hxml +1 -0
snikket/persistence/Dummy.hx +0 -9

diff --git a/Makefile b/Makefile
index 65a7096..d97d2a1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,17 @@
 HAXE_PATH=$$HOME/Software/haxe-4.3.1/hxnodejs/12,1,0/src
 
-.PHONY: all run-nodejs
+.PHONY: all
 
-all: test.node.js
-
-test.node.js: snikket/*.hx snikket/queries/*.hx snikket/streams/*.hx
-	haxe -D nodejs -D no-deprecation-warnings -m Main --js "$@" -cp "$(HAXE_PATH)"
-
-run-nodejs: test.node.js
-	nodejs "$<"
+all: browser.js libsnikket.so
 
 browser.js:
 	haxe browser.hxml
 	echo "var exports = {};" > browser.js
 	cat snikket/persistence/*.js >> browser.js
 	echo "export const { snikket } = exports;" >> browser.js
+
+cpp/output.dso:
+	haxe cpp.hxml
+
+libsnikket.so: cpp/output.dso
+	cp cpp/output.dso libsnikket.so
diff --git a/browser.hxml b/browser.hxml
index 532413a..7d2de8b 100644
--- a/browser.hxml
+++ b/browser.hxml
@@ -3,6 +3,7 @@
 --library hsluv
 --library tink_http
 --library sha
+--library thenshim
 
 snikket.Client
 snikket.Push
diff --git a/snikket/persistence/Dummy.hx b/snikket/persistence/Dummy.hx
index 2c3e1d7..19147ea 100644
--- a/snikket/persistence/Dummy.hx
+++ b/snikket/persistence/Dummy.hx
@@ -3,16 +3,7 @@ package snikket.persistence;
 #if cpp
 import HaxeCBridge;
 #end
-import datetime.DateTime;
-import haxe.Json;
-import haxe.crypto.Base64;
-import haxe.crypto.Sha1;
-import haxe.crypto.Sha256;
-import haxe.io.Bytes;
 import haxe.io.BytesData;
-import sys.FileSystem;
-import sys.db.Connection;
-import sys.io.File;
 import snikket.Caps;
 import snikket.Chat;
 import snikket.Message;