Skip to content
Snippets Groups Projects
Commit 6f50fe0c authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'third-resources-attempt' into 'pregmod-master'

third time charm maybe

See merge request !4979
parents 49674fc3 678db2e0
No related branches found
No related tags found
1 merge request!4979third time charm maybe
......@@ -3,7 +3,7 @@
:: Set working directory
pushd %~dp0
if not exist "bin\" mkdir bin
if not exist "bin\resources" mkdir bin\resources
:: 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" --head devTools/head.html "%~dp0src"
......
......@@ -86,7 +86,7 @@ function compile {
#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' $file
ln -s ../resources bin/ 2> /dev/null
mkdir -p bin/resources
if [[ ! "$usehash" ]]; then git checkout -- src/gui/mainMenu/AlphaDisclaimer.tw;fi # Revert AlphaDisclaimer for next compilation
echoMessage "Saved to $file."
}
......
There are actually two places to add art for FreeCities. The folder you are currently in, ./resources, is mostly for the git. Once you compile an HTML, the HTML won't check here for art.
If you are interested in adding the old renders or your own custom art to your local version of FreeCities, then you actually want to have a resources folder in the same folder FC_pregmod.html is in. By default, that will be ./bin/resources. If you want any of the art in this folder, make sure to copy it over there.
Two different resources folders, and both connected to art. But they work very differently.
P.S. make sure you don't stack resources folders, like resources/resources. That would just be silly.
\ No newline at end of file
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