Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fc-pregmod
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pregmodfan
fc-pregmod
Commits
a280db01
Commit
a280db01
authored
6 years ago
by
Stuffed
Browse files
Options
Downloads
Patches
Plain Diff
Add the favicon
parent
e3ce4db3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!3934
Add the favicon
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
compile
+1
-1
1 addition, 1 deletion
compile
compile-git
+1
-1
1 addition, 1 deletion
compile-git
compile-git+java-sanityCheck.sh
+1
-1
1 addition, 1 deletion
compile-git+java-sanityCheck.sh
compile.bat
+2
-2
2 additions, 2 deletions
compile.bat
devTools/head.html
+4
-0
4 additions, 0 deletions
devTools/head.html
with
9 additions
and
5 deletions
compile
+
1
−
1
View file @
a280db01
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
compile-git
+
1
−
1
View file @
a280db01
...
...
@@ -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"
\
...
...
This diff is collapsed.
Click to expand it.
compile-git+java-sanityCheck.sh
+
1
−
1
View file @
a280db01
...
...
@@ -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"
\
...
...
This diff is collapsed.
Click to expand it.
compile.bat
+
2
−
2
View file @
a280db01
...
...
@@ -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
"
%~dp0
devTools\tweeGo\tweego_win64.exe"
-o
"
%~dp0
bin/FC_pregmod.html"
"
%~dp0
src"
CALL
"
%~dp0
devTools\tweeGo\tweego_win64.exe"
-o
"
%~dp0
bin/FC_pregmod.html"
--head
devTools
/head
.html
"
%~dp0
src"
)
else
(
CALL
"
%~dp0
devTools\tweeGo\tweego_win86.exe"
-o
"
%~dp0
bin/FC_pregmod.html"
"
%~dp0
src"
CALL
"
%~dp0
devTools\tweeGo\tweego_win86.exe"
-o
"
%~dp0
bin/FC_pregmod.html"
--head
devTools
/head
.html
"
%~dp0
src"
)
popd
...
...
This diff is collapsed.
Click to expand it.
devTools/head.html
0 → 100644
+
4
−
0
View file @
a280db01
<!-- Added to the <head> of the html file -->
<link
rel=
"shortcut icon"
type=
"image/x-icon"
href=
"resources/raster/favicon/arcologyVector.ico"
>
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment