Skip to content
Snippets Groups Projects
Commit ffe58cf9 authored by Arkerthan's avatar Arkerthan
Browse files

embedded favicon so no resources folder is required to display it

parent c67068d2
No related branches found
No related tags found
No related merge requests found
......@@ -37,7 +37,7 @@ bin/fc.js: bin/
devTools/concatFiles.sh js/ '*.js' $@
bin/tmp: bin/fc.js injectGitCommitHash
$(TWEEGO) --module=bin/fc.js --head devTools/head.html src/ > $@
$(TWEEGO) --module=bin/fc.js --head resources/raster/favicon/arcologyVector.html src/ > $@
rm -f bin/fc.js
injectGitCommitHash:
......
......@@ -19,7 +19,7 @@
"src/art/vector_revamp/layers"
]
},
"head": "devTools/head.html"
"head": "resources/raster/favicon/arcologyVector.html"
},
"options": {
"css": {
......
......@@ -30,9 +30,9 @@ if not exist "bin\resources" mkdir bin\resources
CALL devTools/concatFiles.bat js\ "*.js" bin\fc.js
:: 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" --module=bin/fc.js --head devTools/head.html "%~dp0src"
CALL "%~dp0devTools\tweeGo\tweego_win64.exe" -o "%~dp0bin/FC_pregmod.html" --module=bin/fc.js --head resources/raster/favicon/arcologyVector.html "%~dp0src"
) else (
CALL "%~dp0devTools\tweeGo\tweego_win86.exe" -o "%~dp0bin/FC_pregmod.html" --module=bin/fc.js --head devTools/head.html "%~dp0src"
CALL "%~dp0devTools\tweeGo\tweego_win86.exe" -o "%~dp0bin/FC_pregmod.html" --module=bin/fc.js --head resources/raster/favicon/arcologyVector.html "%~dp0src"
)
DEL bin\fc.js
IF EXIST "%~dp0src\002-config\fc-version.js.commitHash.js" DEL "%~dp0src\002-config\fc-version.js.commitHash.js"
......
......@@ -75,7 +75,7 @@ function compile() {
fi
devTools/concatFiles.sh js/ '*.js' bin/fc.js
$TWEEGO_EXE -o $file --module=bin/fc.js --head devTools/head.html src/ || build_failed="true"
$TWEEGO_EXE -o $file --module=bin/fc.js --head resources/raster/favicon/arcologyVector.html src/ || build_failed="true"
rm -f bin/fc.js
if [ "$build_failed" = "true" ]; then
echoError "Build failed."
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment