diff --git a/compile b/compile index f2694d917ae73ef569d755322d8b0dfd3e3b5a25..abd76511e88f159a477bc09438bb30afd863d325 100755 --- a/compile +++ b/compile @@ -1,13 +1,20 @@ #!/bin/bash # Will add all *.tw files to StoryIncludes. -rm src/config/start.tw +rm -f 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 HASH=`git log -n1 |grep commit | sed 's/commit //'` -./devTools/tweeGo/tweego -o bin/FC_pregmod.html src/config/start.tw +if [ $(uname -m) = "x86_64" ] +then + echo "x64 arch" + ./devTools/tweeGo/tweego_nix64 -o bin/FC_pregmod.html src/config/start.tw +else + echo "x86 arch" + ./devTools/tweeGo/tweego_nix86 -o bin/FC_pregmod.html src/config/start.tw +fi -rm src/config/start.tw \ No newline at end of file +rm -f src/config/start.tw diff --git a/compile-git b/compile-git index 8fb59113335a6fd11e7a41a26a18ae054d0ae7ba..930b9547344d2762cc4dc91d0d9e62f8a8e88314 100755 --- a/compile-git +++ b/compile-git @@ -1,15 +1,22 @@ #!/bin/bash # Will add all *.tw files to StoryIncludes. -rm src/config/start.tw +rm -f 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 HASH=`git log -n1 |grep -m1 commit | sed 's/commit //'` -./devTools/tweeGo/tweego -o bin/FC_pregmod_$HASH.html src/config/start.tw +if [ $(uname -m) = "x86_64" ] +then + echo "x64 arch" + ./devTools/tweeGo/tweego_nix64 -o bin/FC_pregmod_$HASH.html src/config/start.tw +else + echo "x86 arch" + ./devTools/tweeGo/tweego_nix86 -o bin/FC_pregmod_$HASH.html src/config/start.tw +fi -rm src/config/start.tw +rm -f src/config/start.tw echo "FC_pregmod_$HASH.html" compilation finished. \ No newline at end of file diff --git a/compile.bat b/compile.bat index ad188d23de34ea624b4b778f2be4ecc83edea8d0..3ef0b723fc8e988968672ceb9ab617adc7e26087 100644 --- a/compile.bat +++ b/compile.bat @@ -1,5 +1,5 @@ @echo off -:: Free Cities Basic Compiler - Windows x86_64 +:: Free Cities Basic Compiler - Windows :: Will add all *.tw files to StoryIncludes. del src\config\start.tw @@ -7,7 +7,12 @@ 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_pregmod.html" "%~dp0src\config\start.tw" +:: 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" "%~dp0src\config\start.tw" +) else ( + CALL "%~dp0devTools\tweeGo\tweego_win86.exe" -o "%~dp0bin/FC_pregmod.html" "%~dp0src\config\start.tw" +) del src\config\start.tw ECHO Done diff --git a/compile_debug.bat b/compile_debug.bat index f18903d64d566b08371f72820445c7c40b6b9c50..b5d519c99c701cb95ae4698f7ff6508ccd0a1e6e 100644 --- a/compile_debug.bat +++ b/compile_debug.bat @@ -1,16 +1,19 @@ -@echo off -:: Free Cities Basic Compiler - Windows x86_64 -:: Will wait for keypress before terminating. - -:: Will add all *.tw files to StoryIncludes. -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_pregmod.html" "%~dp0src\config\start.tw" - -del src\config\start.tw - -ECHO Done -PAUSE \ No newline at end of file +@echo off +:: Free Cities Basic Compiler - Windows + +:: Will add all *.tw files to StoryIncludes. +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 + +:: 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" "%~dp0src\config\start.tw" +) else ( + CALL "%~dp0devTools\tweeGo\tweego_win86.exe" -o "%~dp0bin/FC_pregmod.html" "%~dp0src\config\start.tw" +) + +del src\config\start.tw +ECHO Done +PAUSE diff --git a/devTools/tweeGo/tweego b/devTools/tweeGo/tweego_nix64 similarity index 100% rename from devTools/tweeGo/tweego rename to devTools/tweeGo/tweego_nix64 diff --git a/devTools/tweeGo/tweego_nix86 b/devTools/tweeGo/tweego_nix86 new file mode 100755 index 0000000000000000000000000000000000000000..c91c3abca782b8360596c23210b087f4eb463b3f Binary files /dev/null and b/devTools/tweeGo/tweego_nix86 differ diff --git a/devTools/tweeGo/tweego_osx64 b/devTools/tweeGo/tweego_osx64 new file mode 100644 index 0000000000000000000000000000000000000000..eeb7546c9016ca01b95cb9d35f16316ad22892c1 Binary files /dev/null and b/devTools/tweeGo/tweego_osx64 differ diff --git a/devTools/tweeGo/tweego_osx86 b/devTools/tweeGo/tweego_osx86 new file mode 100644 index 0000000000000000000000000000000000000000..72adf92cce305e270afe31564331525ebd4bd5e0 Binary files /dev/null and b/devTools/tweeGo/tweego_osx86 differ diff --git a/devTools/tweeGo/tweego.exe b/devTools/tweeGo/tweego_win64.exe similarity index 100% rename from devTools/tweeGo/tweego.exe rename to devTools/tweeGo/tweego_win64.exe diff --git a/devTools/tweeGo/tweego_win86.exe b/devTools/tweeGo/tweego_win86.exe new file mode 100644 index 0000000000000000000000000000000000000000..539381287e76cea07d2eec4e9b161fd3e7ad80cb Binary files /dev/null and b/devTools/tweeGo/tweego_win86.exe differ