diff --git a/compile.bat b/compile.bat index c095971fa11a97bfebc5edd0738d819ad2dd8176..ad3570dfc45fe2b8291d3652546ccab784faa625 100644 --- a/compile.bat +++ b/compile.bat @@ -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" diff --git a/compile.sh b/compile.sh index 5f404f908d26fcc25af19f71f52847f470ab83b7..ebc27c41a500f9d9b6f4fbadfb0160b9175449b3 100755 --- a/compile.sh +++ b/compile.sh @@ -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." } diff --git a/resources/Readme before adding art.md b/resources/Readme before adding art.md new file mode 100644 index 0000000000000000000000000000000000000000..6dcb4f8b7dab8f121c3da965d618d31aaef23b3d --- /dev/null +++ b/resources/Readme before adding art.md @@ -0,0 +1,7 @@ +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