Update compile targets

2025-03-31 21:24:27 +02:00 · 2020-09-01 17:41:38 +02:00 · 2020-09-01 17:41:38 +02:00 · bd7c0a209d
commit bd7c0a209d
parent 599fe14f46
6 changed files with 19 additions and 10 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+release.mk
--- a/15
+++ b/15
@ -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
--- 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/.
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit b9a21d13d93ff18e3f13e2f2ec3158406e135409
+Subproject commit db9617521b8db7f4ffeaf6e3eff3ac5c19f1f9d2
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit ede46ade42727f48f0ef8eb284f8d8ff72b24edc
+Subproject commit ba7d80a529c051b7057fc8d60c70b51f11a1bf31
--- 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