summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-02-26 15:22:37 +0100
committerGitHub <noreply@github.com>2021-02-26 15:22:37 +0100
commit40a70f1657dc9107666b78b58e97e8615ea7f3ff (patch)
tree00608536a59a7001e34cb30534af8e7d5d237939
parent7bb0d39da4333032d9bb9205ed8d2158692035eb (diff)
parent4404eb57e447a5a177af86cfd7cf2607e682bf36 (diff)
Merge pull request #46449 from Faless/js/4.x_editor_html_scons4
[HTML5] Make editor HTML build tag scons4-proof.
-rw-r--r--misc/dist/html/editor.html4
-rw-r--r--platform/javascript/SCsub2
2 files changed, 3 insertions, 3 deletions
diff --git a/misc/dist/html/editor.html b/misc/dist/html/editor.html
index b0b906270b..535721f418 100644
--- a/misc/dist/html/editor.html
+++ b/misc/dist/html/editor.html
@@ -4,7 +4,7 @@
<meta charset='utf-8' />
<meta name='viewport' content='width=device-width, user-scalable=no' />
<link id='-gd-engine-icon' rel='icon' type='image/png' href='favicon.png' />
- <title>Godot Engine Web Editor ($GODOT_VERSION)</title>
+ <title>Godot Engine Web Editor (@GODOT_VERSION@)</title>
<style>
*:focus {
/* More visible outline for better keyboard navigation. */
@@ -205,7 +205,7 @@
<br />
<img src="logo.svg" width="1024" height="414" style="width: auto; height: auto; max-width: 85%; max-height: 250px" />
<br />
- $GODOT_VERSION
+ @GODOT_VERSION@
<br />
<a href="releases/">Need an old version?</a>
<br />
diff --git a/platform/javascript/SCsub b/platform/javascript/SCsub
index ab527ef419..e9ec531cc7 100644
--- a/platform/javascript/SCsub
+++ b/platform/javascript/SCsub
@@ -97,7 +97,7 @@ out_files = [
]
html_file = "#misc/dist/html/full-size.html"
if env["tools"]:
- subst_dict = {"\$GODOT_VERSION": env.GetBuildVersion()}
+ subst_dict = {"@GODOT_VERSION@": env.GetBuildVersion()}
html_file = env.Substfile(
target="#bin/godot${PROGSUFFIX}.html", source="#misc/dist/html/editor.html", SUBST_DICT=subst_dict
)