ADDED   Externals/Eagle/bin/EagleShell32.exe
Index: Externals/Eagle/bin/EagleShell32.exe
==================================================================
--- Externals/Eagle/bin/EagleShell32.exe
+++ Externals/Eagle/bin/EagleShell32.exe
cannot compute difference between binary files

Index: Setup/clean.bat
==================================================================
--- Setup/clean.bat
+++ Setup/clean.bat
@@ -448,10 +448,26 @@
   )
 ) ELSE (
   %_AECHO% No files matching "%TEMP%\EagleShell.exe.test.*.log" exist.
   %_AECHO%.
 )
+
+IF EXIST "%TEMP%\EagleShell32.exe.test.*.log" (
+  %__ECHO% DEL /Q "%TEMP%\EagleShell32.exe.test.*.log"
+
+  IF ERRORLEVEL 1 (
+    ECHO Could not delete "%TEMP%\EagleShell32.exe.test.*.log".
+    ECHO.
+    GOTO errors
+  ) ELSE (
+    %_AECHO% Deleted "%TEMP%\EagleShell32.exe.test.*.log".
+    %_AECHO%.
+  )
+) ELSE (
+  %_AECHO% No files matching "%TEMP%\EagleShell32.exe.test.*.log" exist.
+  %_AECHO%.
+)
 
 IF EXIST "%TEMP%\mono.exe.test.*.log" (
   %__ECHO% DEL /Q "%TEMP%\mono.exe.test.*.log"
 
   IF ERRORLEVEL 1 (

Index: Setup/test.bat
==================================================================
--- Setup/test.bat
+++ Setup/test.bat
@@ -65,12 +65,20 @@
   SET POSTARGS=-file "%TESTFILE%"
 )
 
 %_VECHO% PostArgs = '%POSTARGS%'
 
-%_CECHO% Externals\Eagle\bin\EagleShell.exe %PREARGS% %* %POSTARGS%
-%__ECHO% Externals\Eagle\bin\EagleShell.exe %PREARGS% %* %POSTARGS%
+IF NOT DEFINED 32BITONLY (
+  SET EAGLESHELL=EagleShell.exe
+) ELSE (
+  SET EAGLESHELL=EagleShell32.exe
+)
+
+%_VECHO% EagleShell = '%EAGLESHELL%'
+
+%_CECHO% "Externals\Eagle\bin\%EAGLESHELL%" %PREARGS% %* %POSTARGS%
+%__ECHO% "Externals\Eagle\bin\%EAGLESHELL%" %PREARGS% %* %POSTARGS%
 
 IF ERRORLEVEL 1 (
   ECHO Received non-zero return code from the Eagle Shell.
   GOTO errors
 )

Index: Setup/test_all.bat
==================================================================
--- Setup/test_all.bat
+++ Setup/test_all.bat
@@ -91,10 +91,18 @@
   SET TEST_FILE=Tests\all.eagle
 )
 
 %_VECHO% TestFile = '%TEST_FILE%'
 
+IF NOT DEFINED 32BITONLY (
+  SET EAGLESHELL=EagleShell.exe
+) ELSE (
+  SET EAGLESHELL=EagleShell32.exe
+)
+
+%_VECHO% EagleShell = '%EAGLESHELL%'
+
 %__ECHO2% PUSHD "%ROOT%"
 
 IF ERRORLEVEL 1 (
   ECHO Could not change directory to "%ROOT%".
   GOTO errors
@@ -107,11 +115,11 @@
 SET TEST_ALL=1
 
 FOR %%C IN (%TEST_CONFIGURATIONS%) DO (
   FOR %%Y IN (%YEARS%) DO (
     IF NOT DEFINED NOMANAGEDONLY (
-      %__ECHO% Externals\Eagle\bin\EagleShell.exe -anyInitialize "set test_year {%%Y}; set test_configuration {%%C}" -file "%TEST_FILE%"
+      %__ECHO% "Externals\Eagle\bin\%EAGLESHELL%" -anyInitialize "set test_year {%%Y}; set test_configuration {%%C}" -file "%TEST_FILE%"
 
       IF ERRORLEVEL 1 (
         ECHO Testing of "%%Y/%%C" managed-only assembly failed.
         GOTO errors
       )
@@ -180,11 +188,11 @@
           ECHO Failed to copy "bin\%%Y\%%C\bin\Installer.*" to "bin\%%Y\%PLATFORM%\%%C".
           GOTO errors
         )
       )
 
-      %__ECHO% Externals\Eagle\bin\EagleShell.exe -preInitialize "set test_year {%%Y}; set test_configuration {%%C}" -initialize -runtimeOption native -file "%TEST_FILE%"
+      %__ECHO% "Externals\Eagle\bin\%EAGLESHELL%" -preInitialize "set test_year {%%Y}; set test_configuration {%%C}" -initialize -runtimeOption native -file "%TEST_FILE%"
 
       IF ERRORLEVEL 1 (
         ECHO Testing of "%%Y/%%C" mixed-mode assembly failed.
         GOTO errors
       )

Index: Setup/test_ce_200x.bat
==================================================================
--- Setup/test_ce_200x.bat
+++ Setup/test_ce_200x.bat
@@ -87,14 +87,22 @@
   )
 )
 
 %_VECHO% Years = '%YEARS%'
 
+IF NOT DEFINED 32BITONLY (
+  SET EAGLESHELL=EagleShell.exe
+) ELSE (
+  SET EAGLESHELL=EagleShell32.exe
+)
+
+%_VECHO% EagleShell = '%EAGLESHELL%'
+
 FOR %%C IN (%TEST_CONFIGURATIONS%) DO (
   FOR %%P IN (%PLATFORMS%) DO (
     FOR %%Y IN (%YEARS%) DO (
-      %__ECHO% EagleShell.exe -file "%TOOLS%\deployAndTestCe.eagle" %%Y %%P %%C
+      %__ECHO% "%EAGLESHELL%" -file "%TOOLS%\deployAndTestCe.eagle" %%Y %%P %%C
 
       IF ERRORLEVEL 1 (
         ECHO Tests failed for %%C/%%P/%%Y binaries.
         GOTO errors
       )

Index: exclude_src.txt
==================================================================
--- exclude_src.txt
+++ exclude_src.txt
@@ -13,10 +13,11 @@
 _FOSSIL_
 bin/*
 Doc/Output/*
 Externals/Eagle/bin/Eagle.dll
 Externals/Eagle/bin/EagleShell.exe
+Externals/Eagle/bin/EagleShell32.exe
 Externals/Eagle/bin/EntityFramework.*
 Externals/Eagle/bin/SQLite.Interop.*
 Externals/Eagle/bin/sqlite3.*
 Externals/Eagle/bin/System.*
 Externals/Eagle/bin/Win32/*