Updated compile scripts, now detect target bitness automatically and take -n -f -d as a commandline argument to determine compile mode

Author: bunnylin

comp.bat

@@ -1,27 +1,48 @@
 @echo off
 echo ----------------------------------------------------------------------
-set mode=d32
+
+REM Ask the compiler how many bits we're targeting
+for /F "delims=" %%A in ('fpc -iTP') do set tcpu=%%A
+if %tcpu%==i386 set bits=32
+if %tcpu%==x86_64 set bits=64
+
+REM Check commandline's first parameter for -n -f -d mode, -d is default
+set mode=d%bits%
+if "%1"=="-n" (
+  set mode=n%bits%
+  shift
+)
+if "%1"=="-f" (
+  set mode=fpo%bits%
+  shift
+)
+if "%1"=="-d" (
+  set mode=d%bits%
+  shift
+)
+
+echo Compile mode: %mode%
 
 REM When switching between modes, add -B as an argument to rebuild all code
 
 REM Normal:
-if %mode%==32 fpc -CX -XXs- -O3oloopunroll,deadstore -OpPentium3 -CpPentium %*
-if %mode%==64 fpc -CX -XXs- -O3oloopunroll,deadstore -CpAthlon64 %*
+if %mode%==n32 fpc -CX -XXs- -O3oloopunroll,deadstore -OpPentium3 -CpPentium %1 %2 %3 %4
+if %mode%==n64 fpc -CX -XXs- -O3oloopunroll,deadstore -CpAthlon64 %1 %2 %3 %4
 
 REM Full-program optimised:
 if %mode%==fpo32 (
-fpc -FWopti.dat -CX -XXs- -O3oloopunroll,deadstore -OWall -OpPentium3 -CpPentium %*
-fpc -Fwopti.dat -CX -XXs -O3oloopunroll,deadstore -Owall -OpPentium3 -CpPentium %*
+fpc -FWopti.dat -CX -XXs- -O3oloopunroll,deadstore -OWall -OpPentium3 -CpPentium %1 %2 %3 %4
+fpc -Fwopti.dat -CX -XXs -O3oloopunroll,deadstore -Owall -OpPentium3 -CpPentium %1 %2 %3 %4
 if exist opti.dat del opti.dat 1>nul
 )
 
 if %mode%==fpo64 (
-fpc -FWopti.dat -CX -XXs- -O3oloopunroll,deadstore -OWall -CpAthlon64 %*
-fpc -Fwopti.dat -CX -XXs -O3oloopunroll,deadstore -Owall -CpAthlon64 %*
+fpc -FWopti.dat -CX -XXs- -O3oloopunroll,deadstore -OWall -CpAthlon64 %1 %2 %3 %4
+fpc -Fwopti.dat -CX -XXs -O3oloopunroll,deadstore -Owall -CpAthlon64 %1 %2 %3 %4
 if exist opti.dat del opti.dat 1>nul
 )
 
 REM Debug: (add -gc in FPC304+, see if still crashes unit compilation)
-if %mode%==d32 fpc -ghlt -vwinh -XXs- -Cotr -O3odeadstore -OpPentium3 -CpPentium %*
-if %mode%==d64 fpc -ghlt -vwinh -XXs- -Cotr -O3odeadstore -CpAthlon64 %*
+if %mode%==d32 fpc -ghlt -vwinh -XXs- -Cotr -O3odeadstore -OpPentium3 -CpPentium %1 %2 %3 %4
+if %mode%==d64 fpc -ghlt -vwinh -XXs- -Cotr -O3odeadstore -CpAthlon64 %1 %2 %3 %4
 

comp.sh

@@ -1,23 +1,38 @@
+echo ----------------------------------------------------------------
+
+# Ask the compiler how many bits we're targeting
+TCPU="$(fpc -iTP)"
+if [ "$TCPU" = "i386" ]; then BITS=32; fi
+if [ "$TCPU" = "x86_64" ]; then BITS=64; fi
+
+# Check commandline's first parameter for -n -f -d mode, -d is default
+
+mode=d$BITS
+if [ "$1" = "-n" ]; then mode=n$BITS; shift; fi
+if [ "$1" = "-f" ]; then mode=fpo$BITS; shift; fi
+if [ "$1" = "-d" ]; then mode=d$BITS; shift; fi
+
+echo "Compile mode: $mode"
+
 # When switching between modes, add -B as an argument to rebuild all code
-mode="d64"
 
 # Normal:
-if [ "$mode" = "32" ]; then fpc -CX -XXs- -O3oloopunroll,deadstore -OpPentium3 -CpPentium $*; fi
-if [ "$mode" = "64" ]; then fpc -CX -XXs- -O3oloopunroll,deadstore -CpAthlon64 $*; fi
+if [ "$mode" = "n32" ]; then fpc -CX -XXs- -O3oloopunroll,deadstore -OpPentium3 -CpPentium $1 $2 $3 $4; fi
+if [ "$mode" = "n64" ]; then fpc -CX -XXs- -O3oloopunroll,deadstore -CpAthlon64 $1 $2 $3 $4; fi
 
 # Full-program optimised:
 if [ "$mode" = "fpo32" ]; then
-fpc -FWopti.dat -CX -XXs- -O3oloopunroll,deadstore -OWall -OpPentium3 -CpPentium $*
-fpc -Fwopti.dat -CX -XXs -O3oloopunroll,deadstore -Owall -OpPentium3 -CpPentium $*
-if [-e opti.dat]; then rm opti.dat; fi
+fpc -FWopti.dat -CX -XXs- -O3oloopunroll,deadstore -OWall -OpPentium3 -CpPentium $1 $2 $3 $4
+fpc -Fwopti.dat -CX -XXs -O3oloopunroll,deadstore -Owall -OpPentium3 -CpPentium $1 $2 $3 $4
+if [ -e opti.dat ]; then rm opti.dat; fi
 fi
 
 if [ "$mode" = "fpo64" ]; then
-fpc -FWopti.dat -CX -XXs- -O3oloopunroll,deadstore -OWall -CpAthlon64 $*
-fpc -Fwopti.dat -CX -XXs -O3oloopunroll,deadstore -Owall -CpAthlon64 $*
-if [-e opti.dat]; then rm opti.dat; fi
+fpc -FWopti.dat -CX -XXs- -O3oloopunroll,deadstore -OWall -CpAthlon64 $1 $2 $3 $4
+fpc -Fwopti.dat -CX -XXs -O3oloopunroll,deadstore -Owall -CpAthlon64 $1 $2 $3 $4
+if [ -e opti.dat ]; then rm opti.dat; fi
 fi
 
 # Debug: (-gc not supported yet)
-if [ "$mode" = "d32" ]; then fpc -ghlt -vwinh -XXs- -Cotr -O3odeadstore -OpPentium3 -CpPentium $*; fi
-if [ "$mode" = "d64" ]; then fpc -ghlt -vwinh -XXs- -Cotr -O3odeadstore -CpAthlon64 $*; fi
+if [ "$mode" = "d32" ]; then fpc -ghlt -vwinh -XXs- -Cotr -O3odeadstore -OpPentium3 -CpPentium $1 $2 $3 $4; fi
+if [ "$mode" = "d64" ]; then fpc -ghlt -vwinh -XXs- -Cotr -O3odeadstore -CpAthlon64 $1 $2 $3 $4; fi