From a280db016264a0abe91c99dd24d087b08bd639c0 Mon Sep 17 00:00:00 2001
From: StuffedAnon <stuffedgame@gmail.com>
Date: Sun, 17 Mar 2019 20:37:51 +0900
Subject: [PATCH] Add the favicon
---
compile | 2 +-
compile-git | 2 +-
compile-git+java-sanityCheck.sh | 2 +-
compile.bat | 4 ++--
devTools/head.html | 4 ++++
5 files changed, 9 insertions(+), 5 deletions(-)
create mode 100644 devTools/head.html
diff --git a/compile b/compile
index cc15b4a3bac..fe95b68a0c2 100755
--- a/compile
+++ b/compile
@@ -55,7 +55,7 @@ else
esac
fi
-$TWEEGO_EXE -o "bin/FC_pregmod_tmp.html" src/ || build_failed="true"
+$TWEEGO_EXE -o "bin/FC_pregmod_tmp.html" src/ --head devTools/head.html || build_failed="true"
# Revert AlphaDisclaimer for next compilation
git checkout -- src/gui/mainMenu/AlphaDisclaimer.tw
diff --git a/compile-git b/compile-git
index c0b438e9363..2897281674b 100755
--- a/compile-git
+++ b/compile-git
@@ -37,7 +37,7 @@ else
esac
fi
-$TWEEGO_EXE -o "bin/FC_pregmod_${HASH}_tmp.html" src/
+$TWEEGO_EXE -o "bin/FC_pregmod_${HASH}_tmp.html" src/ --head devTools/head.html || build_failed="true"
#Make the output prettier, replacing \t with a tab and \n with a newline
sed -i -e '/^<div id="store-area".*$/s/\\t/\t/g' -e '/^<div id="store-area".*$/s/\\n/\n/g' "bin/FC_pregmod_${HASH}_tmp.html" \
diff --git a/compile-git+java-sanityCheck.sh b/compile-git+java-sanityCheck.sh
index 16f5d6ec2d1..2fd438b3d4f 100755
--- a/compile-git+java-sanityCheck.sh
+++ b/compile-git+java-sanityCheck.sh
@@ -37,7 +37,7 @@ else
esac
fi
-$TWEEGO_EXE -o "bin/FC_pregmod_${HASH}_tmp.html" src/
+$TWEEGO_EXE -o "bin/FC_pregmod_${HASH}_tmp.html" src/ --head devTools/head.html || build_failed="true"
#Make the output prettier, replacing \t with a tab and \n with a newline
sed -i -e '/^<div id="store-area".*$/s/\\t/\t/g' -e '/^<div id="store-area".*$/s/\\n/\n/g' "bin/FC_pregmod_${HASH}_tmp.html" \
diff --git a/compile.bat b/compile.bat
index 03d861e77d5..c095971fa11 100644
--- a/compile.bat
+++ b/compile.bat
@@ -6,9 +6,9 @@ pushd %~dp0
if not exist "bin\" mkdir bin
:: Run the appropriate compiler for the user's CPU architecture.
if %PROCESSOR_ARCHITECTURE% == AMD64 (
- CALL "%~dp0devTools\tweeGo\tweego_win64.exe" -o "%~dp0bin/FC_pregmod.html" "%~dp0src"
+ CALL "%~dp0devTools\tweeGo\tweego_win64.exe" -o "%~dp0bin/FC_pregmod.html" --head devTools/head.html "%~dp0src"
) else (
- CALL "%~dp0devTools\tweeGo\tweego_win86.exe" -o "%~dp0bin/FC_pregmod.html" "%~dp0src"
+ CALL "%~dp0devTools\tweeGo\tweego_win86.exe" -o "%~dp0bin/FC_pregmod.html" --head devTools/head.html "%~dp0src"
)
popd
diff --git a/devTools/head.html b/devTools/head.html
new file mode 100644
index 00000000000..e32f29194f6
--- /dev/null
+++ b/devTools/head.html
@@ -0,0 +1,4 @@
+<!-- Added to the <head> of the html file -->
+<link rel="shortcut icon" type="image/x-icon" href="resources/raster/favicon/arcologyVector.ico">
+
+
--
GitLab