Commit Graph

153 Commits

Author SHA1 Message Date
Volker Ruppert
dd46d0ec71 - configure check for XPM support added
- x.cc uses the old monochrome icon if there's no XPM support present
2003-06-13 16:05:03 +00:00
Volker Ruppert
4d25b39655 - changes for better MSVC support based on patch #735990
* support for different resource compilers added (rc / windres)
  * bochs must be linked with advapi.lib for registry access
  * optimization flag changed to /Ox
  * symbols BX_HAVE_MKSTEMP, BX_HAVE_SYS_MMAN_H and HAVE_ETHERTAP must be set to 0
  * BX_HAVE_REALTIME_USEC definition fixed for MSVC
  * vmware3.h: definition of COW_Header fixed for MSVC
2003-06-06 19:57:25 +00:00
Volker Ruppert
4ccaddc32d - removed obsolete X11 VGA font and it's installation mechanism
* files font/vga.pcf, font/vga.bdf, font/hercules.bdf and font/README removed
  * files install-x11-fonts.in and test-x11-fonts removed
  * font installation mechanism removed from Makefile.in and build/debian/rules
  * configure script updated
2003-05-25 09:48:12 +00:00
Volker Ruppert
1641a90c3f - .win32_dll_plugin_target still needs $(GUI_LINK_OPTS) since there is some
gui-dependent stuff in main.cc (SDL redefines 'main', win32 console creation
  for SDL and wxMSW).
2003-05-24 23:49:38 +00:00
Volker Ruppert
4f2af797b5 - library dependencies in the main bochs binary and the gui plugins fixed.
These changes are based on the SF patch #742670. It did not work with
  plugins disabled.

Here is the descriiption of patch #742670:

the library dependencies (see objdump -p file) in the
main bochs binary and the gui plugins are wrong:

- the gui plugins don't depend on their respective gui
libraries
- the main bochs binary depends on all the gui libraries

this doesn't seem much of a problem, since the needed
libraries are loaded anyway, but it's problematic when
building packages for binary distribution of bochs.

in Debian, the package building tools will set package
dependencies according to the library dependencies of
each file, so the result is:

- the main bochs package depends on all libraries. this
includes libwx, libsdl, libncurses and xlibs.
- the indivudual plugin packages don't depend on any
gui library

so when a user wants to run bochs with the curses gui
and installs the bochs-curses package, he/she will be
forced to install Xfree86, WxWindows and GTK+ on
his/her system.

the attached patch fixes the problem by moving the
linker flags related to GUI libraries to the right
makefile (gui/Makefile.in)
2003-05-24 17:09:26 +00:00
Christophe Bothamy
10e8c46723 - add bxcommit manpage 2003-05-10 09:55:08 +00:00
Christophe Bothamy
c7007b9df9 - add definition for bxcommit compile 2003-05-06 17:34:36 +00:00
Stanislav Shwartsman
5a759a86bb Do not compile FPU when it disabled 2003-04-22 20:42:27 +00:00
Volker Ruppert
b78b65b845 - new application icon for the X11 gui using 'icon_bochs.xpm' 2002-12-30 13:17:39 +00:00
Volker Ruppert
ef8a7b1dc6 - new application icon for the win32 gui using 'bochs.ico' 2002-12-26 18:24:41 +00:00
Bryce Denney
26a6d3350c - "make clean" cleans only the top directory. So why did we have
rm */*.o in here?
2002-12-24 15:01:12 +00:00
Bryce Denney
98ec281e28 - don't install DOC-win32.html. it's out of date and I don't have time
to fix it.
2002-12-21 19:23:08 +00:00
Bryce Denney
bc72fcefa9 - BeBochs.rsrc cannot be checked into CVS directly because that damages
its resources.  So now we will distribute a .zip file which will only
  be unzipped on the target BeOS machine.
2002-12-21 15:51:41 +00:00
Bryce Denney
e3548a3708 - fix a broken configure subst variable @EXE@ 2002-12-21 14:41:49 +00:00
Bryce Denney
9780ad2ad8 - correct BeBochs.rc path 2002-12-21 14:32:10 +00:00
Bryce Denney
8bacd82133 - add BeOS target which builds the binary and then runs "copyattr"
to copy the resources into the binary
2002-12-21 14:31:30 +00:00
Bryce Denney
d1b711164a - make install for MacOSX should not produce a disk image too. Now
disk image creation is handled by build/macosx/make-dmg.sh.
2002-12-19 03:02:37 +00:00
Bryce Denney
b6db9b843d - copy the bochs.scpt into dlxlinux. With Br'fin's script changes,
you can double-click the bochs.scpt in dlxlinux and it will start Bochs.
2002-12-18 05:07:33 +00:00
Bryce Denney
006d21b626 - use updated DLX linux. I only updated DLX's bochsrc to make it more modern. 2002-12-14 22:43:56 +00:00
Bryce Denney
8b0a593ed4 - rename BXBIOS to BXSHARE. The problem with BXBIOS is that it needed to
be used for more things than just the BIOS.  Also the keymaps need to
  be located relative to the share path, and maybe other things like
  graphics and icons, later.
2002-12-14 22:18:00 +00:00
Bryce Denney
7e4ac4fc56 - add shortcut for downloading rendered docs from the website, for platforms
that have no docbook tools.
2002-12-14 21:17:25 +00:00
Bryce Denney
436d0119ce - make install should no longer copy docs-html. It needs to copy the
docbook files instead.
2002-12-13 22:50:39 +00:00
Bryce Denney
610116cf45 - if we're going to build docbook files, do it during make rather than
make install
2002-12-13 20:37:38 +00:00
Bryce Denney
4f4e6a2fa8 - add configure option --enable-docbook. If it is turned on, then during
make install it will build the docbook documentation and install it
  into $(prefix)/share/doc/bochs.  If it is not specified, then it will
  be enabled only if the program "docbook2html" is found in your path.
- this completes [ 652957 ] install docbook docs instead of HTML

Modified Files:
  Makefile.in configure configure.in doc/docbook/Makefile.in
2002-12-13 17:52:16 +00:00
Bryce Denney
36a61e04df - fix make dist-clean in docbook dir 2002-12-13 17:13:20 +00:00
Bryce Denney
8f0307539f - clean docbook directory too 2002-12-13 17:12:46 +00:00
Bryce Denney
f548660ca6 - see bug [ 652957 ] install docbook docs instead of HTML
- now configure script does substitutions in doc/docbook/Makefile.in
- add "make install_docbook" target in main makefile that runs make install
  in doc/docbook.  It will not be run unless you ask for it.

Modified Files:
  configure.in Makefile.in configure doc/docbook/Makefile.in
2002-12-13 16:21:04 +00:00
Bryce Denney
b53d3732b8 - apply patch 650066: use standard lib directory, from Robert Millan.
Change plugdir to have no version numbers.
2002-12-11 19:21:53 +00:00
Bryce Denney
1812808d82 - get rid of bochs-docs which didn't work anyway
- move DOC-linux.html into the docbook in a section called "Quick Start for
  Linux Users", and removed all references to the DOC-linux file that I could
  find.  Most of the text has been moved into the Linux RPM section.  Parts
  that did not fit into the docbook are now in doc/docbook/misc.txt.
- put vga.pcf into INSTALL_LIST_X11 so that it's only installed when
  you configure with --with-x11.
- transfer section on VGA font installation from docs-html into user guide
- remove RCS id from screen shots within user guide, since they are changed
  to the revision info of user.dbk.

Modified Files:
  Makefile.in configure configure.in build/linux/.cvsignore
  build/redhat/bochs.rpmspec.template doc/docbook/misc.txt
  doc/docbook/user/user.dbk doc/man/bochs-dlx.1 doc/man/bochs.1
  doc/man/bochsrc.5 doc/man/bximage.1 docs-html/install.html
Removed Files:
  build/linux/DOC-linux.html.in build/linux/bochs-docs.in
2002-12-11 19:16:20 +00:00
Bryce Denney
1fec3f065e - fix stupidity that I added in 1.109. It was putting bximage.o into the
source directory instead of the build directory.
2002-12-06 19:45:49 +00:00
Bryce Denney
a1f05bfd03 - the default for the workspaces is to build Win32 release. So that's where
the installer should find it.  This is checked in just after 2.0.pre3.
2002-12-05 18:12:35 +00:00
Bryce Denney
e334d500d2 - apply patch from Br'fin
[ 643874 ] MacOSX: diskimage.pl fix
2002-11-26 04:12:15 +00:00
Bryce Denney
56b67a6a8d - do feature request [ 640888 ] add default for BXBIOS env variable
- if BXBIOS is not defined, set it to a default value that is produced
  in the makefile.  This allows us to make disk image TAR packages that
  look for the bios images in the $BXBIOS directory.  These packages
  will be able find the current images for future Bochs versions, without
  any modifications.
2002-11-25 18:00:05 +00:00
Bryce Denney
eb8bb017a4 - fix make install_macosx in VPATH build. It has to use "test -e" to
look for things in its install list, which may be files or directories
  (like bochs.app)
2002-11-23 00:25:50 +00:00
Bryce Denney
6f798350f1 - previous rev was quite incomplete. Add the missing file lists. 2002-11-22 21:04:10 +00:00
Bryce Denney
bb3774e7e4 - add install_macosx target 2002-11-22 06:33:46 +00:00
Bryce Denney
9acf9f4198 - just to make it easier to read, move definition of some makefile
variables so that they are defined above the first time they are
  used.  "make" works ok either way.
2002-11-22 03:36:08 +00:00
Bryce Denney
5d05917565 - fix my stupid typo in macosx section. It should copy the resource fork
to a file called $(SCRIPT_COMPILED_RSRC).
2002-11-22 03:30:18 +00:00
Bryce Denney
7382b84f8c - A new GUI is born!
add SVGALIB display library by Igor Popik <igipop@wsfiz.edu.pl>
  While it's running, you can press F12 to escape into the runtime config
  menu, and then you can change disks or quit or whatever.

  Better not try it with the bochs debugger...you could get stuck.

Modified Files:
  Makefile.in config.h.in configure configure.in main.cc
  plugin.h gui/Makefile.in
Added Files:
  gui/svga.cc
Removed Files:
  patches/patch.svgalib-gui patches/patch.svgalib-gui-f12
2002-11-21 19:26:07 +00:00
Bryce Denney
1d106e59ad - small hack to make VPATH build work. 2002-11-21 17:52:59 +00:00
Bryce Denney
a648fc5a63 - clean up bochs.app and bochs.scpt files that are generated on MacOSX 2002-11-21 17:30:41 +00:00
Bryce Denney
4a01410fd0 - edit MacOSX make target to support building the applescript in two steps.
Step 1, the compile, must be done locally on a MacOSX machine.  This
  gives us the contents of the resource fork, which will be checked into
  CVS as script_compiled.rsrc every time the script sources change.  Step 2
  can be done remotely on the SF compile farm: reconstruct the script
  from the separate data and resource fork files.
- not all filesystems support resource forks!  I added a test in the
  makefile to check that the resource fork is accessible, so that at least
  we will get a clear error message if the filesystem doesn't support it.
2002-11-21 17:26:48 +00:00
Bryce Denney
9b7955c732 - rename VGABIOS-lgpl-README to .txt as well 2002-11-21 06:38:56 +00:00
Bryce Denney
0ab5bfa1d2 - move "$(LIBTOOL) --mode=link" into the @LINK@ configure variable, so that
it doesn't show up in nmake makefiles
2002-11-20 20:42:40 +00:00
Bryce Denney
bb428aaeb9 - use $(srcdir) to make VPATH compile work for bximage 2002-11-20 13:01:57 +00:00
Bryce Denney
e0b4cb6421 - nongnu make programs don't like "$<" except in pattern rules 2002-11-20 03:17:12 +00:00
Bryce Denney
002b7a3145 - the files in INSTALL_LIST_BIN_OPTIONAL were being omitted in
"make install_win32"
2002-11-19 21:31:00 +00:00
Bryce Denney
ab6cb49693 - this fixes bug #638600: need default plugin search path
- configure script adds -DBX_PLUGIN_PATH="${plugdir}" to CFLAGS/CXXFLAGS
  in the Makefile.
- in main.cc, if plugins enabled and the environment variable LTDL_LIBRARY_PATH
  is not set, then it gets set to the value supplied by BX_PLUGIN_PATH.

Modified Files:
  main.cc Makefile.in configure.in config.h.in configure
2002-11-18 02:32:53 +00:00
Bryce Denney
d3c734f3be - apply patch from Volker, who says:
> Dlltool creates a useless file called 'mingwex'.
  > I think the first dlltool call should only contain bochs object files and
  > no link options or external libraries.
2002-11-16 17:56:05 +00:00
Bryce Denney
53e9cc60e9 - remove GUI_LINK_OPTS from the dlltool line. The dlltool line only really
needs to include the .o's and .a's that are part of the Bochs source code
  so that it can create a list of Bochs symbols that need to be exported.
  I started out using the same list as the link line, but dlltool
  doesn't accept all the same options as the link such as -I and -L.
2002-11-16 12:55:09 +00:00