Fix webapp compile on Windows

This commit is contained in:
SpiritCroc 2024-10-20 17:01:12 +02:00
parent a8eb3ece19
commit 630f4f786e
3 changed files with 36 additions and 1 deletions

@ -1 +1 @@
Subproject commit 47bcb08e971256fe94a0b07fb553b75400e648ed
Subproject commit 16fe0fe8d0068e4c5da3fa5516c5578d2ffaabc7

View File

@ -0,0 +1,32 @@
From 16fe0fe8d0068e4c5da3fa5516c5578d2ffaabc7 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 20 Oct 2024 17:00:19 +0200
Subject: Don't symlink css to fix Windows-native build
---
.gitignore | 2 ++
res/css/sc-cpd-overrides.css | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
delete mode 120000 res/css/sc-cpd-overrides.css
diff --git a/.gitignore b/.gitignore
index 3137cd555b..5345301b97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+res/css/sc-*.css
+
/.npmrc
/*.log
package-lock.json
diff --git a/res/css/sc-cpd-overrides.css b/res/css/sc-cpd-overrides.css
deleted file mode 120000
index 532e96fddc..0000000000
--- a/res/css/sc-cpd-overrides.css
+++ /dev/null
@@ -1 +0,0 @@
-../../../res/css/sc-cpd-overrides.css
\ No newline at end of file
--
2.47.0

View File

@ -34,3 +34,6 @@ popd
pushd i18n-helper
$yarn install
popd
# CSS overrides
cp res/css/* matrix-react-sdk/res/css/