Large vanilla changes to compiling, enhancements and bugfixes. Beginning of...

Large vanilla changes to compiling, enhancements and bugfixes. Beginning of incubator functionality.

Makefile

-PYTHON?= python
-ifeq (${MAKE_HOST}, x86_64-unknown-cygwin)
-	TWEEGOBIN?= tweego.exe
-else
-	TWEEGOBIN?= tweego
-endif
-
-SRCDIR?= src
-STARTFILE?= $(SRCDIR)/config/start.tw
-FCTARG?= bin/FC.html
-GENINCLUDES?=  ./devTools/scripts/includes.py
-all: $(FCTARG)
-
-$(STARTFILE):	$(SRCDIR)/config/start.tw.proto $(GENINCLUDES) \
-		$(shell find ${SRCDIR} -type d -print)
-	$(PYTHON) $(GENINCLUDES) $< $@ $(SRCDIR)
-
-$(FCTARG): $(STARTFILE) $(shell find ${SRCDIR} -type f -name \*.tw -print)
-	./devTools/tweeGo/$(TWEEGOBIN) -o $(FCTARG) $(STARTFILE)
-
-clean:
-	-$(RM) $(STARTFILE) $(FCTARG)

compile

+#!/bin/bash
+
+# Will add all *.tw files to StoryIncludes.
+rm src/config/start.tw
+cp src/config/start.tw.proto start.tw.tmp
+find src -name '*.tw' -print >>start.tw.tmp
+mv start.tw.tmp src/config/start.tw
+
+./devTools/tweeGo/tweego -o bin/FC.html src/config/start.tw
\ No newline at end of file

compile.bat

 @echo off
 :: Free Cities Basic Compiler - Windows x86_64
 
-:: Uses embedded Python 3.5.3 x86_64
 :: Will add all *.tw files to StoryIncludes.
-"%~dp0devTools\python-3.5.3\python.exe" "%~dp0devTools\scripts\includes.py" "src\config\start.tw.proto" "src\config\start.tw" "src" "%*"
+del src\config\start.tw
+copy src\config\start.tw.proto start.tw.tmp >nul
+>>start.tw.tmp (for /r "src" %%F in (*.tw) do echo %%F)
+move start.tw.tmp src\config\start.tw >nul
 
 CALL "%~dp0devTools\tweeGo\tweego.exe" -o "%~dp0bin/FC.html" "%~dp0src\config\start.tw"
 ECHO Done

compile_debug.bat

@@ -2,10 +2,12 @@
 :: Free Cities Basic Compiler - Windows x86_64
 :: Will wait for keypress before terminating.
 
-:: Uses embedded Python 3.5.3 x86_64
 :: Will add all *.tw files to StoryIncludes.
-"%~dp0devTools\python-3.5.3\python.exe" "%~dp0devTools\scripts\includes.py" "src\config\start.tw.proto" "src\config\start.tw" "src" "%*"
+del src\config\start.tw
+copy src\config\start.tw.proto start.tw.tmp >nul
+>>start.tw.tmp (for /r "src" %%F in (*.tw) do echo %%F)
+move start.tw.tmp src\config\start.tw >nul
 
 CALL "%~dp0devTools\tweeGo\tweego.exe" -o "%~dp0bin/FC.html" "%~dp0src\config\start.tw"
 ECHO Done
-PAUSE
+PAUSE
\ No newline at end of file