Some more work after integration of PR debugger-always-enabled.

- Removed no longer needed include in win32config.cc.
- Updated installation settings.
- Updated documentation.

bochs/Makefile.in

@@ -42,7 +42,7 @@ MAN_PAGE_5_LIST=bochsrc
 INSTALL_LIST_SHARE=bios/BIOS-bochs-* bios/VGABIOS* bios/SeaBIOS* bios/SeaVGABIOS* bios/bios.bin-* bios/vgabios-cirrus.bin-* @INSTALL_LIST_FOR_PLATFORM@
 INSTALL_LIST_DOC=CHANGES COPYING LICENSE README TODO misc/slirp.conf misc/vnet.conf
 INSTALL_LIST_BIN=bochs@EXE@ bximage@EXE@
-INSTALL_LIST_BIN_OPTIONAL=bochsdbg@EXE@ @OPTIONAL_TARGET@
+INSTALL_LIST_BIN_OPTIONAL=@OPTIONAL_TARGET@
 INSTALL_LIST_WIN32=$(INSTALL_LIST_SHARE) $(INSTALL_LIST_DOC) $(INSTALL_LIST_BIN) $(INSTALL_LIST_BIN_OPTIONAL)
 INSTALL_LIST_MACOSX=$(INSTALL_LIST_SHARE) $(INSTALL_LIST_DOC) bochs.scpt
 # for win32 and macosx, these files get renamed to *.txt in install process

bochs/build/win32/nsis/bochs.nsi.in

@@ -262,7 +262,7 @@ Section "Register .bxrc Extension" SecExtension
   WriteRegStr HKCR "BochsConfigFile\shell" "" "Edit"
   WriteRegStr HKCR "BochsConfigFile\shell\Edit\command" "" '$WINDIR\NOTEPAD.EXE "%1"'
   WriteRegStr HKCR "BochsConfigFile\shell" "" "Debugger"
-  WriteRegStr HKCR "BochsConfigFile\shell\Debugger\command" "" '"$INSTDIR\Bochsdbg.exe" -f "%1"'
+  WriteRegStr HKCR "BochsConfigFile\shell\Debugger\command" "" '"$INSTDIR\Bochs.exe" -dbg -f "%1"'
   WriteRegStr HKCR "BochsConfigFile\shell" "" "Run"
   WriteRegStr HKCR "BochsConfigFile\shell\Run\command" "" '"$INSTDIR\Bochs.exe" -q -f "%1"'
 SectionEnd

bochs/doc/docbook/development/development.dbk

@@ -3470,29 +3470,6 @@ the Build:Set Active Project Configuration is set the way you want it.
 For releases I use "x64 Release".
 </para>
 <para>
-To create "bochsdbg.exe" with Bochs debugger support, manually change these
-lines in config.h to turn on the debugger and the enhanced debugger gui.
-<screen>
-#define BX_DEBUGGER 1
-#define BX_DEBUGGER_GUI 1
-</screen>
-One of the optimization features must be turned off, since it is currently
-not compatible with the debugger.
-<screen>
-#define BX_SUPPORT_HANDLERS_CHAINING_SPEEDUPS 0
-</screen>
-VC++ will rebuild Bochs with debugger and overwrite bochs.exe.  To avoid
-trashing the non-debug version, move it out of the way while the debugger
-version is being built.  Then rename the debugger version to bochsdbg.exe.
-<screen>
-  cd obj-release
-  mv bochs.exe bochs-normal.exe
-  (build again with BX_DEBUGGER=1 this time)
-  mv bochs.exe bochsdbg.exe
-  mv bochs-normal.exe bochs.exe
-</screen>
-</para>
-<para>
 Do make <emphasis>install_win32</emphasis> into the NSIS folder in the Bochs
 source tree:
 <screen>

bochs/doc/docbook/user/user.dbk

@@ -1352,7 +1352,6 @@ DLX Linux screenshot.
 <row><entry>bios.bin-1.13.0 </entry> <entry> SeaBIOS ROM image </entry> </row>
 <row><entry>BIOS-bochs-latest </entry> <entry> default ROM BIOS image for Bochs </entry> </row>
 <row><entry>BIOS-bochs-legacy </entry> <entry> ROM BIOS image without 32-bit init code </entry> </row>
-<row><entry>bochsdbg.exe </entry> <entry> the main Bochs executable with debugger enabled </entry> </row>
 <row><entry>bochs.exe </entry> <entry> the main Bochs executable </entry> </row>
 <row><entry>bochs.ico </entry> <entry> the Bochs icon (used for links in start menu and on the desktop) </entry> </row>
 <row><entry>bochsrc-sample.txt </entry> <entry> sample Bochs configuration file </entry> </row>
@@ -5408,6 +5407,10 @@ For other arguments, see section <link linkend="bochsrc">bochsrc</link>.
   <entry>-log <replaceable>filename</replaceable></entry>
   <entry>specify Bochs log file</entry>
 </row>
+<row>
+  <entry>-dbg</entry>
+  <entry>start Bochs internal debugger on startup</entry>
+</row>
 <row>
   <entry>-dbglog <replaceable>filename</replaceable></entry>
   <entry>specify Bochs internal debugger log file</entry>

bochs/gui/win32config.cc

@@ -25,7 +25,6 @@
 
 #include "win32dialog.h"
 #include "bochs.h"
-#include "bx_debug/debug.h"
 #include "param_names.h"
 #include "gui.h"
 #include "win32res.h"