From bd7c0a209d2f3bd5d108127791eabfecc477093c Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Tue, 1 Sep 2020 17:41:38 +0200
Subject: [PATCH] Update compile targets

---
 .gitignore       |  1 +
 Makefile         | 15 ++++++++++++---
 README.md        |  7 +++----
 element-desktop  |  2 +-
 matrix-react-sdk |  2 +-
 setup.sh         |  2 +-
 6 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..99fc310
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+release.mk
diff --git a/Makefile b/Makefile
index 4f0937f..f777fe2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,20 @@
-.PHONY: all web desktop
+.PHONY: all web desktop desktop-common linux windows
 
 all: desktop
 
 web:
 	yarn --cwd element-web dist
 
-desktop: web
+desktop-common: web
 	yarn --cwd element-desktop run fetch --cfgdir ''
 	yarn --cwd element-desktop run build:native
-	yarn --cwd element-desktop run build
+
+desktop: windows linux
+
+linux: desktop-common
+	yarn --cwd element-desktop run build64linux
+
+windows: desktop-common
+	yarn --cwd element-desktop run build64windows
+
+-include release.mk
diff --git a/README.md b/README.md
index 9cc9468..c4842c3 100644
--- a/README.md
+++ b/README.md
@@ -9,11 +9,10 @@ git clone --recurse-submodules https://github.com/SpiritCroc/schildichat-desktop
 ./setup.sh
 ```
 
-# Build on/for Linux
+# Build
 
 `make`
 
+# Install
 
-# Build on/for Windows
-
-TODO
+Installable packages should appear in element-desktop/dist/.
diff --git a/element-desktop b/element-desktop
index b9a21d1..db96175 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit b9a21d13d93ff18e3f13e2f2ec3158406e135409
+Subproject commit db9617521b8db7f4ffeaf6e3eff3ac5c19f1f9d2
diff --git a/matrix-react-sdk b/matrix-react-sdk
index ede46ad..ba7d80a 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit ede46ade42727f48f0ef8eb284f8d8ff72b24edc
+Subproject commit ba7d80a529c051b7057fc8d60c70b51f11a1bf31
diff --git a/setup.sh b/setup.sh
index 9e001b5..1d2c1b4 100755
--- a/setup.sh
+++ b/setup.sh
@@ -25,5 +25,5 @@ yarn link matrix-js-sdk
 yarn link matrix-react-sdk
 yarn link riot-web
 yarn install
-ln -s ../element-web/webapp ./
+ln -s ../element-web/webapp ./ || true
 popd