Skip to content
Snippets Groups Projects
Commit 65b5ef98 authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'pregmod-master' into 'pregmod-master'

Locally force TWEEGO_PATH when building FC

Closes #2698

See merge request pregmodfan/fc-pregmod!8854
parents 7010bd58 5ae354cd
No related branches found
No related tags found
No related merge requests found
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
:: Set working directory :: Set working directory
pushd %~dp0 pushd %~dp0
SETLOCAL
:: See if we can find a git installation :: See if we can find a git installation
set GITFOUND=no set GITFOUND=no
...@@ -29,6 +30,7 @@ if %GITFOUND% == yes ( ...@@ -29,6 +30,7 @@ if %GITFOUND% == yes (
if not exist "bin\resources" mkdir bin\resources if not exist "bin\resources" mkdir bin\resources
CALL devTools/concatFiles.bat js\ "*.js" bin\fc.js CALL devTools/concatFiles.bat js\ "*.js" bin\fc.js
CALL devTools/concatFiles.bat css\ "*.css" bin\fc.css CALL devTools/concatFiles.bat css\ "*.css" bin\fc.css
SET TWEEGO_PATH=%~dp0devTools\tweeGo\storyFormats
:: Run the appropriate compiler for the user's CPU architecture. :: Run the appropriate compiler for the user's CPU architecture.
if %PROCESSOR_ARCHITECTURE% == AMD64 ( if %PROCESSOR_ARCHITECTURE% == AMD64 (
CALL "%~dp0devTools\tweeGo\tweego_win64.exe" -o "%~dp0bin/FC_pregmod.html" --module=bin/fc.js --module=bin/fc.css --head resources/raster/favicon/arcologyVector.html "%~dp0src" CALL "%~dp0devTools\tweeGo\tweego_win64.exe" -o "%~dp0bin/FC_pregmod.html" --module=bin/fc.js --module=bin/fc.css --head resources/raster/favicon/arcologyVector.html "%~dp0src"
...@@ -39,5 +41,6 @@ DEL bin\fc.js ...@@ -39,5 +41,6 @@ DEL bin\fc.js
DEL bin\fc.css DEL bin\fc.css
IF EXIST "%~dp0src\002-config\fc-version.js.commitHash.js" DEL "%~dp0src\002-config\fc-version.js.commitHash.js" IF EXIST "%~dp0src\002-config\fc-version.js.commitHash.js" DEL "%~dp0src\002-config\fc-version.js.commitHash.js"
ENDLOCAL
popd popd
ECHO Done ECHO Done
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