2001-04-10 05:04:59 +04:00
|
|
|
dnl // Process this file with autoconf to produce a configure script.
|
|
|
|
|
2002-09-26 06:19:14 +04:00
|
|
|
AC_PREREQ(2.50)
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_INIT(bochs.h)
|
2002-10-11 17:21:15 +04:00
|
|
|
AC_REVISION([[$Id: configure.in,v 1.150 2002-10-11 13:21:13 bdenney Exp $]])
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_CONFIG_HEADER(config.h)
|
|
|
|
|
2001-11-10 06:48:22 +03:00
|
|
|
dnl // Put Bochs version information right here so that it gets substituted
|
|
|
|
dnl // into all the right places.
|
2002-03-28 12:43:07 +03:00
|
|
|
VERSION="1.4.cvs"
|
|
|
|
VER_STRING="cvs-snapshot"
|
|
|
|
REL_STRING=""
|
2001-11-10 06:48:22 +03:00
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
changequote(<<, >>)
|
|
|
|
changequote([, ])
|
|
|
|
|
- commit patch.check-platform. For full details, pull up the patch itself
and look at the description at the top. Here's an intro.
This patch makes significant changes to the configure script. It adds the
lines AC_CANONICAL_HOST and AC_CANONICAL_TARGET which detect the OS and
processor type. The configure script, knowing the OS and processor type, can
then make intelligent decisions about which CFLAGS are needed and what is the
default GUI for that platform. One of the goals of this patch is to make it
so that on all supported platforms, "configure;make" will compile cleanly.
Configure detects the target platform, but it can be overridden by using
--target=___. This is important when using one platform to generate
Makefiles and header files for another platform. See config.guess script for
the exact details of platform naming.
The defaults that are currently implemented in the modified configure script
include:
If platform is windows* or winnt*, use win32 gui.
If platform is cygwin*, use win32 gui and compile with
"-mno-cygwin -DWIN32".
If platform is macosx* or darwin*, use carbon gui and compile
with "-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants
-Wno-unknown-pragmas -Dmacintosh"
If platform is macos, use macos gui.
If platform is beos, use beos gui.
If platform is amigaos, use amigaos gui.
Otherwise, use X windows gui.
2002-03-07 19:00:39 +03:00
|
|
|
dnl Detect host and target
|
|
|
|
AC_CANONICAL_HOST
|
|
|
|
AC_CANONICAL_TARGET
|
|
|
|
|
|
|
|
if test "$with_win32_vcpp"; then
|
|
|
|
echo "WARNING: The --with-win32-vcpp option will be treated as:"
|
|
|
|
echo " --with-win32 --target=i686-pc-windows"
|
|
|
|
target="i686-pc-windows"
|
|
|
|
with_win32=yes
|
|
|
|
fi
|
|
|
|
|
2002-09-25 01:35:04 +04:00
|
|
|
AC_MSG_CHECKING(if you are configuring for another platform)
|
|
|
|
if test "$target" = "$build"; then
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
cross_configure=0
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
cross_configure=1
|
|
|
|
fi
|
|
|
|
|
- commit patch.check-platform. For full details, pull up the patch itself
and look at the description at the top. Here's an intro.
This patch makes significant changes to the configure script. It adds the
lines AC_CANONICAL_HOST and AC_CANONICAL_TARGET which detect the OS and
processor type. The configure script, knowing the OS and processor type, can
then make intelligent decisions about which CFLAGS are needed and what is the
default GUI for that platform. One of the goals of this patch is to make it
so that on all supported platforms, "configure;make" will compile cleanly.
Configure detects the target platform, but it can be overridden by using
--target=___. This is important when using one platform to generate
Makefiles and header files for another platform. See config.guess script for
the exact details of platform naming.
The defaults that are currently implemented in the modified configure script
include:
If platform is windows* or winnt*, use win32 gui.
If platform is cygwin*, use win32 gui and compile with
"-mno-cygwin -DWIN32".
If platform is macosx* or darwin*, use carbon gui and compile
with "-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants
-Wno-unknown-pragmas -Dmacintosh"
If platform is macos, use macos gui.
If platform is beos, use beos gui.
If platform is amigaos, use amigaos gui.
Otherwise, use X windows gui.
2002-03-07 19:00:39 +03:00
|
|
|
# this case statement defines the compile flags which are needed to
|
|
|
|
# compile bochs on a platform. Don't put things like optimization settings
|
|
|
|
# into the configure.in file, since people will want to be able to change
|
|
|
|
# those settings by defining CFLAGS and CXXFLAGS before running configure.
|
|
|
|
case "$target" in
|
|
|
|
*-pc-windows* | *-pc-winnt*)
|
|
|
|
DEFAULT_GUI=win32 # default to win32 gui
|
|
|
|
;;
|
2002-03-28 03:29:57 +03:00
|
|
|
*-pc-cygwin* | *-pc-mingw32*)
|
2002-09-23 09:15:06 +04:00
|
|
|
if test "$with_term" = yes; then
|
|
|
|
# ncurses won't compile with -mno-cygwin or -DWIN32
|
|
|
|
# also, I can't get it to link without this -DBROKEN_LINKER=1 hack.
|
|
|
|
# see /usr/include/curses.h for details.
|
|
|
|
ADD_FLAGS="-DBROKEN_LINKER=1"
|
|
|
|
else
|
|
|
|
# default case
|
|
|
|
ADD_FLAGS="-mno-cygwin -DWIN32" # required for cygwin compile+win32 gui
|
|
|
|
DEFAULT_GUI=win32 # default to win32 gui
|
|
|
|
fi
|
- commit patch.check-platform. For full details, pull up the patch itself
and look at the description at the top. Here's an intro.
This patch makes significant changes to the configure script. It adds the
lines AC_CANONICAL_HOST and AC_CANONICAL_TARGET which detect the OS and
processor type. The configure script, knowing the OS and processor type, can
then make intelligent decisions about which CFLAGS are needed and what is the
default GUI for that platform. One of the goals of this patch is to make it
so that on all supported platforms, "configure;make" will compile cleanly.
Configure detects the target platform, but it can be overridden by using
--target=___. This is important when using one platform to generate
Makefiles and header files for another platform. See config.guess script for
the exact details of platform naming.
The defaults that are currently implemented in the modified configure script
include:
If platform is windows* or winnt*, use win32 gui.
If platform is cygwin*, use win32 gui and compile with
"-mno-cygwin -DWIN32".
If platform is macosx* or darwin*, use carbon gui and compile
with "-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants
-Wno-unknown-pragmas -Dmacintosh"
If platform is macos, use macos gui.
If platform is beos, use beos gui.
If platform is amigaos, use amigaos gui.
Otherwise, use X windows gui.
2002-03-07 19:00:39 +03:00
|
|
|
;;
|
|
|
|
*-macosx* | *-darwin*)
|
|
|
|
ADD_FLAGS="-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants -Wno-unknown-pragmas -Dmacintosh" # required for macosx compile
|
|
|
|
DEFAULT_GUI=carbon # default to carbon
|
|
|
|
;;
|
|
|
|
*-macos*)
|
|
|
|
DEFAULT_GUI=macos # macos defaults to macos
|
|
|
|
;;
|
|
|
|
*-beos*)
|
|
|
|
DEFAULT_GUI=beos # beos defaults to beos
|
|
|
|
;;
|
|
|
|
*-amigaos*)
|
|
|
|
DEFAULT_GUI=amigaos # amigaos defaults to amigaos
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
DEFAULT_GUI=x11
|
|
|
|
;;
|
|
|
|
esac
|
2002-10-01 00:31:14 +04:00
|
|
|
if test "${ADD_FLAGS:+set}" = set; then
|
2002-09-30 18:11:21 +04:00
|
|
|
CFLAGS="$CFLAGS $ADD_FLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS $ADD_FLAGS"
|
|
|
|
fi
|
- commit patch.check-platform. For full details, pull up the patch itself
and look at the description at the top. Here's an intro.
This patch makes significant changes to the configure script. It adds the
lines AC_CANONICAL_HOST and AC_CANONICAL_TARGET which detect the OS and
processor type. The configure script, knowing the OS and processor type, can
then make intelligent decisions about which CFLAGS are needed and what is the
default GUI for that platform. One of the goals of this patch is to make it
so that on all supported platforms, "configure;make" will compile cleanly.
Configure detects the target platform, but it can be overridden by using
--target=___. This is important when using one platform to generate
Makefiles and header files for another platform. See config.guess script for
the exact details of platform naming.
The defaults that are currently implemented in the modified configure script
include:
If platform is windows* or winnt*, use win32 gui.
If platform is cygwin*, use win32 gui and compile with
"-mno-cygwin -DWIN32".
If platform is macosx* or darwin*, use carbon gui and compile
with "-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants
-Wno-unknown-pragmas -Dmacintosh"
If platform is macos, use macos gui.
If platform is beos, use beos gui.
If platform is amigaos, use amigaos gui.
Otherwise, use X windows gui.
2002-03-07 19:00:39 +03:00
|
|
|
|
|
|
|
AC_MSG_CHECKING(for standard CFLAGS on this platform)
|
|
|
|
AC_MSG_RESULT($ADD_FLAGS)
|
|
|
|
|
|
|
|
dnl // make sure X Windows is default if no other chosen
|
|
|
|
if (test "$with_sdl" != yes) && \
|
|
|
|
(test "$with_x11" != yes) && \
|
|
|
|
(test "$with_beos" != yes) && \
|
|
|
|
(test "$with_win32" != yes) && \
|
|
|
|
(test "$with_nogui" != yes) && \
|
|
|
|
(test "$with_term" != yes) && \
|
|
|
|
(test "$with_rfb" != yes) && \
|
|
|
|
(test "$with_amigaos" != yes) && \
|
|
|
|
(test "$with_carbon" != yes) && \
|
2002-04-18 04:22:20 +04:00
|
|
|
(test "$with_wx" != yes) && \
|
- commit patch.check-platform. For full details, pull up the patch itself
and look at the description at the top. Here's an intro.
This patch makes significant changes to the configure script. It adds the
lines AC_CANONICAL_HOST and AC_CANONICAL_TARGET which detect the OS and
processor type. The configure script, knowing the OS and processor type, can
then make intelligent decisions about which CFLAGS are needed and what is the
default GUI for that platform. One of the goals of this patch is to make it
so that on all supported platforms, "configure;make" will compile cleanly.
Configure detects the target platform, but it can be overridden by using
--target=___. This is important when using one platform to generate
Makefiles and header files for another platform. See config.guess script for
the exact details of platform naming.
The defaults that are currently implemented in the modified configure script
include:
If platform is windows* or winnt*, use win32 gui.
If platform is cygwin*, use win32 gui and compile with
"-mno-cygwin -DWIN32".
If platform is macosx* or darwin*, use carbon gui and compile
with "-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants
-Wno-unknown-pragmas -Dmacintosh"
If platform is macos, use macos gui.
If platform is beos, use beos gui.
If platform is amigaos, use amigaos gui.
Otherwise, use X windows gui.
2002-03-07 19:00:39 +03:00
|
|
|
(test "$with_macos" != yes); then
|
|
|
|
# use DEFAULT_GUI. Set the appropriate variable.
|
|
|
|
# DEFAULT_GUI must be set to one of the names above. Otherwise, no
|
|
|
|
# valid $with_* variable will be set and who knows what will happen?
|
|
|
|
eval "with_${DEFAULT_GUI}=yes"
|
|
|
|
fi
|
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_PROG_CC
|
|
|
|
AC_PROG_CXX
|
|
|
|
AC_PROG_MAKE_SET
|
|
|
|
AC_PROG_RANLIB
|
|
|
|
|
|
|
|
AC_PATH_XTRA
|
|
|
|
|
|
|
|
AC_C_BIGENDIAN
|
|
|
|
AC_C_INLINE
|
|
|
|
AC_CHECK_SIZEOF(unsigned char)
|
|
|
|
AC_CHECK_SIZEOF(unsigned short)
|
|
|
|
AC_CHECK_SIZEOF(unsigned int)
|
|
|
|
AC_CHECK_SIZEOF(unsigned long)
|
|
|
|
AC_CHECK_SIZEOF(unsigned long long)
|
2001-04-10 05:50:00 +04:00
|
|
|
AC_CHECK_SIZEOF(int *)
|
2001-11-11 08:43:12 +03:00
|
|
|
AC_CHECK_FUNCS(getenv, AC_DEFINE(BX_HAVE_GETENV))
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_CHECK_FUNCS(select, AC_DEFINE(BX_HAVE_SELECT))
|
2001-04-10 05:50:00 +04:00
|
|
|
AC_CHECK_FUNCS(snprintf, AC_DEFINE(BX_HAVE_SNPRINTF))
|
|
|
|
AC_CHECK_FUNCS(strtoull, AC_DEFINE(BX_HAVE_STRTOULL))
|
2001-05-17 10:57:57 +04:00
|
|
|
AC_CHECK_FUNCS(strtouq, AC_DEFINE(BX_HAVE_STRTOUQ))
|
2001-04-10 05:59:07 +04:00
|
|
|
AC_CHECK_FUNCS(strdup, AC_DEFINE(BX_HAVE_STRDUP))
|
2001-10-05 17:52:25 +04:00
|
|
|
AC_CHECK_FUNCS(sleep, AC_DEFINE(BX_HAVE_SLEEP))
|
2001-09-24 09:28:42 +04:00
|
|
|
AC_CHECK_FUNCS(usleep, AC_DEFINE(BX_HAVE_USLEEP))
|
|
|
|
AC_CHECK_FUNCS(nanosleep, AC_DEFINE(BX_HAVE_NANOSLEEP))
|
2001-10-07 04:10:19 +04:00
|
|
|
AC_CHECK_FUNCS(abort, AC_DEFINE(BX_HAVE_ABORT))
|
2002-09-22 05:56:18 +04:00
|
|
|
AC_CHECK_FUNCS(gettimeofday, AC_DEFINE(BX_HAVE_GETTIMEOFDAY))
|
2002-08-11 15:42:09 +04:00
|
|
|
AC_CHECK_TYPE(socklen_t, AC_DEFINE(BX_HAVE_SOCKLEN_T), , [#include <sys/types.h>
|
|
|
|
#include <sys/socket.h>])
|
2001-04-10 05:04:59 +04:00
|
|
|
|
2002-10-11 17:21:15 +04:00
|
|
|
dnl As of autoconf 2.53, the standard largefile test fails for Linux/gcc.
|
|
|
|
dnl It does not put the largefiles arguments into CFLAGS, even though Linux/gcc
|
|
|
|
dnl does need them. Since wxWindows had already solved this exact problem,
|
|
|
|
dnl Bryce asked Vadim Zeitlin of the wxWindows project if Bochs could grab
|
|
|
|
dnl their largefile test, and he said it was fine. The re-implemented
|
|
|
|
dnl AC_SYS_LARGEFILE test can be found in aclocal.m4.
|
2002-09-30 20:24:25 +04:00
|
|
|
AC_SYS_LARGEFILE
|
2002-10-11 17:21:15 +04:00
|
|
|
|
|
|
|
dnl This logic came from wxWindows as well. Bryce added the CFLAGS and
|
|
|
|
dnl CXXFLAGS lines, since Bochs makefiles don't use CPPFLAGS at all.
|
|
|
|
dnl
|
|
|
|
dnl we need to define _FILE_OFFSET_BITS or _LARGE_FILES on the compiler command
|
|
|
|
dnl line because otherwise the system headers risk being included before
|
|
|
|
dnl config.h which defines these constants leading to inconsistent
|
|
|
|
dnl sizeof(off_t) in different source files of the same program and linking
|
|
|
|
dnl problems
|
|
|
|
if test "x$wx_largefile" = "xyes"; then
|
|
|
|
if test "x$ac_cv_sys_file_offset_bits" = "x64"; then
|
|
|
|
BX_LARGEFILE_FLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES"
|
|
|
|
else
|
|
|
|
BX_LARGEFILE_FLAGS="-D_LARGE_FILES"
|
|
|
|
fi
|
|
|
|
CPPFLAGS="$CPPFLAGS $BX_LARGEFILE_FLAGS"
|
|
|
|
CFLAGS="$CFLAGS $BX_LARGEFILE_FLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS $BX_LARGEFILE_FLAGS"
|
|
|
|
fi
|
|
|
|
dnl ---end of largefile tests
|
2002-09-30 20:24:25 +04:00
|
|
|
|
2001-06-12 07:37:55 +04:00
|
|
|
AC_MSG_CHECKING(for struct timeval)
|
|
|
|
AC_TRY_COMPILE([#include <sys/time.h>],
|
|
|
|
[struct timeval x;],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_HAVE_STRUCT_TIMEVAL, 1)
|
|
|
|
],
|
|
|
|
AC_MSG_RESULT(no))
|
|
|
|
|
2001-04-10 05:50:00 +04:00
|
|
|
AC_MSG_CHECKING(if compiler allows empty structs)
|
|
|
|
AC_TRY_COMPILE([], [typedef struct { } junk;],
|
|
|
|
AC_MSG_RESULT(yes),
|
|
|
|
[
|
|
|
|
AC_DEFINE(BX_NO_EMPTY_STRUCTS)
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
])
|
|
|
|
|
|
|
|
AC_MSG_CHECKING(if compiler allows __attribute__)
|
|
|
|
AC_TRY_COMPILE([], [typedef struct { } __attribute__ ((packed)) junk;],
|
|
|
|
AC_MSG_RESULT(yes),
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_NO_ATTRIBUTES)
|
|
|
|
])
|
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
AC_MSG_CHECKING(for hash_map.h)
|
|
|
|
AC_TRY_COMPILE([#include <hash_map.h>], [],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_HAVE_HASH_MAP)
|
|
|
|
], AC_MSG_RESULT(no))
|
2001-05-23 12:16:07 +04:00
|
|
|
AC_LANG_RESTORE
|
|
|
|
|
2002-09-16 16:37:16 +04:00
|
|
|
use_config_interface=1
|
- I've added lots of comments in siminterface.h, and tried to clean up
the terminology a bit. In particular, the term "gui" has started
to mean different things in different contexts, so I've defined
some more specific names for the parts of the user interface, and
updated comments and some variable names to reflect it. See
siminterface.h for a more complete description of all of these.
VGAW: VGA display window and toolbar buttons, the traditional Bochs
display which is ported to X, win32, MacOS X, etc. Implemented
in gui/gui.* and platform dependent gui/*.cc files.
CI: configuration interface that lets the user change settings such
as floppy disk image, ne2k settings, log options. The CI consists
of two parts: configuration user interface (CUI) which does the
actual rendering to the screen and handles key/mouse/menu events,
and the siminterface object.
CUI: configuration user interface. This handles the user interactions
that allow the user to configure Bochs. To actually change any
values it talks to the siminterface object. One implementation of
the CUI is the text-mode menus in gui/control.cc. Another
implementation is (will be) the wxWindows menus and dialogs in
gui/wxmain.cc.
siminterface: the glue between the CUI and the simulation code,
accessible throughout the code by the global variable
bx_simulator_interface_c *SIM;
Among other things, siminterface methods allow the simulator to ask the
CUI to display things or ask for user input, and allows the CUI
to query and modify variables in the simulation code.
GUI: Literally, "graphical user interface". Until the configuration menus
and wxWindows came along, everyone understood that "gui" referred to the
VGA display window and the toolbar buttons because that's all there
was. Now that we have the wxWindows code, which implements both the VGAW
and the CUI, while all other platforms implement only the VGAW, it's not
so clear. So, I'm trying to use VGAW, CI, and CUI consistently since
they are more specific.
control panel: This has been used as another name for the configuration
interface. "control panel" is also somewhat unspecific and it sounds
like it would be graphical with buttons and sliders, but our text-mode
thing is not graphical at all. I've replaced "control panel" with
"configuration interface" wherever I could find it. In configure script,
the --disable-control-panel option is still supported, but it politely
suggests that you use --disable-config-interface instead.
- clean up comments in siminterface,wx* code
- add comments and examples for bx_param_* and BxEvents
- remove some obsolete stuff: notify_*_args,
bx_simulator_interface_c::[sg]et_enabled() methods
- in siminterface.cc, move a few bx_real_sim_c methods to where they belong,
with the rest of the methods. No changes to the actual methods.
- remove some DOS ^M's which crept in and confused my editor.
2002-08-26 19:31:23 +04:00
|
|
|
AC_MSG_CHECKING(for configuration interface)
|
|
|
|
AC_ARG_ENABLE(config-interface,
|
|
|
|
[ --enable-config-interface turns on/off configuration interface],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
2002-09-16 16:37:16 +04:00
|
|
|
use_config_interface=1
|
- I've added lots of comments in siminterface.h, and tried to clean up
the terminology a bit. In particular, the term "gui" has started
to mean different things in different contexts, so I've defined
some more specific names for the parts of the user interface, and
updated comments and some variable names to reflect it. See
siminterface.h for a more complete description of all of these.
VGAW: VGA display window and toolbar buttons, the traditional Bochs
display which is ported to X, win32, MacOS X, etc. Implemented
in gui/gui.* and platform dependent gui/*.cc files.
CI: configuration interface that lets the user change settings such
as floppy disk image, ne2k settings, log options. The CI consists
of two parts: configuration user interface (CUI) which does the
actual rendering to the screen and handles key/mouse/menu events,
and the siminterface object.
CUI: configuration user interface. This handles the user interactions
that allow the user to configure Bochs. To actually change any
values it talks to the siminterface object. One implementation of
the CUI is the text-mode menus in gui/control.cc. Another
implementation is (will be) the wxWindows menus and dialogs in
gui/wxmain.cc.
siminterface: the glue between the CUI and the simulation code,
accessible throughout the code by the global variable
bx_simulator_interface_c *SIM;
Among other things, siminterface methods allow the simulator to ask the
CUI to display things or ask for user input, and allows the CUI
to query and modify variables in the simulation code.
GUI: Literally, "graphical user interface". Until the configuration menus
and wxWindows came along, everyone understood that "gui" referred to the
VGA display window and the toolbar buttons because that's all there
was. Now that we have the wxWindows code, which implements both the VGAW
and the CUI, while all other platforms implement only the VGAW, it's not
so clear. So, I'm trying to use VGAW, CI, and CUI consistently since
they are more specific.
control panel: This has been used as another name for the configuration
interface. "control panel" is also somewhat unspecific and it sounds
like it would be graphical with buttons and sliders, but our text-mode
thing is not graphical at all. I've replaced "control panel" with
"configuration interface" wherever I could find it. In configure script,
the --disable-control-panel option is still supported, but it politely
suggests that you use --disable-config-interface instead.
- clean up comments in siminterface,wx* code
- add comments and examples for bx_param_* and BxEvents
- remove some obsolete stuff: notify_*_args,
bx_simulator_interface_c::[sg]et_enabled() methods
- in siminterface.cc, move a few bx_real_sim_c methods to where they belong,
with the rest of the methods. No changes to the actual methods.
- remove some DOS ^M's which crept in and confused my editor.
2002-08-26 19:31:23 +04:00
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
2002-09-16 16:37:16 +04:00
|
|
|
use_config_interface=0
|
- I've added lots of comments in siminterface.h, and tried to clean up
the terminology a bit. In particular, the term "gui" has started
to mean different things in different contexts, so I've defined
some more specific names for the parts of the user interface, and
updated comments and some variable names to reflect it. See
siminterface.h for a more complete description of all of these.
VGAW: VGA display window and toolbar buttons, the traditional Bochs
display which is ported to X, win32, MacOS X, etc. Implemented
in gui/gui.* and platform dependent gui/*.cc files.
CI: configuration interface that lets the user change settings such
as floppy disk image, ne2k settings, log options. The CI consists
of two parts: configuration user interface (CUI) which does the
actual rendering to the screen and handles key/mouse/menu events,
and the siminterface object.
CUI: configuration user interface. This handles the user interactions
that allow the user to configure Bochs. To actually change any
values it talks to the siminterface object. One implementation of
the CUI is the text-mode menus in gui/control.cc. Another
implementation is (will be) the wxWindows menus and dialogs in
gui/wxmain.cc.
siminterface: the glue between the CUI and the simulation code,
accessible throughout the code by the global variable
bx_simulator_interface_c *SIM;
Among other things, siminterface methods allow the simulator to ask the
CUI to display things or ask for user input, and allows the CUI
to query and modify variables in the simulation code.
GUI: Literally, "graphical user interface". Until the configuration menus
and wxWindows came along, everyone understood that "gui" referred to the
VGA display window and the toolbar buttons because that's all there
was. Now that we have the wxWindows code, which implements both the VGAW
and the CUI, while all other platforms implement only the VGAW, it's not
so clear. So, I'm trying to use VGAW, CI, and CUI consistently since
they are more specific.
control panel: This has been used as another name for the configuration
interface. "control panel" is also somewhat unspecific and it sounds
like it would be graphical with buttons and sliders, but our text-mode
thing is not graphical at all. I've replaced "control panel" with
"configuration interface" wherever I could find it. In configure script,
the --disable-control-panel option is still supported, but it politely
suggests that you use --disable-config-interface instead.
- clean up comments in siminterface,wx* code
- add comments and examples for bx_param_* and BxEvents
- remove some obsolete stuff: notify_*_args,
bx_simulator_interface_c::[sg]et_enabled() methods
- in siminterface.cc, move a few bx_real_sim_c methods to where they belong,
with the rest of the methods. No changes to the actual methods.
- remove some DOS ^M's which crept in and confused my editor.
2002-08-26 19:31:23 +04:00
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(yes)
|
2002-09-16 16:37:16 +04:00
|
|
|
use_config_interface=1
|
- I've added lots of comments in siminterface.h, and tried to clean up
the terminology a bit. In particular, the term "gui" has started
to mean different things in different contexts, so I've defined
some more specific names for the parts of the user interface, and
updated comments and some variable names to reflect it. See
siminterface.h for a more complete description of all of these.
VGAW: VGA display window and toolbar buttons, the traditional Bochs
display which is ported to X, win32, MacOS X, etc. Implemented
in gui/gui.* and platform dependent gui/*.cc files.
CI: configuration interface that lets the user change settings such
as floppy disk image, ne2k settings, log options. The CI consists
of two parts: configuration user interface (CUI) which does the
actual rendering to the screen and handles key/mouse/menu events,
and the siminterface object.
CUI: configuration user interface. This handles the user interactions
that allow the user to configure Bochs. To actually change any
values it talks to the siminterface object. One implementation of
the CUI is the text-mode menus in gui/control.cc. Another
implementation is (will be) the wxWindows menus and dialogs in
gui/wxmain.cc.
siminterface: the glue between the CUI and the simulation code,
accessible throughout the code by the global variable
bx_simulator_interface_c *SIM;
Among other things, siminterface methods allow the simulator to ask the
CUI to display things or ask for user input, and allows the CUI
to query and modify variables in the simulation code.
GUI: Literally, "graphical user interface". Until the configuration menus
and wxWindows came along, everyone understood that "gui" referred to the
VGA display window and the toolbar buttons because that's all there
was. Now that we have the wxWindows code, which implements both the VGAW
and the CUI, while all other platforms implement only the VGAW, it's not
so clear. So, I'm trying to use VGAW, CI, and CUI consistently since
they are more specific.
control panel: This has been used as another name for the configuration
interface. "control panel" is also somewhat unspecific and it sounds
like it would be graphical with buttons and sliders, but our text-mode
thing is not graphical at all. I've replaced "control panel" with
"configuration interface" wherever I could find it. In configure script,
the --disable-control-panel option is still supported, but it politely
suggests that you use --disable-config-interface instead.
- clean up comments in siminterface,wx* code
- add comments and examples for bx_param_* and BxEvents
- remove some obsolete stuff: notify_*_args,
bx_simulator_interface_c::[sg]et_enabled() methods
- in siminterface.cc, move a few bx_real_sim_c methods to where they belong,
with the rest of the methods. No changes to the actual methods.
- remove some DOS ^M's which crept in and confused my editor.
2002-08-26 19:31:23 +04:00
|
|
|
]
|
|
|
|
)
|
|
|
|
|
|
|
|
# continue to support --enable-control-panel and make it do the same
|
|
|
|
# as before.
|
2001-06-10 00:01:12 +04:00
|
|
|
AC_MSG_CHECKING(for control panel)
|
|
|
|
AC_ARG_ENABLE(control-panel,
|
- I've added lots of comments in siminterface.h, and tried to clean up
the terminology a bit. In particular, the term "gui" has started
to mean different things in different contexts, so I've defined
some more specific names for the parts of the user interface, and
updated comments and some variable names to reflect it. See
siminterface.h for a more complete description of all of these.
VGAW: VGA display window and toolbar buttons, the traditional Bochs
display which is ported to X, win32, MacOS X, etc. Implemented
in gui/gui.* and platform dependent gui/*.cc files.
CI: configuration interface that lets the user change settings such
as floppy disk image, ne2k settings, log options. The CI consists
of two parts: configuration user interface (CUI) which does the
actual rendering to the screen and handles key/mouse/menu events,
and the siminterface object.
CUI: configuration user interface. This handles the user interactions
that allow the user to configure Bochs. To actually change any
values it talks to the siminterface object. One implementation of
the CUI is the text-mode menus in gui/control.cc. Another
implementation is (will be) the wxWindows menus and dialogs in
gui/wxmain.cc.
siminterface: the glue between the CUI and the simulation code,
accessible throughout the code by the global variable
bx_simulator_interface_c *SIM;
Among other things, siminterface methods allow the simulator to ask the
CUI to display things or ask for user input, and allows the CUI
to query and modify variables in the simulation code.
GUI: Literally, "graphical user interface". Until the configuration menus
and wxWindows came along, everyone understood that "gui" referred to the
VGA display window and the toolbar buttons because that's all there
was. Now that we have the wxWindows code, which implements both the VGAW
and the CUI, while all other platforms implement only the VGAW, it's not
so clear. So, I'm trying to use VGAW, CI, and CUI consistently since
they are more specific.
control panel: This has been used as another name for the configuration
interface. "control panel" is also somewhat unspecific and it sounds
like it would be graphical with buttons and sliders, but our text-mode
thing is not graphical at all. I've replaced "control panel" with
"configuration interface" wherever I could find it. In configure script,
the --disable-control-panel option is still supported, but it politely
suggests that you use --disable-config-interface instead.
- clean up comments in siminterface,wx* code
- add comments and examples for bx_param_* and BxEvents
- remove some obsolete stuff: notify_*_args,
bx_simulator_interface_c::[sg]et_enabled() methods
- in siminterface.cc, move a few bx_real_sim_c methods to where they belong,
with the rest of the methods. No changes to the actual methods.
- remove some DOS ^M's which crept in and confused my editor.
2002-08-26 19:31:23 +04:00
|
|
|
[ --enable-control-panel Deprecated. Use --enable-config-interface.],
|
2001-06-10 00:01:12 +04:00
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
2002-09-16 16:37:16 +04:00
|
|
|
use_config_interface=1
|
2001-06-10 00:01:12 +04:00
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
2002-09-16 16:37:16 +04:00
|
|
|
use_config_interface=0
|
2001-06-10 00:01:12 +04:00
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(yes)
|
2002-09-16 16:37:16 +04:00
|
|
|
use_config_interface=1
|
2001-06-10 00:01:12 +04:00
|
|
|
]
|
|
|
|
)
|
2002-09-16 22:36:01 +04:00
|
|
|
|
|
|
|
if test "$use_config_interface" = 1; then
|
|
|
|
AC_DEFINE(BX_USE_CONFIG_INTERFACE, 1)
|
|
|
|
else
|
|
|
|
AC_DEFINE(BX_USE_CONFIG_INTERFACE, 0)
|
|
|
|
fi
|
2001-06-10 00:01:12 +04:00
|
|
|
|
2001-08-15 21:51:10 +04:00
|
|
|
AC_MSG_CHECKING(for new PIT model)
|
|
|
|
AC_ARG_ENABLE(new-pit,
|
|
|
|
[ --enable-new-pit use Greg Alexander's new PIT model],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_USE_NEW_PIT, 1)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_USE_NEW_PIT, 0)
|
|
|
|
fi],
|
|
|
|
[
|
2001-08-18 18:15:41 +04:00
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_USE_NEW_PIT, 1)
|
2001-08-15 21:51:10 +04:00
|
|
|
]
|
|
|
|
)
|
|
|
|
AC_SUBST(BX_USE_NEW_PIT)
|
|
|
|
|
2002-09-24 22:00:23 +04:00
|
|
|
AC_MSG_CHECKING(for realtime PIT)
|
|
|
|
AC_ARG_ENABLE(realtime-pit,
|
|
|
|
[ --enable-realtime-pit try to keep clk in sync w/ real time],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_USE_REALTIME_PIT, 1)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_USE_REALTIME_PIT, 0)
|
|
|
|
fi],
|
|
|
|
[
|
2002-09-25 01:47:27 +04:00
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_USE_REALTIME_PIT, 0)
|
2002-09-24 22:00:23 +04:00
|
|
|
]
|
|
|
|
)
|
|
|
|
AC_SUBST(BX_USE_REALTIME_PIT)
|
|
|
|
|
2001-09-24 09:23:55 +04:00
|
|
|
AC_MSG_CHECKING(for slowdown timer)
|
|
|
|
AC_ARG_ENABLE(slowdown,
|
2001-11-12 03:43:59 +03:00
|
|
|
[ --enable-slowdown use Greg Alexander's slowdown timer],
|
2001-09-24 09:23:55 +04:00
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_USE_SLOWDOWN_TIMER, 1)
|
|
|
|
SLOWDOWN_OBJS='$(SLOWDOWN_OBJS)'
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_USE_SLOWDOWN_TIMER, 0)
|
|
|
|
SLOWDOWN_OBJS=''
|
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_USE_SLOWDOWN_TIMER, 0)
|
|
|
|
SLOWDOWN_OBJS=''
|
|
|
|
]
|
|
|
|
)
|
|
|
|
AC_SUBST(BX_USE_SLOWDOWN_TIMER)
|
|
|
|
AC_SUBST(SLOWDOWN_OBJS)
|
|
|
|
|
2001-11-12 03:43:59 +03:00
|
|
|
AC_MSG_CHECKING(for idle hack)
|
|
|
|
AC_ARG_ENABLE(idle-hack,
|
2002-06-06 19:42:11 +04:00
|
|
|
[ --enable-idle-hack use Roland Mainz's idle hack],
|
2001-11-12 03:43:59 +03:00
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_USE_IDLE_HACK, 1)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_USE_IDLE_HACK, 0)
|
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_USE_IDLE_HACK, 0)
|
|
|
|
]
|
|
|
|
)
|
|
|
|
AC_SUBST(BX_USE_IDLE_HACK)
|
|
|
|
|
2001-08-15 21:51:10 +04:00
|
|
|
|
2001-05-23 12:16:07 +04:00
|
|
|
AC_MSG_CHECKING(for number of processors)
|
|
|
|
AC_ARG_ENABLE(processors,
|
2002-09-23 18:09:55 +04:00
|
|
|
[ --enable-processors select number of processors (1,2,4,8)],
|
2001-05-23 12:16:07 +04:00
|
|
|
[case "$enableval" in
|
|
|
|
1)
|
|
|
|
AC_MSG_RESULT(1)
|
|
|
|
AC_DEFINE(BX_SMP_PROCESSORS, 1)
|
|
|
|
AC_DEFINE(BX_BOOTSTRAP_PROCESSOR, 0)
|
|
|
|
AC_DEFINE(BX_IOAPIC_DEFAULT_ID, 1)
|
|
|
|
;;
|
|
|
|
2)
|
|
|
|
AC_MSG_RESULT(2)
|
|
|
|
AC_DEFINE(BX_SMP_PROCESSORS, 2)
|
|
|
|
AC_DEFINE(BX_BOOTSTRAP_PROCESSOR, 0)
|
|
|
|
AC_DEFINE(BX_IOAPIC_DEFAULT_ID, 2)
|
|
|
|
AC_DEFINE(BX_USE_CPU_SMF, 0)
|
|
|
|
;;
|
|
|
|
4)
|
|
|
|
AC_MSG_RESULT(4)
|
|
|
|
AC_DEFINE(BX_SMP_PROCESSORS, 4)
|
|
|
|
AC_DEFINE(BX_BOOTSTRAP_PROCESSOR, 2)
|
|
|
|
AC_DEFINE(BX_IOAPIC_DEFAULT_ID, 4)
|
|
|
|
AC_DEFINE(BX_USE_CPU_SMF, 0)
|
|
|
|
;;
|
2002-04-08 05:41:59 +04:00
|
|
|
8)
|
|
|
|
AC_MSG_RESULT(8)
|
|
|
|
AC_DEFINE(BX_SMP_PROCESSORS, 8)
|
|
|
|
AC_DEFINE(BX_BOOTSTRAP_PROCESSOR, 0)
|
|
|
|
AC_DEFINE(BX_IOAPIC_DEFAULT_ID, 0x11)
|
|
|
|
AC_DEFINE(BX_USE_CPU_SMF, 0)
|
|
|
|
;;
|
2001-05-23 12:16:07 +04:00
|
|
|
*)
|
|
|
|
echo " "
|
2002-09-23 18:09:55 +04:00
|
|
|
echo "WARNING: processors != [1,2,4,8] can work, but you need to modify rombios.c manually"
|
2001-05-23 12:16:07 +04:00
|
|
|
AC_MSG_RESULT($enable_val)
|
|
|
|
AC_DEFINE(BX_SMP_PROCESSORS, $enable_val)
|
|
|
|
AC_DEFINE(BX_BOOTSTRAP_PROCESSOR, 0)
|
|
|
|
AC_DEFINE(BX_IOAPIC_DEFAULT_ID, $enable_val)
|
|
|
|
AC_DEFINE(BX_USE_CPU_SMF, 0)
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
bx_procs="$enableval"
|
|
|
|
],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(1)
|
|
|
|
AC_DEFINE(BX_SMP_PROCESSORS, 1)
|
|
|
|
AC_DEFINE(BX_BOOTSTRAP_PROCESSOR, 0)
|
|
|
|
AC_DEFINE(BX_IOAPIC_DEFAULT_ID, 1)
|
|
|
|
bx_procs=1
|
|
|
|
]
|
|
|
|
)
|
2001-04-10 05:50:00 +04:00
|
|
|
|
|
|
|
AC_MSG_CHECKING(if compiler allows blank labels)
|
|
|
|
AC_TRY_COMPILE([], [ { label1: } ],
|
|
|
|
AC_MSG_RESULT(yes),
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_NO_BLANK_LABELS)
|
|
|
|
])
|
2001-04-10 05:04:59 +04:00
|
|
|
|
2001-04-10 06:06:10 +04:00
|
|
|
AC_MSG_CHECKING(if compiler allows LL for 64-bit constants)
|
|
|
|
AC_TRY_COMPILE([], [ { 42LL; } ],
|
|
|
|
AC_MSG_RESULT(yes),
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_64BIT_CONSTANTS_USE_LL, 0)
|
|
|
|
])
|
|
|
|
|
2002-09-12 11:16:37 +04:00
|
|
|
use_x86_64=0
|
|
|
|
AC_MSG_CHECKING(for x86-64 support)
|
|
|
|
AC_ARG_ENABLE(x86-64,
|
|
|
|
[ --enable-x86-64 compile in support for x86-64 instructions],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
2002-09-14 09:46:57 +04:00
|
|
|
OBJS64='$(OBJS64)'
|
2002-09-12 11:16:37 +04:00
|
|
|
AC_DEFINE(BX_SUPPORT_X86_64, 1)
|
|
|
|
use_x86_64=1
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
2002-09-14 09:46:57 +04:00
|
|
|
OBJS64=''
|
2002-09-12 11:16:37 +04:00
|
|
|
AC_DEFINE(BX_SUPPORT_X86_64, 0)
|
|
|
|
fi
|
|
|
|
],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
2002-09-14 09:46:57 +04:00
|
|
|
OBJS64=''
|
2002-09-12 11:16:37 +04:00
|
|
|
AC_DEFINE(BX_SUPPORT_X86_64, 0)
|
|
|
|
]
|
|
|
|
)
|
2002-09-14 09:46:57 +04:00
|
|
|
AC_SUBST(OBJS64)
|
2002-09-12 11:16:37 +04:00
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_MSG_CHECKING(for cpu level)
|
|
|
|
AC_ARG_ENABLE(cpu-level,
|
2001-05-23 12:16:07 +04:00
|
|
|
[ --enable-cpu-level select cpu level (3,4,5,6)],
|
2001-04-10 05:04:59 +04:00
|
|
|
[case "$enableval" in
|
|
|
|
3)
|
|
|
|
AC_MSG_RESULT(3)
|
|
|
|
AC_DEFINE(BX_CPU_LEVEL, 3)
|
|
|
|
AC_DEFINE(BX_CPU_LEVEL_HACKED, 3)
|
|
|
|
;;
|
|
|
|
4)
|
|
|
|
AC_MSG_RESULT(4)
|
|
|
|
AC_DEFINE(BX_CPU_LEVEL, 4)
|
|
|
|
AC_DEFINE(BX_CPU_LEVEL_HACKED, 4)
|
|
|
|
;;
|
|
|
|
5)
|
|
|
|
AC_MSG_RESULT(5)
|
|
|
|
AC_DEFINE(BX_CPU_LEVEL, 5)
|
|
|
|
AC_DEFINE(BX_CPU_LEVEL_HACKED, 5)
|
|
|
|
;;
|
2001-05-23 12:16:07 +04:00
|
|
|
6)
|
|
|
|
AC_MSG_RESULT(6)
|
|
|
|
AC_DEFINE(BX_CPU_LEVEL, 6)
|
|
|
|
AC_DEFINE(BX_CPU_LEVEL_HACKED, 6)
|
|
|
|
;;
|
2001-04-10 05:04:59 +04:00
|
|
|
*)
|
|
|
|
echo " "
|
|
|
|
echo "ERROR: you must supply a valid CPU level to --enable-cpu-level"
|
|
|
|
exit 1
|
|
|
|
;;
|
|
|
|
esac
|
2001-05-23 19:54:05 +04:00
|
|
|
bx_cpu_level=$enableval
|
2001-05-23 12:16:07 +04:00
|
|
|
if test "$bx_procs" -gt 1 -a "$enableval" -lt 6; then
|
|
|
|
echo "ERROR: with >1 processor, use --enable-cpu-level=6"
|
|
|
|
exit 1
|
|
|
|
fi
|
2001-04-10 05:04:59 +04:00
|
|
|
],
|
|
|
|
[
|
2001-05-23 12:16:07 +04:00
|
|
|
# for multiprocessors, cpu level must be 6
|
2002-09-12 11:16:37 +04:00
|
|
|
if test "$bx_procs" -gt 1 -o "$use_x86_64" = 1; then
|
2001-05-23 12:16:07 +04:00
|
|
|
AC_MSG_RESULT(6)
|
|
|
|
AC_DEFINE(BX_CPU_LEVEL, 6)
|
|
|
|
AC_DEFINE(BX_CPU_LEVEL_HACKED, 6)
|
2001-05-23 19:54:05 +04:00
|
|
|
bx_cpu_level=6
|
2001-05-23 12:16:07 +04:00
|
|
|
else
|
|
|
|
AC_MSG_RESULT(5)
|
|
|
|
AC_DEFINE(BX_CPU_LEVEL, 5)
|
|
|
|
AC_DEFINE(BX_CPU_LEVEL_HACKED, 5)
|
2001-05-23 19:54:05 +04:00
|
|
|
bx_cpu_level=5
|
2001-05-23 12:16:07 +04:00
|
|
|
fi
|
2001-04-10 05:04:59 +04:00
|
|
|
]
|
|
|
|
)
|
|
|
|
|
|
|
|
|
2001-05-23 12:16:07 +04:00
|
|
|
AC_MSG_CHECKING(for APIC support)
|
|
|
|
AC_ARG_ENABLE(apic,
|
2001-08-15 21:51:10 +04:00
|
|
|
[ --enable-apic enable APIC support],
|
2001-05-23 12:16:07 +04:00
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
2001-06-12 17:07:43 +04:00
|
|
|
AC_DEFINE(BX_SUPPORT_APIC, 1)
|
2001-05-23 12:16:07 +04:00
|
|
|
IOAPIC_OBJS='ioapic.o'
|
|
|
|
APIC_OBJS='apic.o'
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
if test "$bx_procs" -gt 1; then
|
|
|
|
echo "Number of processors = $bx_procs"
|
|
|
|
echo "ERROR: With processors > 1 you must use --enable-apic"
|
|
|
|
exit 1
|
|
|
|
fi
|
2001-06-12 17:07:43 +04:00
|
|
|
AC_DEFINE(BX_SUPPORT_APIC, 0)
|
2001-05-23 12:16:07 +04:00
|
|
|
IOAPIC_OBJS=''
|
|
|
|
APIC_OBJS=''
|
|
|
|
fi
|
|
|
|
],
|
|
|
|
[
|
2001-05-23 19:54:05 +04:00
|
|
|
if test "$bx_procs" -gt 1 -o "$bx_cpu_level" -gt 5; then
|
|
|
|
# enable APIC by default, if processors>1 or if cpulevel>5
|
2001-05-23 12:16:07 +04:00
|
|
|
AC_MSG_RESULT(yes)
|
2001-06-12 17:07:43 +04:00
|
|
|
AC_DEFINE(BX_SUPPORT_APIC, 1)
|
2001-05-23 12:16:07 +04:00
|
|
|
IOAPIC_OBJS='ioapic.o'
|
|
|
|
APIC_OBJS='apic.o'
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
2001-06-12 17:07:43 +04:00
|
|
|
AC_DEFINE(BX_SUPPORT_APIC, 0)
|
2001-05-23 12:16:07 +04:00
|
|
|
IOAPIC_OBJS=''
|
|
|
|
APIC_OBJS=''
|
|
|
|
fi
|
|
|
|
]
|
|
|
|
)
|
|
|
|
AC_SUBST(IOAPIC_OBJS)
|
|
|
|
AC_SUBST(APIC_OBJS)
|
|
|
|
|
2001-05-07 09:47:59 +04:00
|
|
|
AC_MSG_CHECKING(for split hard disk image support)
|
|
|
|
AC_ARG_ENABLE(split-hd,
|
2001-08-15 21:51:10 +04:00
|
|
|
[ --enable-split-hd allows split hard disk image],
|
2001-05-07 09:47:59 +04:00
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_SPLIT_HD_SUPPORT, 1)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_SPLIT_HD_SUPPORT, 0)
|
|
|
|
fi],
|
|
|
|
[
|
2001-05-23 12:47:03 +04:00
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_SPLIT_HD_SUPPORT, 1)
|
2001-05-07 09:47:59 +04:00
|
|
|
]
|
|
|
|
)
|
|
|
|
AC_SUBST(BX_SPLIT_HD_SUPPORT)
|
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_MSG_CHECKING(for NE2000 support)
|
|
|
|
AC_ARG_ENABLE(ne2000,
|
|
|
|
[ --enable-ne2000 enable limited ne2000 support],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_NE2K_SUPPORT, 1)
|
2001-05-31 19:19:32 +04:00
|
|
|
NE2K_OBJS='ne2k.o eth.o eth_null.o'
|
|
|
|
AC_CHECK_HEADER(net/bpf.h, NE2K_OBJS="$NE2K_OBJS eth_fbsd.o")
|
2001-06-26 11:46:42 +04:00
|
|
|
AC_CHECK_HEADER(netpacket/packet.h, NE2K_OBJS="$NE2K_OBJS eth_linux.o")
|
2002-03-09 04:04:49 +03:00
|
|
|
AC_CHECK_HEADER(linux/netlink.h, [
|
|
|
|
NE2K_OBJS="$NE2K_OBJS eth_tap.o"
|
|
|
|
AC_DEFINE(HAVE_ETHERTAP, 1)
|
2002-03-26 08:59:12 +03:00
|
|
|
], [],
|
|
|
|
[
|
|
|
|
#include <asm/types.h>
|
|
|
|
#include <sys/socket.h>
|
2002-03-09 04:04:49 +03:00
|
|
|
])
|
2002-04-18 04:59:20 +04:00
|
|
|
AC_CHECK_HEADER(linux/if_tun.h, [
|
|
|
|
NE2K_OBJS="$NE2K_OBJS eth_tuntap.o"
|
|
|
|
AC_DEFINE(HAVE_TUNTAP, 1)
|
|
|
|
], [],
|
|
|
|
[
|
|
|
|
#include <asm/types.h>
|
|
|
|
#include <sys/socket.h>
|
|
|
|
])
|
2002-08-23 02:21:19 +04:00
|
|
|
case "$target" in
|
|
|
|
*-pc-windows* | *-pc-winnt* | *-pc-cygwin* | *-pc-mingw32*)
|
2001-10-03 17:42:24 +04:00
|
|
|
NE2K_OBJS="$NE2K_OBJS eth_win32.o"
|
2002-08-23 02:21:19 +04:00
|
|
|
;;
|
|
|
|
esac
|
2001-10-09 17:41:01 +04:00
|
|
|
networking=yes
|
2001-04-10 05:04:59 +04:00
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_NE2K_SUPPORT, 0)
|
|
|
|
NE2K_OBJS=''
|
2001-10-09 17:41:01 +04:00
|
|
|
networking=no
|
2001-04-10 05:04:59 +04:00
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_NE2K_SUPPORT, 0)
|
|
|
|
NE2K_OBJS=''
|
2001-10-09 17:41:01 +04:00
|
|
|
networking=no
|
2001-04-10 05:04:59 +04:00
|
|
|
]
|
|
|
|
)
|
|
|
|
AC_SUBST(NE2K_OBJS)
|
|
|
|
|
|
|
|
|
|
|
|
AC_MSG_CHECKING(for i440FX PCI support)
|
|
|
|
AC_ARG_ENABLE(pci,
|
|
|
|
[ --enable-pci enable limited i440FX PCI support],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_PCI_SUPPORT, 1)
|
2002-09-16 23:18:58 +04:00
|
|
|
PCI_OBJ='pci.o pci2isa.o'
|
2001-04-10 05:04:59 +04:00
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_PCI_SUPPORT, 0)
|
|
|
|
PCI_OBJ=''
|
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_PCI_SUPPORT, 0)
|
|
|
|
PCI_OBJ=''
|
|
|
|
]
|
|
|
|
)
|
|
|
|
AC_SUBST(PCI_OBJ)
|
|
|
|
|
2002-09-25 00:02:00 +04:00
|
|
|
AC_MSG_CHECKING(for Promise DC2300 VLB-IDE support)
|
|
|
|
AC_ARG_ENABLE(dc2300-vlb-ide,
|
|
|
|
[ --enable-dc2300-vlb-ide enable Promise DC2300 VLB-IDE support],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_PDC20230C_VLBIDE_SUPPORT, 1)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_PDC20230C_VLBIDE_SUPPORT, 0)
|
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_PDC20230C_VLBIDE_SUPPORT, 0)
|
|
|
|
]
|
|
|
|
)
|
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
|
Integrated patches for:
- Paging code rehash. You must now use --enable-4meg-pages to
use 4Meg pages, with the default of disabled, since we don't well
support 4Meg pages yet. Paging table walks model a real CPU
more closely now, and I fixed some bugs in the old logic.
- Segment check redundancy elimination. After a segment is loaded,
reads and writes are marked when a segment type check succeeds, and
they are skipped thereafter, when possible.
- Repeated IO and memory string copy acceleration. Only some variants
of instructions are available on all platforms, word and dword
variants only on x86 for the moment due to alignment and endian issues.
This is compiled in currently with no option - I should add a configure
option.
- Added a guest linear address to host TLB. Actually, I just stick
the host address (mem.vector[addr] address) in the upper 29 bits
of the field 'combined_access' since they are unused. Convenient
for now. I'm only storing page frame addresses. This was the
simplest for of such a TLB. We can likely enhance this. Also,
I only accelerated the normal read/write routines in access.cc.
Could also modify the read-modify-write versions too. You must
use --enable-guest2host-tlb, to try this out. Currently speeds
up Win95 boot time by about 3.5% for me. More ground to cover...
- Minor mods to CPUI/MOV_CdRd for CMOV.
- Integrated enhancements from Volker to getHostMemAddr() for PCI
being enabled.
2002-09-02 00:12:09 +04:00
|
|
|
AC_MSG_CHECKING(for 4Meg pages support)
|
|
|
|
AC_ARG_ENABLE(4meg-pages,
|
|
|
|
[ --enable-4meg-pages support 4Megabyte pages extensions],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
2002-09-25 08:24:46 +04:00
|
|
|
AC_DEFINE(BX_SUPPORT_4MEG_PAGES, 1)
|
Integrated patches for:
- Paging code rehash. You must now use --enable-4meg-pages to
use 4Meg pages, with the default of disabled, since we don't well
support 4Meg pages yet. Paging table walks model a real CPU
more closely now, and I fixed some bugs in the old logic.
- Segment check redundancy elimination. After a segment is loaded,
reads and writes are marked when a segment type check succeeds, and
they are skipped thereafter, when possible.
- Repeated IO and memory string copy acceleration. Only some variants
of instructions are available on all platforms, word and dword
variants only on x86 for the moment due to alignment and endian issues.
This is compiled in currently with no option - I should add a configure
option.
- Added a guest linear address to host TLB. Actually, I just stick
the host address (mem.vector[addr] address) in the upper 29 bits
of the field 'combined_access' since they are unused. Convenient
for now. I'm only storing page frame addresses. This was the
simplest for of such a TLB. We can likely enhance this. Also,
I only accelerated the normal read/write routines in access.cc.
Could also modify the read-modify-write versions too. You must
use --enable-guest2host-tlb, to try this out. Currently speeds
up Win95 boot time by about 3.5% for me. More ground to cover...
- Minor mods to CPUI/MOV_CdRd for CMOV.
- Integrated enhancements from Volker to getHostMemAddr() for PCI
being enabled.
2002-09-02 00:12:09 +04:00
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
2002-09-25 08:24:46 +04:00
|
|
|
AC_DEFINE(BX_SUPPORT_4MEG_PAGES, 0)
|
Integrated patches for:
- Paging code rehash. You must now use --enable-4meg-pages to
use 4Meg pages, with the default of disabled, since we don't well
support 4Meg pages yet. Paging table walks model a real CPU
more closely now, and I fixed some bugs in the old logic.
- Segment check redundancy elimination. After a segment is loaded,
reads and writes are marked when a segment type check succeeds, and
they are skipped thereafter, when possible.
- Repeated IO and memory string copy acceleration. Only some variants
of instructions are available on all platforms, word and dword
variants only on x86 for the moment due to alignment and endian issues.
This is compiled in currently with no option - I should add a configure
option.
- Added a guest linear address to host TLB. Actually, I just stick
the host address (mem.vector[addr] address) in the upper 29 bits
of the field 'combined_access' since they are unused. Convenient
for now. I'm only storing page frame addresses. This was the
simplest for of such a TLB. We can likely enhance this. Also,
I only accelerated the normal read/write routines in access.cc.
Could also modify the read-modify-write versions too. You must
use --enable-guest2host-tlb, to try this out. Currently speeds
up Win95 boot time by about 3.5% for me. More ground to cover...
- Minor mods to CPUI/MOV_CdRd for CMOV.
- Integrated enhancements from Volker to getHostMemAddr() for PCI
being enabled.
2002-09-02 00:12:09 +04:00
|
|
|
fi],
|
|
|
|
[
|
2002-09-25 08:24:46 +04:00
|
|
|
if test "$bx_cpu_level" -gt 5; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_SUPPORT_4MEG_PAGES, 1)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_SUPPORT_4MEG_PAGES, 0)
|
|
|
|
fi
|
2002-09-17 01:55:57 +04:00
|
|
|
]
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
AC_MSG_CHECKING(for PAE support)
|
|
|
|
AC_ARG_ENABLE(pae,
|
|
|
|
[ --enable-pae support Physical Address Extensions],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
2002-09-25 08:24:46 +04:00
|
|
|
AC_DEFINE(BX_SupportPAE, 1)
|
2002-09-17 01:55:57 +04:00
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
2002-09-25 08:24:46 +04:00
|
|
|
AC_DEFINE(BX_SupportPAE, 0)
|
2002-09-17 01:55:57 +04:00
|
|
|
fi],
|
|
|
|
[
|
2002-09-25 08:24:46 +04:00
|
|
|
if test "$bx_cpu_level" -gt 5; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_SupportPAE, 1)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_SupportPAE, 0)
|
|
|
|
fi
|
Integrated patches for:
- Paging code rehash. You must now use --enable-4meg-pages to
use 4Meg pages, with the default of disabled, since we don't well
support 4Meg pages yet. Paging table walks model a real CPU
more closely now, and I fixed some bugs in the old logic.
- Segment check redundancy elimination. After a segment is loaded,
reads and writes are marked when a segment type check succeeds, and
they are skipped thereafter, when possible.
- Repeated IO and memory string copy acceleration. Only some variants
of instructions are available on all platforms, word and dword
variants only on x86 for the moment due to alignment and endian issues.
This is compiled in currently with no option - I should add a configure
option.
- Added a guest linear address to host TLB. Actually, I just stick
the host address (mem.vector[addr] address) in the upper 29 bits
of the field 'combined_access' since they are unused. Convenient
for now. I'm only storing page frame addresses. This was the
simplest for of such a TLB. We can likely enhance this. Also,
I only accelerated the normal read/write routines in access.cc.
Could also modify the read-modify-write versions too. You must
use --enable-guest2host-tlb, to try this out. Currently speeds
up Win95 boot time by about 3.5% for me. More ground to cover...
- Minor mods to CPUI/MOV_CdRd for CMOV.
- Integrated enhancements from Volker to getHostMemAddr() for PCI
being enabled.
2002-09-02 00:12:09 +04:00
|
|
|
]
|
|
|
|
)
|
2002-09-17 00:23:38 +04:00
|
|
|
|
Integrated patches for:
- Paging code rehash. You must now use --enable-4meg-pages to
use 4Meg pages, with the default of disabled, since we don't well
support 4Meg pages yet. Paging table walks model a real CPU
more closely now, and I fixed some bugs in the old logic.
- Segment check redundancy elimination. After a segment is loaded,
reads and writes are marked when a segment type check succeeds, and
they are skipped thereafter, when possible.
- Repeated IO and memory string copy acceleration. Only some variants
of instructions are available on all platforms, word and dword
variants only on x86 for the moment due to alignment and endian issues.
This is compiled in currently with no option - I should add a configure
option.
- Added a guest linear address to host TLB. Actually, I just stick
the host address (mem.vector[addr] address) in the upper 29 bits
of the field 'combined_access' since they are unused. Convenient
for now. I'm only storing page frame addresses. This was the
simplest for of such a TLB. We can likely enhance this. Also,
I only accelerated the normal read/write routines in access.cc.
Could also modify the read-modify-write versions too. You must
use --enable-guest2host-tlb, to try this out. Currently speeds
up Win95 boot time by about 3.5% for me. More ground to cover...
- Minor mods to CPUI/MOV_CdRd for CMOV.
- Integrated enhancements from Volker to getHostMemAddr() for PCI
being enabled.
2002-09-02 00:12:09 +04:00
|
|
|
|
|
|
|
AC_MSG_CHECKING(for guest to host TLB support)
|
|
|
|
AC_ARG_ENABLE(guest2host-tlb,
|
|
|
|
[ --enable-guest2host-tlb support guest to host addr TLB for speed],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
2002-09-30 06:02:06 +04:00
|
|
|
speedup_guest2host_tlb=1
|
Integrated patches for:
- Paging code rehash. You must now use --enable-4meg-pages to
use 4Meg pages, with the default of disabled, since we don't well
support 4Meg pages yet. Paging table walks model a real CPU
more closely now, and I fixed some bugs in the old logic.
- Segment check redundancy elimination. After a segment is loaded,
reads and writes are marked when a segment type check succeeds, and
they are skipped thereafter, when possible.
- Repeated IO and memory string copy acceleration. Only some variants
of instructions are available on all platforms, word and dword
variants only on x86 for the moment due to alignment and endian issues.
This is compiled in currently with no option - I should add a configure
option.
- Added a guest linear address to host TLB. Actually, I just stick
the host address (mem.vector[addr] address) in the upper 29 bits
of the field 'combined_access' since they are unused. Convenient
for now. I'm only storing page frame addresses. This was the
simplest for of such a TLB. We can likely enhance this. Also,
I only accelerated the normal read/write routines in access.cc.
Could also modify the read-modify-write versions too. You must
use --enable-guest2host-tlb, to try this out. Currently speeds
up Win95 boot time by about 3.5% for me. More ground to cover...
- Minor mods to CPUI/MOV_CdRd for CMOV.
- Integrated enhancements from Volker to getHostMemAddr() for PCI
being enabled.
2002-09-02 00:12:09 +04:00
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
2002-09-30 06:02:06 +04:00
|
|
|
speedup_guest2host_tlb=0
|
Integrated patches for:
- Paging code rehash. You must now use --enable-4meg-pages to
use 4Meg pages, with the default of disabled, since we don't well
support 4Meg pages yet. Paging table walks model a real CPU
more closely now, and I fixed some bugs in the old logic.
- Segment check redundancy elimination. After a segment is loaded,
reads and writes are marked when a segment type check succeeds, and
they are skipped thereafter, when possible.
- Repeated IO and memory string copy acceleration. Only some variants
of instructions are available on all platforms, word and dword
variants only on x86 for the moment due to alignment and endian issues.
This is compiled in currently with no option - I should add a configure
option.
- Added a guest linear address to host TLB. Actually, I just stick
the host address (mem.vector[addr] address) in the upper 29 bits
of the field 'combined_access' since they are unused. Convenient
for now. I'm only storing page frame addresses. This was the
simplest for of such a TLB. We can likely enhance this. Also,
I only accelerated the normal read/write routines in access.cc.
Could also modify the read-modify-write versions too. You must
use --enable-guest2host-tlb, to try this out. Currently speeds
up Win95 boot time by about 3.5% for me. More ground to cover...
- Minor mods to CPUI/MOV_CdRd for CMOV.
- Integrated enhancements from Volker to getHostMemAddr() for PCI
being enabled.
2002-09-02 00:12:09 +04:00
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
2002-09-30 06:02:06 +04:00
|
|
|
speedup_guest2host_tlb=0
|
Integrated patches for:
- Paging code rehash. You must now use --enable-4meg-pages to
use 4Meg pages, with the default of disabled, since we don't well
support 4Meg pages yet. Paging table walks model a real CPU
more closely now, and I fixed some bugs in the old logic.
- Segment check redundancy elimination. After a segment is loaded,
reads and writes are marked when a segment type check succeeds, and
they are skipped thereafter, when possible.
- Repeated IO and memory string copy acceleration. Only some variants
of instructions are available on all platforms, word and dword
variants only on x86 for the moment due to alignment and endian issues.
This is compiled in currently with no option - I should add a configure
option.
- Added a guest linear address to host TLB. Actually, I just stick
the host address (mem.vector[addr] address) in the upper 29 bits
of the field 'combined_access' since they are unused. Convenient
for now. I'm only storing page frame addresses. This was the
simplest for of such a TLB. We can likely enhance this. Also,
I only accelerated the normal read/write routines in access.cc.
Could also modify the read-modify-write versions too. You must
use --enable-guest2host-tlb, to try this out. Currently speeds
up Win95 boot time by about 3.5% for me. More ground to cover...
- Minor mods to CPUI/MOV_CdRd for CMOV.
- Integrated enhancements from Volker to getHostMemAddr() for PCI
being enabled.
2002-09-02 00:12:09 +04:00
|
|
|
]
|
|
|
|
)
|
|
|
|
|
2002-09-02 22:44:35 +04:00
|
|
|
AC_MSG_CHECKING(for repeated IO and mem copy speedups)
|
|
|
|
AC_ARG_ENABLE(repeat-speedups,
|
|
|
|
[ --enable-repeat-speedups support repeated IO and mem copy speedups],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
2002-09-30 06:02:06 +04:00
|
|
|
speedup_repeat=1
|
2002-09-02 22:44:35 +04:00
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
2002-09-30 06:02:06 +04:00
|
|
|
speedup_repeat=0
|
2002-09-02 22:44:35 +04:00
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
2002-09-30 06:02:06 +04:00
|
|
|
speedup_repeat=0
|
2002-09-02 22:44:35 +04:00
|
|
|
]
|
|
|
|
)
|
2002-09-19 23:17:20 +04:00
|
|
|
|
|
|
|
AC_MSG_CHECKING(for instruction cache support)
|
|
|
|
AC_ARG_ENABLE(icache,
|
2002-09-25 08:24:46 +04:00
|
|
|
[ --enable-icache support instruction cache (runs faster)],
|
2002-09-19 23:17:20 +04:00
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
2002-09-30 06:02:06 +04:00
|
|
|
speedup_iCache=1
|
2002-09-19 23:17:20 +04:00
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
2002-09-30 06:02:06 +04:00
|
|
|
speedup_iCache=0
|
2002-09-19 23:17:20 +04:00
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
2002-09-30 06:02:06 +04:00
|
|
|
speedup_iCache=0
|
2002-09-19 23:17:20 +04:00
|
|
|
]
|
|
|
|
)
|
2002-09-02 22:44:35 +04:00
|
|
|
|
2002-09-25 08:24:46 +04:00
|
|
|
AC_MSG_CHECKING(for global pages support)
|
2002-09-10 07:52:32 +04:00
|
|
|
AC_ARG_ENABLE(global-pages,
|
2002-09-25 08:24:46 +04:00
|
|
|
[ --enable-global-pages support for global pages in PDE/PTE],
|
2002-09-10 07:52:32 +04:00
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
2002-09-25 08:24:46 +04:00
|
|
|
AC_DEFINE(BX_SupportGlobalPages, 1)
|
2002-09-10 07:52:32 +04:00
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
2002-09-25 08:24:46 +04:00
|
|
|
AC_DEFINE(BX_SupportGlobalPages, 0)
|
2002-09-10 07:52:32 +04:00
|
|
|
fi],
|
|
|
|
[
|
2002-09-25 08:24:46 +04:00
|
|
|
if test "$bx_cpu_level" -gt 5; then
|
|
|
|
# enable by default
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_SupportGlobalPages, 1)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_SupportGlobalPages, 0)
|
|
|
|
fi
|
2002-09-10 07:52:32 +04:00
|
|
|
]
|
|
|
|
)
|
|
|
|
|
2002-09-23 21:59:18 +04:00
|
|
|
AC_MSG_CHECKING(for host specific inline assembly accelerations)
|
|
|
|
AC_ARG_ENABLE(host-specific-asms,
|
|
|
|
[ --enable-host-specific-asms support for host specific inline assembly],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
2002-09-30 06:02:06 +04:00
|
|
|
speedup_host_specific_asms=1
|
2002-09-23 21:59:18 +04:00
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
2002-09-30 06:02:06 +04:00
|
|
|
speedup_host_specific_asms=0
|
2002-09-23 21:59:18 +04:00
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(yes)
|
2002-09-30 06:02:06 +04:00
|
|
|
speedup_host_specific_asms=1
|
2002-09-23 21:59:18 +04:00
|
|
|
]
|
|
|
|
)
|
Integrated patches for:
- Paging code rehash. You must now use --enable-4meg-pages to
use 4Meg pages, with the default of disabled, since we don't well
support 4Meg pages yet. Paging table walks model a real CPU
more closely now, and I fixed some bugs in the old logic.
- Segment check redundancy elimination. After a segment is loaded,
reads and writes are marked when a segment type check succeeds, and
they are skipped thereafter, when possible.
- Repeated IO and memory string copy acceleration. Only some variants
of instructions are available on all platforms, word and dword
variants only on x86 for the moment due to alignment and endian issues.
This is compiled in currently with no option - I should add a configure
option.
- Added a guest linear address to host TLB. Actually, I just stick
the host address (mem.vector[addr] address) in the upper 29 bits
of the field 'combined_access' since they are unused. Convenient
for now. I'm only storing page frame addresses. This was the
simplest for of such a TLB. We can likely enhance this. Also,
I only accelerated the normal read/write routines in access.cc.
Could also modify the read-modify-write versions too. You must
use --enable-guest2host-tlb, to try this out. Currently speeds
up Win95 boot time by about 3.5% for me. More ground to cover...
- Minor mods to CPUI/MOV_CdRd for CMOV.
- Integrated enhancements from Volker to getHostMemAddr() for PCI
being enabled.
2002-09-02 00:12:09 +04:00
|
|
|
|
2002-09-24 12:15:27 +04:00
|
|
|
AC_MSG_CHECKING(whether to ignore bad MSR references)
|
|
|
|
AC_ARG_ENABLE(ignore-bad-msr,
|
|
|
|
[ --enable-ignore-bad-msr ignore bad MSR references ],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_IGNORE_BAD_MSR, 1)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_IGNORE_BAD_MSR, 0)
|
|
|
|
fi],
|
|
|
|
[
|
2002-09-25 08:24:46 +04:00
|
|
|
# default: normally disabled, but in x86-64 mode enable it.
|
|
|
|
if test "$use_x86_64" = 1; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_IGNORE_BAD_MSR, 1)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_IGNORE_BAD_MSR, 0)
|
|
|
|
fi
|
2002-09-24 12:15:27 +04:00
|
|
|
]
|
|
|
|
)
|
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_MSG_CHECKING(for port e9 hack)
|
|
|
|
AC_ARG_ENABLE(port-e9-hack,
|
|
|
|
[ --enable-port-e9-hack writes to port e9 go to console],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_PORT_E9_HACK, 1)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_PORT_E9_HACK, 0)
|
|
|
|
fi],
|
|
|
|
[
|
2001-12-05 19:25:24 +03:00
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_PORT_E9_HACK, 1)
|
2001-04-10 05:04:59 +04:00
|
|
|
]
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
AC_MSG_CHECKING(for use of .cpp as suffix)
|
|
|
|
AC_ARG_ENABLE(cpp,
|
|
|
|
[ --enable-cpp use .cpp as C++ suffix],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
SUFFIX_LINE='.SUFFIXES: .cpp'
|
|
|
|
CPP_SUFFIX='cpp'
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
SUFFIX_LINE='.SUFFIXES: .cc'
|
|
|
|
CPP_SUFFIX='cc'
|
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
SUFFIX_LINE='.SUFFIXES: .cc'
|
|
|
|
CPP_SUFFIX='cc'
|
|
|
|
]
|
|
|
|
)
|
|
|
|
AC_SUBST(SUFFIX_LINE)
|
|
|
|
AC_SUBST(CPP_SUFFIX)
|
|
|
|
|
|
|
|
if test "$enable_cpp" = yes; then
|
|
|
|
echo "moving .cc source files to .cpp"
|
|
|
|
sourcefiles=`find . -name "*.cc" -print`
|
|
|
|
if test "$sourcefiles" != ""; then
|
|
|
|
for ccname in $sourcefiles
|
|
|
|
do
|
|
|
|
cppname=`echo $ccname | sed -e "s/\.cc$/.cpp/"`
|
|
|
|
echo "mv $ccname $cppname"
|
|
|
|
mv $ccname $cppname
|
|
|
|
done
|
|
|
|
else
|
|
|
|
echo "no more .cc source files to rename"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
2002-09-12 11:16:37 +04:00
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_MSG_CHECKING(for Bochs internal debugger support)
|
|
|
|
AC_ARG_ENABLE(debugger,
|
|
|
|
[ --enable-debugger compile in support for Bochs internal debugger],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_DEBUGGER, 1)
|
|
|
|
DEBUGGER_VAR='$(DEBUGGER_LIB)'
|
2001-04-10 05:50:00 +04:00
|
|
|
bx_debugger=1
|
2001-04-10 05:04:59 +04:00
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_DEBUGGER, 0)
|
|
|
|
DEBUGGER_VAR=''
|
2001-04-10 05:50:00 +04:00
|
|
|
bx_debugger=0
|
|
|
|
fi
|
|
|
|
],
|
2001-04-10 05:04:59 +04:00
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_DEBUGGER, 0)
|
|
|
|
DEBUGGER_VAR=''
|
2001-04-10 05:50:00 +04:00
|
|
|
bx_debugger=0
|
2001-04-10 05:04:59 +04:00
|
|
|
]
|
|
|
|
)
|
|
|
|
AC_SUBST(DEBUGGER_VAR)
|
|
|
|
|
2002-09-12 11:16:37 +04:00
|
|
|
AC_MSG_CHECKING(for external debugger)
|
2002-09-15 19:10:21 +04:00
|
|
|
EXT_DEBUG_OBJS=''
|
2002-09-12 11:16:37 +04:00
|
|
|
AC_ARG_ENABLE(external-debugger,
|
|
|
|
[ --enable-external-debugger enable external debugger support],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_EXTERNAL_DEBUGGER, 1)
|
|
|
|
EXT_DEBUG_OBJS=extdb.o
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
])
|
|
|
|
AC_SUBST(BX_EXTERNAL_DEBUGGER)
|
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_MSG_CHECKING(for disassembler support)
|
|
|
|
AC_ARG_ENABLE(disasm,
|
|
|
|
[ --enable-disasm compile in support for disassembler],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_DISASM, 1)
|
|
|
|
DISASM_VAR='$(DISASM_LIB)'
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
2001-04-10 05:50:00 +04:00
|
|
|
if test "$bx_debugger" = 1; then
|
|
|
|
echo "ERROR: debugger is enabled, so --enable-disasm is required"
|
|
|
|
exit 1
|
|
|
|
fi
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_DEFINE(BX_DISASM, 0)
|
|
|
|
DISASM_VAR=''
|
|
|
|
fi],
|
|
|
|
[
|
2001-04-10 05:50:00 +04:00
|
|
|
if test "$bx_debugger" = 1; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_DISASM, 1)
|
|
|
|
DISASM_VAR='$(DISASM_LIB)'
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_DISASM, 0)
|
|
|
|
DISASM_VAR=''
|
|
|
|
fi
|
2001-04-10 05:04:59 +04:00
|
|
|
]
|
|
|
|
)
|
|
|
|
AC_SUBST(DISASM_VAR)
|
|
|
|
|
2002-09-30 06:02:06 +04:00
|
|
|
AC_MSG_CHECKING(for ALL optimizations enabled)
|
|
|
|
AC_ARG_ENABLE(all-optimizations,
|
|
|
|
[ --enable-all-optimizations compile in all possible optimizations],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
speedups_all=1
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
speedups_all=0
|
|
|
|
fi
|
|
|
|
],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
speedups_all=0
|
|
|
|
]
|
|
|
|
)
|
|
|
|
|
|
|
|
#
|
|
|
|
# Optimizations section. Decide what the status of various optimizations
|
|
|
|
# should be based on configure choices and other factors.
|
|
|
|
#
|
|
|
|
|
|
|
|
if test "$speedups_all" = 1; then
|
|
|
|
# Configure requested to force all options enabled.
|
|
|
|
speedup_guest2host_tlb=1
|
|
|
|
speedup_repeat=1
|
|
|
|
speedup_iCache=1
|
|
|
|
speedup_host_specific_asms=1
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "$speedup_guest2host_tlb" = 1; then
|
|
|
|
AC_DEFINE(BX_SupportGuest2HostTLB, 1)
|
|
|
|
else
|
|
|
|
AC_DEFINE(BX_SupportGuest2HostTLB, 0)
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "$speedup_repeat" = 1; then
|
|
|
|
AC_DEFINE(BX_SupportRepeatSpeedups, 1)
|
|
|
|
else
|
|
|
|
AC_DEFINE(BX_SupportRepeatSpeedups, 0)
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "$speedup_iCache" = 1; then
|
|
|
|
AC_DEFINE(BX_SupportICache, 1)
|
|
|
|
else
|
|
|
|
AC_DEFINE(BX_SupportICache, 0)
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "$speedup_host_specific_asms" = 1; then
|
|
|
|
AC_DEFINE(BX_SupportHostAsms, 1)
|
|
|
|
else
|
|
|
|
AC_DEFINE(BX_SupportHostAsms, 0)
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
2001-10-04 22:00:48 +04:00
|
|
|
READLINE_LIB=""
|
|
|
|
rl_without_curses_ok=no
|
|
|
|
rl_with_curses_ok=no
|
|
|
|
|
|
|
|
AC_MSG_CHECKING(if readline works without -lcurses)
|
|
|
|
OLD_LIBS=$LIBS
|
|
|
|
LIBS="$LIBS -lreadline"
|
|
|
|
AC_TRY_RUN([
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <readline/readline.h>
|
|
|
|
int main() { rl_initialize(); exit(0); }
|
|
|
|
],
|
|
|
|
[ AC_MSG_RESULT(yes)
|
|
|
|
rl_without_curses_ok=yes ],
|
|
|
|
[ AC_MSG_RESULT(no) ]
|
|
|
|
)
|
|
|
|
AC_MSG_CHECKING(if readline works with -lcurses)
|
|
|
|
LIBS="$LIBS -lcurses"
|
|
|
|
AC_TRY_RUN([
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <readline/readline.h>
|
|
|
|
int main() { rl_initialize(); exit(0); }
|
|
|
|
],
|
|
|
|
[AC_MSG_RESULT(yes)
|
|
|
|
rl_with_curses_ok=yes ],
|
|
|
|
[ AC_MSG_RESULT(no) ]
|
|
|
|
)
|
|
|
|
LIBS=$OLD_LIBS
|
|
|
|
|
|
|
|
AC_MSG_CHECKING(whether user wants readline)
|
2001-06-07 06:51:20 +04:00
|
|
|
AC_ARG_ENABLE(readline,
|
2002-06-06 19:42:11 +04:00
|
|
|
[ --enable-readline use readline library, if available],
|
2001-06-07 06:51:20 +04:00
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
want_readline=yes
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
want_readline=no
|
|
|
|
fi],
|
2001-10-04 22:00:48 +04:00
|
|
|
[
|
2001-06-07 06:51:20 +04:00
|
|
|
AC_MSG_RESULT(yes)
|
2001-10-04 22:00:48 +04:00
|
|
|
want_readline=yes
|
|
|
|
]
|
2001-06-07 06:51:20 +04:00
|
|
|
)
|
|
|
|
|
2002-09-05 23:59:20 +04:00
|
|
|
use_readline=0
|
2001-10-04 22:00:48 +04:00
|
|
|
AC_MSG_CHECKING(whether to use readline)
|
2001-06-07 06:51:20 +04:00
|
|
|
if test "$want_readline" = yes; then
|
2001-10-04 22:00:48 +04:00
|
|
|
if test "$bx_debugger" = 1; then
|
|
|
|
if test "$rl_without_curses_ok" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(HAVE_LIBREADLINE, 1)
|
|
|
|
READLINE_LIB="-lreadline"
|
2002-09-05 23:59:20 +04:00
|
|
|
use_readline=1
|
2001-10-04 22:00:48 +04:00
|
|
|
elif test "$rl_with_curses_ok" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(HAVE_LIBREADLINE, 1)
|
|
|
|
READLINE_LIB="-lreadline -lcurses"
|
2002-09-05 23:59:20 +04:00
|
|
|
use_readline=1
|
2001-10-04 22:00:48 +04:00
|
|
|
else
|
2001-10-03 16:33:53 +04:00
|
|
|
AC_MSG_RESULT(no)
|
2001-10-04 22:07:06 +04:00
|
|
|
echo WARNING: The readline library was disabled because it was not found.
|
2001-10-03 16:33:53 +04:00
|
|
|
fi
|
|
|
|
else
|
2001-10-04 22:00:48 +04:00
|
|
|
AC_MSG_RESULT(no)
|
2001-10-03 16:33:53 +04:00
|
|
|
fi
|
2001-10-04 22:00:48 +04:00
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
2001-06-07 06:51:20 +04:00
|
|
|
fi
|
2001-10-04 22:05:29 +04:00
|
|
|
AC_SUBST(READLINE_LIB)
|
2001-05-23 12:16:07 +04:00
|
|
|
|
|
|
|
AC_CHECK_HEADER(readline/history.h,
|
|
|
|
AC_DEFINE(HAVE_READLINE_HISTORY_H)
|
|
|
|
)
|
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
INSTRUMENT_DIR='instrument/stubs'
|
|
|
|
|
|
|
|
AC_MSG_CHECKING(for instrumentation support)
|
|
|
|
AC_ARG_ENABLE(instrumentation,
|
|
|
|
[ --enable-instrumentation compile in support for instrumentation],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_INSTRUMENTATION, 1)
|
|
|
|
INSTRUMENT_VAR='$(INSTRUMENT_LIB)'
|
|
|
|
elif test "$enableval" = no; then
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_INSTRUMENTATION, 0)
|
|
|
|
INSTRUMENT_VAR=''
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_INSTRUMENTATION, 1)
|
|
|
|
INSTRUMENT_DIR=$enableval
|
|
|
|
INSTRUMENT_VAR='$(INSTRUMENT_LIB)'
|
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_INSTRUMENTATION, 0)
|
|
|
|
INSTRUMENT_VAR=''
|
|
|
|
]
|
|
|
|
)
|
|
|
|
AC_SUBST(INSTRUMENT_DIR)
|
|
|
|
AC_SUBST(INSTRUMENT_VAR)
|
|
|
|
|
|
|
|
AC_ARG_ENABLE(simid,
|
|
|
|
[ --enable-simid=0 or 1 CPU simulator ID if using more than one],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_DEFINE(BX_SIM_ID, 0)
|
|
|
|
elif test "$enableval" = no; then
|
|
|
|
AC_DEFINE(BX_SIM_ID, 0)
|
|
|
|
else
|
|
|
|
AC_DEFINE_UNQUOTED(BX_SIM_ID, $enableval)
|
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_DEFINE(BX_SIM_ID, 0)
|
|
|
|
]
|
|
|
|
)
|
|
|
|
|
|
|
|
AC_ARG_ENABLE(num-sim,
|
|
|
|
[ --enable-num-sim=1 or 2 number of CPU simulators],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_DEFINE(BX_NUM_SIMULATORS, 1)
|
|
|
|
elif test "$enableval" = no; then
|
|
|
|
AC_DEFINE(BX_NUM_SIMULATORS, 1)
|
|
|
|
else
|
|
|
|
AC_DEFINE_UNQUOTED(BX_NUM_SIMULATORS, $enableval)
|
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_DEFINE(BX_NUM_SIMULATORS, 1)
|
|
|
|
]
|
|
|
|
)
|
|
|
|
|
|
|
|
AC_ARG_ENABLE(time0,
|
|
|
|
[ --enable-time0=n start at n instead of using time()],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_DEFINE(BX_USE_SPECIFIED_TIME0, 917385580)
|
|
|
|
elif test "$enableval" = no; then
|
|
|
|
AC_DEFINE(BX_USE_SPECIFIED_TIME0, 0)
|
|
|
|
else
|
|
|
|
AC_DEFINE_UNQUOTED(BX_USE_SPECIFIED_TIME0, $enableval)
|
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_DEFINE(BX_USE_SPECIFIED_TIME0, 0)
|
|
|
|
]
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
AC_MSG_CHECKING(for VGA emulation)
|
|
|
|
AC_ARG_ENABLE(vga,
|
|
|
|
[ --enable-vga use VGA emulation],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_SUPPORT_VGA, 1)
|
|
|
|
VIDEO_OBJS='$(VIDEO_OBJS_VGA)'
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_SUPPORT_VGA, 0)
|
|
|
|
VIDEO_OBJS='$(VIDEO_OBJS_HGA)'
|
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_SUPPORT_VGA, 1)
|
|
|
|
VIDEO_OBJS='$(VIDEO_OBJS_VGA)'
|
|
|
|
]
|
|
|
|
)
|
|
|
|
AC_SUBST(VIDEO_OBJS)
|
|
|
|
|
2002-03-09 01:37:06 +03:00
|
|
|
AC_MSG_CHECKING(for VESA BIOS extensions)
|
|
|
|
AC_ARG_ENABLE(vbe,
|
|
|
|
[ --enable-vbe use VESA BIOS extensions],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_SUPPORT_VBE, 1)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_SUPPORT_VBE, 0)
|
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_SUPPORT_VBE, 0)
|
|
|
|
]
|
|
|
|
)
|
|
|
|
|
2002-08-26 20:17:10 +04:00
|
|
|
AC_MSG_CHECKING(for MMX support)
|
|
|
|
AC_ARG_ENABLE(mmx,
|
|
|
|
[ --enable-mmx compile in MMX emulation],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_SUPPORT_MMX, 1)
|
|
|
|
elif test "$enableval" = no; then
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_SUPPORT_MMX, 0)
|
|
|
|
fi
|
|
|
|
],
|
|
|
|
[
|
2002-09-20 19:12:25 +04:00
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_SUPPORT_MMX, 1)
|
2002-08-26 20:17:10 +04:00
|
|
|
]
|
|
|
|
)
|
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_MSG_CHECKING(for FPU emulation)
|
|
|
|
FPU_VAR=''
|
|
|
|
FPU_GLUE_OBJ=''
|
|
|
|
AC_ARG_ENABLE(fpu,
|
2001-05-16 12:00:43 +04:00
|
|
|
[ --enable-fpu compile in FPU emulation],
|
2001-04-10 05:04:59 +04:00
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_SUPPORT_FPU, 1)
|
|
|
|
FPU_VAR='$(FPU_LIB)'
|
|
|
|
FPU_GLUE_OBJ='$(FPU_GLUE_OBJ)'
|
|
|
|
elif test "$enableval" = no; then
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_SUPPORT_FPU, 0)
|
|
|
|
else
|
|
|
|
echo " "
|
|
|
|
echo "ERROR: --enable-fpu does not accept a path"
|
|
|
|
exit 1
|
2001-05-23 12:16:07 +04:00
|
|
|
fi
|
|
|
|
],
|
2001-04-10 05:04:59 +04:00
|
|
|
[
|
2001-05-16 12:00:43 +04:00
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_SUPPORT_FPU, 1)
|
|
|
|
FPU_VAR='$(FPU_LIB)'
|
|
|
|
FPU_GLUE_OBJ='$(FPU_GLUE_OBJ)'
|
2001-04-10 05:04:59 +04:00
|
|
|
]
|
|
|
|
)
|
|
|
|
AC_SUBST(FPU_VAR)
|
|
|
|
AC_SUBST(FPU_GLUE_OBJ)
|
|
|
|
|
2002-10-11 05:11:11 +04:00
|
|
|
support_sse=0
|
|
|
|
AC_MSG_CHECKING(for SSE support)
|
|
|
|
AC_ARG_ENABLE(sse,
|
|
|
|
[ --enable-sse =1 (SSE) =2 (SSE2) support],
|
|
|
|
[case "$enableval" in
|
|
|
|
no | 0)
|
|
|
|
support_sse=0
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
;;
|
|
|
|
yes | 1)
|
|
|
|
support_sse=1
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
;;
|
|
|
|
2)
|
|
|
|
support_sse=2
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
echo "ERROR: --enable-sse=$enableval not understood"
|
|
|
|
exit 1
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
]
|
|
|
|
)
|
2001-04-10 05:04:59 +04:00
|
|
|
|
2002-10-11 05:11:11 +04:00
|
|
|
if test "$support_sse" = 2; then
|
|
|
|
AC_DEFINE(BX_SUPPORT_SSE, 1)
|
|
|
|
AC_DEFINE(BX_SUPPORT_SSE2, 1)
|
|
|
|
elif test "$support_sse" = 1; then
|
|
|
|
AC_DEFINE(BX_SUPPORT_SSE, 1)
|
|
|
|
AC_DEFINE(BX_SUPPORT_SSE2, 0)
|
|
|
|
else
|
|
|
|
AC_DEFINE(BX_SUPPORT_SSE, 0)
|
|
|
|
AC_DEFINE(BX_SUPPORT_SSE2, 0)
|
|
|
|
fi
|
2001-04-10 05:04:59 +04:00
|
|
|
|
|
|
|
AC_MSG_CHECKING(for x86 debugger support)
|
|
|
|
AC_ARG_ENABLE(x86-debugger,
|
|
|
|
[ --enable-x86-debugger x86 debugger support],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_X86_DEBUGGER, 1)
|
|
|
|
elif test "$enableval" = no; then
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_X86_DEBUGGER, 0)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_X86_DEBUGGER, 1)
|
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_X86_DEBUGGER, 0)
|
|
|
|
]
|
|
|
|
)
|
|
|
|
|
2001-12-08 01:18:40 +03:00
|
|
|
AC_CHECK_HEADER(IOKit/storage/IOCDMedia.h,
|
|
|
|
can_use_osx_cdrom=yes
|
|
|
|
)
|
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_MSG_CHECKING(for CDROM support)
|
|
|
|
AC_ARG_ENABLE(cdrom,
|
|
|
|
[ --enable-cdrom CDROM support],
|
2001-12-08 00:56:15 +03:00
|
|
|
[if test "$enableval" = no; then
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
CDROM_OBJS=''
|
|
|
|
AC_DEFINE(BX_SUPPORT_CDROM, 0)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
CDROM_OBJS='cdrom.o'
|
2001-08-16 00:33:47 +04:00
|
|
|
if test "$with_amigaos" = yes; then
|
2001-08-16 00:39:40 +04:00
|
|
|
# use the amiga cdrom file instead.
|
|
|
|
CDROM_OBJS="cdrom_amigaos.o"
|
2001-12-08 01:18:40 +03:00
|
|
|
elif test "$can_use_osx_cdrom" = yes; then
|
2001-12-08 00:56:15 +03:00
|
|
|
# use cdrom_osx
|
|
|
|
AC_MSG_RESULT(Using OSX IOKit CD Interface)
|
|
|
|
CDROM_OBJS="cdrom_osx.o"
|
|
|
|
EXTRA_LINK_OPTS="${EXTRA_LINK_OPTS} -framework IOKit -framework CoreFoundation"
|
2001-08-16 00:33:47 +04:00
|
|
|
fi
|
2002-10-02 16:11:25 +04:00
|
|
|
case $target in
|
|
|
|
*-beos*)
|
|
|
|
# use the beos cdrom file instead
|
|
|
|
CDROM_OBJS="$CDROM_OBJS cdrom_beos.o"
|
|
|
|
esac
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_DEFINE(BX_SUPPORT_CDROM, 1)
|
|
|
|
fi],
|
|
|
|
[
|
2002-06-06 19:42:11 +04:00
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
CDROM_OBJS='cdrom.o'
|
|
|
|
if test "$with_amigaos" = yes; then
|
|
|
|
# use the amiga cdrom file instead.
|
|
|
|
CDROM_OBJS="cdrom_amigaos.o"
|
|
|
|
elif test "$can_use_osx_cdrom" = yes; then
|
|
|
|
# use cdrom_osx
|
|
|
|
AC_MSG_RESULT(Using OSX IOKit CD Interface)
|
|
|
|
CDROM_OBJS="cdrom_osx.o"
|
|
|
|
EXTRA_LINK_OPTS="${EXTRA_LINK_OPTS} -framework IOKit -framework CoreFoundation"
|
|
|
|
elif test "$with_beos" = yes; then
|
|
|
|
# use the beos cdrom file instead
|
|
|
|
CDROM_OBJS="$CDROM_OBJS cdrom_beos.o"
|
|
|
|
fi
|
|
|
|
AC_DEFINE(BX_SUPPORT_CDROM, 1)
|
2001-04-10 05:04:59 +04:00
|
|
|
]
|
|
|
|
)
|
2001-12-08 01:18:40 +03:00
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_SUBST(CDROM_OBJS)
|
|
|
|
|
|
|
|
|
|
|
|
AC_MSG_CHECKING(for Sound Blaster 16 support)
|
|
|
|
AC_ARG_ENABLE(sb16,
|
2002-06-06 19:42:11 +04:00
|
|
|
[ --enable-sb16=xxx Sound Blaster 16 Support (xxx=dummy|win|linux|freebsd)],
|
2001-04-10 05:04:59 +04:00
|
|
|
[if test "$enableval" = no; then
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
SB16_OBJS=''
|
|
|
|
AC_DEFINE(BX_SUPPORT_SB16, 0)
|
|
|
|
else
|
|
|
|
case "$enableval" in
|
|
|
|
dummy)
|
|
|
|
SB16_OBJS='$(SB16_DUMMY_OBJS)'
|
|
|
|
AC_DEFINE(BX_SOUND_OUTPUT_C, bx_sound_output_c)
|
|
|
|
AC_MSG_RESULT(dummy)
|
|
|
|
;;
|
2002-01-16 22:52:28 +03:00
|
|
|
freebsd|linux)
|
2001-04-10 05:04:59 +04:00
|
|
|
SB16_OBJS='$(SB16_LINUX_OBJS)'
|
|
|
|
AC_DEFINE(BX_SOUND_OUTPUT_C, bx_sound_linux_c)
|
|
|
|
AC_MSG_RESULT(linux)
|
|
|
|
;;
|
|
|
|
win)
|
|
|
|
SB16_OBJS='$(SB16_WIN_OBJS)'
|
|
|
|
AC_DEFINE(BX_SOUND_OUTPUT_C, bx_sound_windows_c)
|
|
|
|
AC_MSG_RESULT(win)
|
- add -lwinmm to the link lines anytime you use --enable-sb16=win. Now
instead of winmm being a part of GUI_LINK_OPTS_WIN32 only, it is
placed in @DEVICE_LINE_OPTS@ so that it will be used for sdl, rfb, wx,
etc.
- solve compile problems when building bximage, niclist, and any other
console based program. The compile flags returned by wx-config and
sdl-config did strange things to these console programs, for example
redefining main to SDL_main. Because I wanted to use the
configure-generated CFLAGS to compile the programs, but I wanted to
avoid including GUI specific compile options, I split up the configure's
@CFLAGS@ variable into @CFLAGS@ and @GUI_CFLAGS@, and split
@CXXFLAGS@ into @CXXFLAGS@ and @GUI_CXXFLAGS@. All programs in the
Bochs binary will use both, but the console programs will just use
@CFLAGS@ or @CXXFLAGS@.
- gui/Makefile.in, I no longer use the gui specific CFLAGS variables,
SDL_CFLAGS and WX_CXXFLAGS. These values are included in CFLAGS and
CXXFLAGS now.
- modified: configure.in, configure, all Makefile.in's
2002-10-02 03:37:50 +04:00
|
|
|
DEVICE_LINK_OPTS="$DEVICE_LINK_OPTS -lwinmm"
|
2001-04-10 05:04:59 +04:00
|
|
|
;;
|
|
|
|
*)
|
|
|
|
echo " "
|
|
|
|
echo \!\!\!Error\!\!\!
|
2002-09-26 22:23:34 +04:00
|
|
|
echo "You must pass one of dummy, linux, win, freebsd to --enable-sb16"
|
2001-04-10 05:04:59 +04:00
|
|
|
exit 1 ;;
|
|
|
|
esac
|
|
|
|
AC_DEFINE(BX_SUPPORT_SB16, 1)
|
|
|
|
fi],
|
|
|
|
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
SB16_OBJS=''
|
|
|
|
AC_DEFINE(BX_SUPPORT_SB16, 0)
|
|
|
|
]
|
|
|
|
)
|
|
|
|
AC_SUBST(SB16_OBJS)
|
|
|
|
|
|
|
|
|
2002-10-03 09:23:20 +04:00
|
|
|
AC_MSG_CHECKING(for gdb stub enable)
|
|
|
|
AC_ARG_ENABLE(gdb-stub,
|
|
|
|
[ --enable-gdb-stub enable gdb stub support],
|
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_GDBSTUB, 1)
|
|
|
|
GDBSTUB_VAR='$(GDBSTUB_OBJS)'
|
2002-10-04 01:03:56 +04:00
|
|
|
if test "$bx_debugger" = 1; then
|
|
|
|
AC_MSG_ERROR(--enable-debugger and --enable-gdb-stub are mutually exclusive)
|
|
|
|
fi
|
2002-10-03 09:23:20 +04:00
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_GDBSTUB, 0)
|
|
|
|
GDBSTUB_VAR=''
|
|
|
|
fi],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_GDBSTUB, 0)
|
|
|
|
GDBSTUB_VAR=''
|
|
|
|
]
|
|
|
|
)
|
|
|
|
AC_SUBST(GDBSTUB_VAR)
|
|
|
|
|
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_ARG_ENABLE(hga-dumps,
|
|
|
|
[ --enable-hga-dumps=Nmicroseconds copy memory to HGA video buffer every N useconds],
|
|
|
|
AC_DEFINE_UNQUOTED(BX_EMULATE_HGA_DUMPS, $enableval),
|
|
|
|
)
|
|
|
|
|
2001-09-18 09:25:29 +04:00
|
|
|
AC_MSG_CHECKING(for I/O Interface to the debugger)
|
|
|
|
IODEBUG_OBJS=''
|
|
|
|
AC_ARG_ENABLE(iodebug,
|
2002-02-05 22:21:59 +03:00
|
|
|
[ --enable-iodebug enable I/O interface to debugger],
|
2001-09-18 09:25:29 +04:00
|
|
|
[if test "$enableval" = yes; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_IODEBUG_SUPPORT, 1)
|
|
|
|
IODEBUG_OBJS='iodebug.o'
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_DEFINE(BX_IODEBUG_SUPPORT, 0)
|
|
|
|
fi
|
|
|
|
],
|
|
|
|
[
|
2002-03-21 05:14:51 +03:00
|
|
|
if test "" = 1; then
|
|
|
|
# enable by default if debugger is on
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_DEFINE(BX_IODEBUG_SUPPORT, 1)
|
2002-03-26 15:47:50 +03:00
|
|
|
IODEBUG_OBJS='iodebug.o'
|
2002-03-21 05:14:51 +03:00
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
fi
|
2001-09-18 09:25:29 +04:00
|
|
|
]
|
|
|
|
)
|
|
|
|
AC_SUBST(IODEBUG_OBJS)
|
|
|
|
|
|
|
|
|
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
PRIMARY_TARGET='bochs'
|
|
|
|
|
2001-06-07 20:00:58 +04:00
|
|
|
AC_DEFINE(BX_PROVIDE_DEVICE_MODELS, 1)
|
|
|
|
IODEV_LIB_VAR='iodev/libiodev.a'
|
|
|
|
AC_DEFINE(BX_PROVIDE_CPU_MEMORY, 1)
|
|
|
|
NONINLINE_VAR='$(NONINLINE_OBJS)'
|
2001-04-10 05:04:59 +04:00
|
|
|
|
2001-06-07 20:00:58 +04:00
|
|
|
AC_SUBST(IODEV_LIB_VAR)
|
2002-10-02 04:09:49 +04:00
|
|
|
AC_SUBST(EXTRA_BX_OBJS)
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_SUBST(NONINLINE_VAR)
|
|
|
|
AC_SUBST(INLINE_VAR)
|
|
|
|
AC_SUBST(EXTERNAL_DEPENDENCY)
|
2002-09-12 11:16:37 +04:00
|
|
|
AC_SUBST(EXT_DEBUG_OBJS)
|
2001-04-10 05:04:59 +04:00
|
|
|
|
|
|
|
|
|
|
|
AC_ARG_WITH(x11,
|
|
|
|
[ --with-x11 use X11 GUI],
|
|
|
|
)
|
|
|
|
|
|
|
|
AC_ARG_WITH(beos,
|
|
|
|
[ --with-beos use BeOS GUI],
|
|
|
|
)
|
|
|
|
|
|
|
|
AC_ARG_WITH(win32,
|
|
|
|
[ --with-win32 use Win32 GUI],
|
|
|
|
)
|
|
|
|
|
|
|
|
AC_ARG_WITH(win32-vcpp,
|
|
|
|
[ --with-win32-vcpp use Win32 GUI/Visual C++ environment],
|
|
|
|
)
|
|
|
|
|
|
|
|
AC_ARG_WITH(macos,
|
|
|
|
[ --with-macos use Macintosh/CodeWarrior environment],
|
|
|
|
)
|
|
|
|
|
2001-09-26 04:13:16 +04:00
|
|
|
AC_ARG_WITH(carbon,
|
|
|
|
[ --with-carbon compile for MacOS X with Carbon GUI],
|
|
|
|
)
|
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_ARG_WITH(nogui,
|
|
|
|
[ --with-nogui no native GUI, just use blank stubs],
|
|
|
|
)
|
|
|
|
|
2001-05-08 23:07:26 +04:00
|
|
|
AC_ARG_WITH(term,
|
|
|
|
[ --with-term textmode terminal environment],
|
|
|
|
)
|
|
|
|
|
2001-05-24 05:07:09 +04:00
|
|
|
AC_ARG_WITH(rfb,
|
|
|
|
[ --with-rfb use RFB protocol, works with VNC viewer],
|
|
|
|
)
|
|
|
|
|
2001-08-16 00:33:47 +04:00
|
|
|
AC_ARG_WITH(amigaos,
|
2001-12-08 00:56:15 +03:00
|
|
|
[ --with-amigaos use MorphOS (Amiga)],
|
|
|
|
)
|
|
|
|
|
2002-02-05 20:37:11 +03:00
|
|
|
AC_ARG_WITH(sdl,
|
|
|
|
[ --with-sdl use SDL libraries],
|
|
|
|
)
|
|
|
|
|
2002-04-18 04:22:20 +04:00
|
|
|
AC_ARG_WITH(wx,
|
|
|
|
[ --with-wx use wxWindows libraries],
|
|
|
|
)
|
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
dnl // DASH is option prefix for your platform
|
|
|
|
dnl // SLASH is directory for your platform
|
|
|
|
dnl // CXXFP is C++ File Prefix; the flag that tells the compiler
|
|
|
|
dnl // this is a C++ source file
|
|
|
|
dnl // CFP is C File Prefix; the flag that tells the compiler
|
|
|
|
dnl // this is a C source file
|
|
|
|
dnl // OFP is Object File Prefix; the flag that tells the compiler
|
|
|
|
dnl // generate an object file with this name
|
|
|
|
DASH="-"
|
|
|
|
SLASH="/"
|
|
|
|
CXXFP=""
|
|
|
|
CFP=""
|
|
|
|
OFP="-o "
|
2002-09-14 09:46:57 +04:00
|
|
|
MAKELIB="ar rv \$@"
|
2001-04-10 05:04:59 +04:00
|
|
|
RMCOMMAND="rm -f "
|
|
|
|
LINK="\$(CXX) -o \$@ \$(CXXFLAGS)"
|
- add -lwinmm to the link lines anytime you use --enable-sb16=win. Now
instead of winmm being a part of GUI_LINK_OPTS_WIN32 only, it is
placed in @DEVICE_LINE_OPTS@ so that it will be used for sdl, rfb, wx,
etc.
- solve compile problems when building bximage, niclist, and any other
console based program. The compile flags returned by wx-config and
sdl-config did strange things to these console programs, for example
redefining main to SDL_main. Because I wanted to use the
configure-generated CFLAGS to compile the programs, but I wanted to
avoid including GUI specific compile options, I split up the configure's
@CFLAGS@ variable into @CFLAGS@ and @GUI_CFLAGS@, and split
@CXXFLAGS@ into @CXXFLAGS@ and @GUI_CXXFLAGS@. All programs in the
Bochs binary will use both, but the console programs will just use
@CFLAGS@ or @CXXFLAGS@.
- gui/Makefile.in, I no longer use the gui specific CFLAGS variables,
SDL_CFLAGS and WX_CXXFLAGS. These values are included in CFLAGS and
CXXFLAGS now.
- modified: configure.in, configure, all Makefile.in's
2002-10-02 03:37:50 +04:00
|
|
|
LINK_CONSOLE="\$(CXX) -o \$@ \$(CXXFLAGS_CONSOLE)"
|
2001-04-10 05:04:59 +04:00
|
|
|
EXE=""
|
|
|
|
COMMAND_SEPARATOR="&& \\"
|
|
|
|
CD_UP_ONE="echo done"
|
|
|
|
CD_UP_TWO="echo done"
|
|
|
|
|
2001-10-05 10:06:21 +04:00
|
|
|
INSTALL_TARGET=install_unix
|
|
|
|
INSTALL_LIST_FOR_PLATFORM=
|
|
|
|
|
2002-09-24 01:41:35 +04:00
|
|
|
# check for existence of and usable version of wxWindows. This comes
|
|
|
|
# early so that it could affect which one gets chosen.
|
2002-10-03 06:26:32 +04:00
|
|
|
if test x$WX_CONFIG = x; then
|
|
|
|
AC_CHECK_PROG(WX_CONFIG, [ wx-config --version ], wx-config, not_found)
|
|
|
|
fi
|
|
|
|
AC_MSG_CHECKING(for wxWindows configuration script)
|
|
|
|
AC_MSG_RESULT($WX_CONFIG)
|
|
|
|
|
2002-09-24 01:41:35 +04:00
|
|
|
ok_wx_version=0
|
|
|
|
AC_MSG_CHECKING(for wxWindows library version)
|
2002-09-25 01:35:04 +04:00
|
|
|
if test x$WX_CONFIG != xnot_found; then
|
2002-09-24 01:41:35 +04:00
|
|
|
WX_VERSION=`$WX_CONFIG --version`
|
|
|
|
[
|
|
|
|
# test that version >= 2.3.2. Anybody have a better way to do this? Yuck.
|
|
|
|
case x$WX_VERSION in
|
|
|
|
x2.[012]*) ;; # less than version 2.3.x
|
|
|
|
x2.3.[01]) ;; # less than version 2.3.2
|
|
|
|
x2.3.[2-9]*) ok_wx_version=1 ;; # 2.3.2 or greater
|
|
|
|
x2.3.[1-9][0-9]*) ok_wx_version=1 ;; # 2.3.10 or greater
|
|
|
|
x2.[4-9]*) ok_wx_version=1 ;; # version 2.4 or greater
|
|
|
|
x[3-9]*) ok_wx_version=1 ;; # version 3 or greater
|
|
|
|
*) ;; # who knows?
|
|
|
|
esac
|
|
|
|
]
|
|
|
|
fi
|
2002-09-25 01:35:04 +04:00
|
|
|
AC_MSG_RESULT($WX_VERSION)
|
2002-09-24 01:41:35 +04:00
|
|
|
|
2002-03-08 07:47:33 +03:00
|
|
|
AC_MSG_CHECKING(for default gui on this platform)
|
|
|
|
AC_MSG_RESULT($DEFAULT_GUI)
|
- commit patch.check-platform. For full details, pull up the patch itself
and look at the description at the top. Here's an intro.
This patch makes significant changes to the configure script. It adds the
lines AC_CANONICAL_HOST and AC_CANONICAL_TARGET which detect the OS and
processor type. The configure script, knowing the OS and processor type, can
then make intelligent decisions about which CFLAGS are needed and what is the
default GUI for that platform. One of the goals of this patch is to make it
so that on all supported platforms, "configure;make" will compile cleanly.
Configure detects the target platform, but it can be overridden by using
--target=___. This is important when using one platform to generate
Makefiles and header files for another platform. See config.guess script for
the exact details of platform naming.
The defaults that are currently implemented in the modified configure script
include:
If platform is windows* or winnt*, use win32 gui.
If platform is cygwin*, use win32 gui and compile with
"-mno-cygwin -DWIN32".
If platform is macosx* or darwin*, use carbon gui and compile
with "-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants
-Wno-unknown-pragmas -Dmacintosh"
If platform is macos, use macos gui.
If platform is beos, use beos gui.
If platform is amigaos, use amigaos gui.
Otherwise, use X windows gui.
2002-03-07 19:00:39 +03:00
|
|
|
AC_MSG_CHECKING(for gui library to use)
|
|
|
|
|
|
|
|
# the $with_* variable tells the gui library to use, but does NOT necessarily
|
|
|
|
# indicate the platform. Settings that depend on the platform should be
|
|
|
|
# handled later.
|
|
|
|
|
2001-04-10 05:04:59 +04:00
|
|
|
if test "$with_x11" = yes; then
|
2001-05-24 05:07:09 +04:00
|
|
|
AC_MSG_RESULT(X windows)
|
2001-06-02 07:11:51 +04:00
|
|
|
if test "$no_x" = yes; then
|
|
|
|
echo ERROR: X windows gui was selected, but X windows libraries were not found.
|
|
|
|
exit 1
|
|
|
|
fi
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_DEFINE(BX_WITH_X11, 1)
|
2002-04-18 04:22:20 +04:00
|
|
|
GUI_OBJS='$(GUI_OBJS_X11) control.o'
|
2001-04-10 05:04:59 +04:00
|
|
|
GUI_LINK_OPTS='$(GUI_LINK_OPTS_X)'
|
2001-10-05 10:06:21 +04:00
|
|
|
INSTALL_LIST_FOR_PLATFORM='$(INSTALL_LIST_X11)'
|
2001-04-10 05:04:59 +04:00
|
|
|
elif test "$with_beos" = yes; then
|
2001-05-24 05:07:09 +04:00
|
|
|
AC_MSG_RESULT(beos)
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_DEFINE(BX_WITH_BEOS, 1)
|
2002-04-18 04:22:20 +04:00
|
|
|
GUI_OBJS='$(GUI_OBJS_BEOS) control.o'
|
2001-04-10 05:04:59 +04:00
|
|
|
GUI_LINK_OPTS='$(GUI_LINK_OPTS_BEOS)'
|
2002-02-05 20:37:11 +03:00
|
|
|
elif test "$with_sdl" = yes; then
|
|
|
|
AC_MSG_RESULT(sdl)
|
- add -lwinmm to the link lines anytime you use --enable-sb16=win. Now
instead of winmm being a part of GUI_LINK_OPTS_WIN32 only, it is
placed in @DEVICE_LINE_OPTS@ so that it will be used for sdl, rfb, wx,
etc.
- solve compile problems when building bximage, niclist, and any other
console based program. The compile flags returned by wx-config and
sdl-config did strange things to these console programs, for example
redefining main to SDL_main. Because I wanted to use the
configure-generated CFLAGS to compile the programs, but I wanted to
avoid including GUI specific compile options, I split up the configure's
@CFLAGS@ variable into @CFLAGS@ and @GUI_CFLAGS@, and split
@CXXFLAGS@ into @CXXFLAGS@ and @GUI_CXXFLAGS@. All programs in the
Bochs binary will use both, but the console programs will just use
@CFLAGS@ or @CXXFLAGS@.
- gui/Makefile.in, I no longer use the gui specific CFLAGS variables,
SDL_CFLAGS and WX_CXXFLAGS. These values are included in CFLAGS and
CXXFLAGS now.
- modified: configure.in, configure, all Makefile.in's
2002-10-02 03:37:50 +04:00
|
|
|
# GUI_*FLAGS are added to the compilation of every bochs file, not just
|
|
|
|
# the files in gui/*.cc.
|
|
|
|
GUI_CFLAGS="$CFLAGS \`sdl-config --cflags\`"
|
|
|
|
GUI_CXXFLAGS="$CXXFLAGS \`sdl-config --cflags\`"
|
2002-02-05 20:37:11 +03:00
|
|
|
AC_DEFINE(BX_WITH_SDL, 1)
|
2002-04-18 04:22:20 +04:00
|
|
|
GUI_OBJS='$(GUI_OBJS_SDL) control.o'
|
2002-02-05 20:37:11 +03:00
|
|
|
GUI_LINK_OPTS='$(GUI_LINK_OPTS_SDL)'
|
2001-05-24 05:07:09 +04:00
|
|
|
elif test "$with_rfb" = yes; then
|
|
|
|
AC_MSG_RESULT(rfb)
|
|
|
|
AC_DEFINE(BX_WITH_RFB, 1)
|
2002-04-18 04:22:20 +04:00
|
|
|
GUI_OBJS='$(GUI_OBJS_RFB) control.o'
|
2001-05-24 05:07:09 +04:00
|
|
|
GUI_LINK_OPTS='$(GUI_LINK_OPTS_RFB)'
|
2001-08-16 00:33:47 +04:00
|
|
|
elif test "$with_amigaos" = yes; then
|
|
|
|
AC_MSG_RESULT(amigaos)
|
|
|
|
AC_DEFINE(BX_WITH_AMIGAOS, 1)
|
2002-04-18 04:22:20 +04:00
|
|
|
GUI_OBJS='$(GUI_OBJS_AMIGAOS) control.o'
|
2001-08-16 00:33:47 +04:00
|
|
|
GUI_LINK_OPTS='$(GUI_LINK_OPTS_AMIGAOS)'
|
- commit patch.check-platform. For full details, pull up the patch itself
and look at the description at the top. Here's an intro.
This patch makes significant changes to the configure script. It adds the
lines AC_CANONICAL_HOST and AC_CANONICAL_TARGET which detect the OS and
processor type. The configure script, knowing the OS and processor type, can
then make intelligent decisions about which CFLAGS are needed and what is the
default GUI for that platform. One of the goals of this patch is to make it
so that on all supported platforms, "configure;make" will compile cleanly.
Configure detects the target platform, but it can be overridden by using
--target=___. This is important when using one platform to generate
Makefiles and header files for another platform. See config.guess script for
the exact details of platform naming.
The defaults that are currently implemented in the modified configure script
include:
If platform is windows* or winnt*, use win32 gui.
If platform is cygwin*, use win32 gui and compile with
"-mno-cygwin -DWIN32".
If platform is macosx* or darwin*, use carbon gui and compile
with "-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants
-Wno-unknown-pragmas -Dmacintosh"
If platform is macos, use macos gui.
If platform is beos, use beos gui.
If platform is amigaos, use amigaos gui.
Otherwise, use X windows gui.
2002-03-07 19:00:39 +03:00
|
|
|
elif test "$with_win32" = yes; then
|
|
|
|
AC_MSG_RESULT(win32)
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_DEFINE(BX_WITH_WIN32, 1)
|
2002-04-18 04:22:20 +04:00
|
|
|
GUI_OBJS='$(GUI_OBJS_WIN32) control.o'
|
- commit patch.check-platform. For full details, pull up the patch itself
and look at the description at the top. Here's an intro.
This patch makes significant changes to the configure script. It adds the
lines AC_CANONICAL_HOST and AC_CANONICAL_TARGET which detect the OS and
processor type. The configure script, knowing the OS and processor type, can
then make intelligent decisions about which CFLAGS are needed and what is the
default GUI for that platform. One of the goals of this patch is to make it
so that on all supported platforms, "configure;make" will compile cleanly.
Configure detects the target platform, but it can be overridden by using
--target=___. This is important when using one platform to generate
Makefiles and header files for another platform. See config.guess script for
the exact details of platform naming.
The defaults that are currently implemented in the modified configure script
include:
If platform is windows* or winnt*, use win32 gui.
If platform is cygwin*, use win32 gui and compile with
"-mno-cygwin -DWIN32".
If platform is macosx* or darwin*, use carbon gui and compile
with "-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants
-Wno-unknown-pragmas -Dmacintosh"
If platform is macos, use macos gui.
If platform is beos, use beos gui.
If platform is amigaos, use amigaos gui.
Otherwise, use X windows gui.
2002-03-07 19:00:39 +03:00
|
|
|
case $target in
|
|
|
|
*-pc-windows*)
|
|
|
|
GUI_LINK_OPTS='$(GUI_LINK_OPTS_WIN32_VCPP)' # native libs for win gui
|
|
|
|
;;
|
2002-03-28 03:29:57 +03:00
|
|
|
*-cygwin* | *-mingw32*)
|
- commit patch.check-platform. For full details, pull up the patch itself
and look at the description at the top. Here's an intro.
This patch makes significant changes to the configure script. It adds the
lines AC_CANONICAL_HOST and AC_CANONICAL_TARGET which detect the OS and
processor type. The configure script, knowing the OS and processor type, can
then make intelligent decisions about which CFLAGS are needed and what is the
default GUI for that platform. One of the goals of this patch is to make it
so that on all supported platforms, "configure;make" will compile cleanly.
Configure detects the target platform, but it can be overridden by using
--target=___. This is important when using one platform to generate
Makefiles and header files for another platform. See config.guess script for
the exact details of platform naming.
The defaults that are currently implemented in the modified configure script
include:
If platform is windows* or winnt*, use win32 gui.
If platform is cygwin*, use win32 gui and compile with
"-mno-cygwin -DWIN32".
If platform is macosx* or darwin*, use carbon gui and compile
with "-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants
-Wno-unknown-pragmas -Dmacintosh"
If platform is macos, use macos gui.
If platform is beos, use beos gui.
If platform is amigaos, use amigaos gui.
Otherwise, use X windows gui.
2002-03-07 19:00:39 +03:00
|
|
|
GUI_LINK_OPTS='$(GUI_LINK_OPTS_WIN32)' # cygwin/mingw libs for win gui
|
|
|
|
;;
|
|
|
|
*) echo Unsupported compile setup: GUI library is win32, but target is neither windows nor cygwin.
|
|
|
|
;;
|
|
|
|
esac
|
2001-04-10 05:04:59 +04:00
|
|
|
elif test "$with_macos" = yes; then
|
2001-05-24 05:07:09 +04:00
|
|
|
AC_MSG_RESULT(macos)
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_DEFINE(BX_WITH_MACOS, 1)
|
2002-04-18 04:22:20 +04:00
|
|
|
GUI_OBJS='$(GUI_OBJS_MACOS) control.o'
|
2001-04-10 05:04:59 +04:00
|
|
|
GUI_LINK_OPTS='$(GUI_LINK_OPTS_MACOS)'
|
2001-09-26 04:13:16 +04:00
|
|
|
elif test "$with_carbon" = yes; then
|
|
|
|
AC_MSG_RESULT(carbon)
|
|
|
|
AC_DEFINE(BX_WITH_CARBON, 1)
|
2002-04-18 04:22:20 +04:00
|
|
|
GUI_OBJS='$(GUI_OBJS_CARBON) control.o'
|
2001-09-26 04:13:16 +04:00
|
|
|
GUI_LINK_OPTS='$(GUI_LINK_OPTS_CARBON)'
|
- commit patch.check-platform. For full details, pull up the patch itself
and look at the description at the top. Here's an intro.
This patch makes significant changes to the configure script. It adds the
lines AC_CANONICAL_HOST and AC_CANONICAL_TARGET which detect the OS and
processor type. The configure script, knowing the OS and processor type, can
then make intelligent decisions about which CFLAGS are needed and what is the
default GUI for that platform. One of the goals of this patch is to make it
so that on all supported platforms, "configure;make" will compile cleanly.
Configure detects the target platform, but it can be overridden by using
--target=___. This is important when using one platform to generate
Makefiles and header files for another platform. See config.guess script for
the exact details of platform naming.
The defaults that are currently implemented in the modified configure script
include:
If platform is windows* or winnt*, use win32 gui.
If platform is cygwin*, use win32 gui and compile with
"-mno-cygwin -DWIN32".
If platform is macosx* or darwin*, use carbon gui and compile
with "-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants
-Wno-unknown-pragmas -Dmacintosh"
If platform is macos, use macos gui.
If platform is beos, use beos gui.
If platform is amigaos, use amigaos gui.
Otherwise, use X windows gui.
2002-03-07 19:00:39 +03:00
|
|
|
PRIMARY_TARGET=bochs.app/.build # only for carbon application
|
2001-05-08 23:07:26 +04:00
|
|
|
elif test "$with_term" = yes; then
|
2001-05-24 05:07:09 +04:00
|
|
|
AC_MSG_RESULT(term)
|
2001-05-08 23:07:26 +04:00
|
|
|
AC_DEFINE(BX_WITH_TERM, 1)
|
2002-04-18 04:22:20 +04:00
|
|
|
GUI_OBJS='$(GUI_OBJS_TERM) control.o'
|
2001-05-08 23:07:26 +04:00
|
|
|
GUI_LINK_OPTS='$(GUI_LINK_OPTS_TERM)'
|
|
|
|
use_curses=yes
|
2002-04-18 04:22:20 +04:00
|
|
|
elif test "$with_wx" = yes; then
|
|
|
|
AC_MSG_RESULT(wxWindows)
|
2002-09-25 01:35:04 +04:00
|
|
|
if test "$cross_configure" = 1; then
|
|
|
|
true # do not insist, if configuring for another machine
|
|
|
|
else
|
|
|
|
if test x$ok_wx_version != x1; then
|
|
|
|
echo ERROR: A usable version of wxWindows was not found.
|
|
|
|
echo Upgrade the library or choose another gui.
|
|
|
|
exit 1
|
|
|
|
fi
|
2002-09-24 01:41:35 +04:00
|
|
|
fi
|
2002-04-18 04:22:20 +04:00
|
|
|
AC_DEFINE(BX_WITH_WX, 1)
|
2002-09-05 19:12:13 +04:00
|
|
|
WX_CFLAGS="\`$WX_CONFIG --cflags\`"
|
|
|
|
WX_CXXFLAGS="\`$WX_CONFIG --cxxflags\`"
|
|
|
|
GUI_LINK_OPTS_WX="\`$WX_CONFIG --libs\`"
|
2002-04-18 04:22:20 +04:00
|
|
|
# if gtk-config exists, then add it to the cflags.
|
|
|
|
gtkconf=`gtk-config --cflags`
|
|
|
|
if test $? = 0; then
|
|
|
|
# gtk-config was found and returned 0, so it must return valid output
|
2002-09-05 19:12:13 +04:00
|
|
|
WX_CFLAGS="$WX_CFLAGS \`gtk-config --cflags\`"
|
|
|
|
WX_CXXFLAGS="$WX_CXXFLAGS \`gtk-config --cflags\`"
|
2002-04-18 04:22:20 +04:00
|
|
|
fi
|
- add -lwinmm to the link lines anytime you use --enable-sb16=win. Now
instead of winmm being a part of GUI_LINK_OPTS_WIN32 only, it is
placed in @DEVICE_LINE_OPTS@ so that it will be used for sdl, rfb, wx,
etc.
- solve compile problems when building bximage, niclist, and any other
console based program. The compile flags returned by wx-config and
sdl-config did strange things to these console programs, for example
redefining main to SDL_main. Because I wanted to use the
configure-generated CFLAGS to compile the programs, but I wanted to
avoid including GUI specific compile options, I split up the configure's
@CFLAGS@ variable into @CFLAGS@ and @GUI_CFLAGS@, and split
@CXXFLAGS@ into @CXXFLAGS@ and @GUI_CXXFLAGS@. All programs in the
Bochs binary will use both, but the console programs will just use
@CFLAGS@ or @CXXFLAGS@.
- gui/Makefile.in, I no longer use the gui specific CFLAGS variables,
SDL_CFLAGS and WX_CXXFLAGS. These values are included in CFLAGS and
CXXFLAGS now.
- modified: configure.in, configure, all Makefile.in's
2002-10-02 03:37:50 +04:00
|
|
|
# GUI_*FLAGS are added to the compilation of every bochs file, not just
|
|
|
|
# the files in gui/*.cc.
|
|
|
|
GUI_CFLAGS="$CFLAGS $WX_CFLAGS"
|
|
|
|
GUI_CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS"
|
2002-04-18 04:22:20 +04:00
|
|
|
# wxwindows is the only one without control.o in GUI_OBJS
|
|
|
|
GUI_OBJS='$(GUI_OBJS_WX)'
|
|
|
|
GUI_LINK_OPTS='$(GUI_LINK_OPTS_WX)'
|
2002-09-05 23:59:20 +04:00
|
|
|
# using debugger with readline is failing due to thread/signal handler
|
|
|
|
# problems.
|
|
|
|
if test "$use_readline" = 1 -a "$bx_debugger" = 1; then
|
|
|
|
echo ERROR: You have selected wxWindows, the debugger, and the readline
|
|
|
|
echo library. This combination is known to trigger problems with SIGINT
|
|
|
|
echo handling. Please run configure again with --disable-readline to
|
|
|
|
echo correct this.
|
|
|
|
exit 1
|
|
|
|
fi
|
2002-10-02 04:09:49 +04:00
|
|
|
case $target in
|
|
|
|
*-pc-windows* | *-cygwin* | *-mingw32*)
|
|
|
|
EXTRA_BX_OBJS="$EXTRA_BX_OBJS wxbochs_resources.o"
|
2002-10-02 04:53:20 +04:00
|
|
|
GUI_LINK_OPTS_WX="$GUI_LINK_OPTS_WX --subsystem,windows -mwindows"
|
2002-10-02 04:09:49 +04:00
|
|
|
;;
|
|
|
|
esac
|
2001-04-10 05:04:59 +04:00
|
|
|
else
|
2001-05-24 05:07:09 +04:00
|
|
|
AC_MSG_RESULT(none)
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_DEFINE(BX_WITH_NOGUI, 1)
|
2002-04-18 04:22:20 +04:00
|
|
|
GUI_OBJS='$(GUI_OBJS_NOGUI) control.o'
|
2001-04-10 05:04:59 +04:00
|
|
|
GUI_LINK_OPTS='$(GUI_LINK_OPTS_NOGUI)'
|
|
|
|
fi
|
2001-05-08 23:07:26 +04:00
|
|
|
|
- add -lwinmm to the link lines anytime you use --enable-sb16=win. Now
instead of winmm being a part of GUI_LINK_OPTS_WIN32 only, it is
placed in @DEVICE_LINE_OPTS@ so that it will be used for sdl, rfb, wx,
etc.
- solve compile problems when building bximage, niclist, and any other
console based program. The compile flags returned by wx-config and
sdl-config did strange things to these console programs, for example
redefining main to SDL_main. Because I wanted to use the
configure-generated CFLAGS to compile the programs, but I wanted to
avoid including GUI specific compile options, I split up the configure's
@CFLAGS@ variable into @CFLAGS@ and @GUI_CFLAGS@, and split
@CXXFLAGS@ into @CXXFLAGS@ and @GUI_CXXFLAGS@. All programs in the
Bochs binary will use both, but the console programs will just use
@CFLAGS@ or @CXXFLAGS@.
- gui/Makefile.in, I no longer use the gui specific CFLAGS variables,
SDL_CFLAGS and WX_CXXFLAGS. These values are included in CFLAGS and
CXXFLAGS now.
- modified: configure.in, configure, all Makefile.in's
2002-10-02 03:37:50 +04:00
|
|
|
AC_SUBST(GUI_CFLAGS)
|
|
|
|
AC_SUBST(GUI_CXXFLAGS)
|
2002-10-03 06:26:32 +04:00
|
|
|
AC_SUBST(WX_CONFIG)
|
2002-09-05 19:12:13 +04:00
|
|
|
AC_SUBST(WX_CFLAGS)
|
|
|
|
AC_SUBST(WX_CXXFLAGS)
|
|
|
|
|
- commit patch.check-platform. For full details, pull up the patch itself
and look at the description at the top. Here's an intro.
This patch makes significant changes to the configure script. It adds the
lines AC_CANONICAL_HOST and AC_CANONICAL_TARGET which detect the OS and
processor type. The configure script, knowing the OS and processor type, can
then make intelligent decisions about which CFLAGS are needed and what is the
default GUI for that platform. One of the goals of this patch is to make it
so that on all supported platforms, "configure;make" will compile cleanly.
Configure detects the target platform, but it can be overridden by using
--target=___. This is important when using one platform to generate
Makefiles and header files for another platform. See config.guess script for
the exact details of platform naming.
The defaults that are currently implemented in the modified configure script
include:
If platform is windows* or winnt*, use win32 gui.
If platform is cygwin*, use win32 gui and compile with
"-mno-cygwin -DWIN32".
If platform is macosx* or darwin*, use carbon gui and compile
with "-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants
-Wno-unknown-pragmas -Dmacintosh"
If platform is macos, use macos gui.
If platform is beos, use beos gui.
If platform is amigaos, use amigaos gui.
Otherwise, use X windows gui.
2002-03-07 19:00:39 +03:00
|
|
|
# modify settings based on target platform
|
|
|
|
case "$target" in
|
|
|
|
*-macos*)
|
|
|
|
AC_DEFINE(BX_HAVE_STRDUP, 0)
|
|
|
|
;;
|
|
|
|
*-pc-windows*)
|
|
|
|
INSTALL_TARGET='install_win32'
|
|
|
|
CC="cl"
|
|
|
|
CXX="$CC"
|
|
|
|
#C_OPT="/Zi" # for debugging
|
|
|
|
C_OPT="/O2" # optimize for speed
|
|
|
|
CFLAGS="/nologo /G6 /MT /W3 /GX /DNDEBUG /DWIN32 /D_WINDOWS $C_OPT"
|
|
|
|
CXXFLAGS="$CFLAGS"
|
|
|
|
DASH="/"
|
|
|
|
SLASH="\\"
|
|
|
|
CXXFP="/Tp"
|
|
|
|
CFP="/Tc"
|
|
|
|
OFP="/Fo"
|
|
|
|
MAKELIB="lib.exe /nologo /subsystem:console /machine:I386 /verbose /out:\$@"
|
|
|
|
RMCOMMAND="-del"
|
|
|
|
RANLIB="echo"
|
|
|
|
#L_OPT="/debug" # for debugging
|
|
|
|
L_OPT="" # no debug info
|
|
|
|
LINK="link $L_OPT /nologo /subsystem:console /incremental:no /machine:I386 /out:\$@ BINMODE.OBJ"
|
- add -lwinmm to the link lines anytime you use --enable-sb16=win. Now
instead of winmm being a part of GUI_LINK_OPTS_WIN32 only, it is
placed in @DEVICE_LINE_OPTS@ so that it will be used for sdl, rfb, wx,
etc.
- solve compile problems when building bximage, niclist, and any other
console based program. The compile flags returned by wx-config and
sdl-config did strange things to these console programs, for example
redefining main to SDL_main. Because I wanted to use the
configure-generated CFLAGS to compile the programs, but I wanted to
avoid including GUI specific compile options, I split up the configure's
@CFLAGS@ variable into @CFLAGS@ and @GUI_CFLAGS@, and split
@CXXFLAGS@ into @CXXFLAGS@ and @GUI_CXXFLAGS@. All programs in the
Bochs binary will use both, but the console programs will just use
@CFLAGS@ or @CXXFLAGS@.
- gui/Makefile.in, I no longer use the gui specific CFLAGS variables,
SDL_CFLAGS and WX_CXXFLAGS. These values are included in CFLAGS and
CXXFLAGS now.
- modified: configure.in, configure, all Makefile.in's
2002-10-02 03:37:50 +04:00
|
|
|
LINK_CONSOLE=$LINK
|
- commit patch.check-platform. For full details, pull up the patch itself
and look at the description at the top. Here's an intro.
This patch makes significant changes to the configure script. It adds the
lines AC_CANONICAL_HOST and AC_CANONICAL_TARGET which detect the OS and
processor type. The configure script, knowing the OS and processor type, can
then make intelligent decisions about which CFLAGS are needed and what is the
default GUI for that platform. One of the goals of this patch is to make it
so that on all supported platforms, "configure;make" will compile cleanly.
Configure detects the target platform, but it can be overridden by using
--target=___. This is important when using one platform to generate
Makefiles and header files for another platform. See config.guess script for
the exact details of platform naming.
The defaults that are currently implemented in the modified configure script
include:
If platform is windows* or winnt*, use win32 gui.
If platform is cygwin*, use win32 gui and compile with
"-mno-cygwin -DWIN32".
If platform is macosx* or darwin*, use carbon gui and compile
with "-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants
-Wno-unknown-pragmas -Dmacintosh"
If platform is macos, use macos gui.
If platform is beos, use beos gui.
If platform is amigaos, use amigaos gui.
Otherwise, use X windows gui.
2002-03-07 19:00:39 +03:00
|
|
|
EXE=".exe"
|
|
|
|
PRIMARY_TARGET="bochs.exe"
|
|
|
|
# also compile niclist if networking is on
|
|
|
|
if test "$networking" = yes; then
|
|
|
|
PRIMARY_TARGET="$PRIMARY_TARGET niclist.exe"
|
|
|
|
fi
|
|
|
|
COMMAND_SEPARATOR=""
|
|
|
|
CD_UP_ONE="cd .."
|
|
|
|
CD_UP_TWO="cd ..\.."
|
2002-09-22 05:56:18 +04:00
|
|
|
have_gettimeofday=0 # even though it may exist in build environment
|
- commit patch.check-platform. For full details, pull up the patch itself
and look at the description at the top. Here's an intro.
This patch makes significant changes to the configure script. It adds the
lines AC_CANONICAL_HOST and AC_CANONICAL_TARGET which detect the OS and
processor type. The configure script, knowing the OS and processor type, can
then make intelligent decisions about which CFLAGS are needed and what is the
default GUI for that platform. One of the goals of this patch is to make it
so that on all supported platforms, "configure;make" will compile cleanly.
Configure detects the target platform, but it can be overridden by using
--target=___. This is important when using one platform to generate
Makefiles and header files for another platform. See config.guess script for
the exact details of platform naming.
The defaults that are currently implemented in the modified configure script
include:
If platform is windows* or winnt*, use win32 gui.
If platform is cygwin*, use win32 gui and compile with
"-mno-cygwin -DWIN32".
If platform is macosx* or darwin*, use carbon gui and compile
with "-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants
-Wno-unknown-pragmas -Dmacintosh"
If platform is macos, use macos gui.
If platform is beos, use beos gui.
If platform is amigaos, use amigaos gui.
Otherwise, use X windows gui.
2002-03-07 19:00:39 +03:00
|
|
|
AC_DEFINE(BX_64BIT_CONSTANTS_USE_LL, 0)
|
|
|
|
AC_DEFINE(inline, __inline)
|
|
|
|
AC_DEFINE(BX_NO_EMPTY_STRUCTS, 1)
|
|
|
|
AC_DEFINE(BX_NO_ATTRIBUTES, 1)
|
|
|
|
AC_DEFINE(BX_HAVE_HASH_MAP, 0)
|
|
|
|
AC_DEFINE(BX_HAVE_STRTOULL, 0)
|
|
|
|
AC_DEFINE(BX_HAVE_STRTOUQ, 0)
|
|
|
|
AC_DEFINE(HAVE_LIBREADLINE, 0)
|
2002-09-22 05:56:18 +04:00
|
|
|
AC_DEFINE(BX_HAVE_GETTIMEOFDAY, 0)
|
- commit patch.check-platform. For full details, pull up the patch itself
and look at the description at the top. Here's an intro.
This patch makes significant changes to the configure script. It adds the
lines AC_CANONICAL_HOST and AC_CANONICAL_TARGET which detect the OS and
processor type. The configure script, knowing the OS and processor type, can
then make intelligent decisions about which CFLAGS are needed and what is the
default GUI for that platform. One of the goals of this patch is to make it
so that on all supported platforms, "configure;make" will compile cleanly.
Configure detects the target platform, but it can be overridden by using
--target=___. This is important when using one platform to generate
Makefiles and header files for another platform. See config.guess script for
the exact details of platform naming.
The defaults that are currently implemented in the modified configure script
include:
If platform is windows* or winnt*, use win32 gui.
If platform is cygwin*, use win32 gui and compile with
"-mno-cygwin -DWIN32".
If platform is macosx* or darwin*, use carbon gui and compile
with "-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants
-Wno-unknown-pragmas -Dmacintosh"
If platform is macos, use macos gui.
If platform is beos, use beos gui.
If platform is amigaos, use amigaos gui.
Otherwise, use X windows gui.
2002-03-07 19:00:39 +03:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2002-09-26 22:23:34 +04:00
|
|
|
if test "$use_curses" = yes -a "$cross_configure" = 0; then
|
2001-05-08 23:07:26 +04:00
|
|
|
AC_CHECK_LIB(curses, mvaddch, GUI_LINK_OPTS_TERM='-lcurses')
|
|
|
|
AC_CHECK_LIB(ncurses, mvaddch, GUI_LINK_OPTS_TERM='-lncurses')
|
|
|
|
AC_CHECK_LIB(termlib, mvaddch, GUI_LINK_OPTS_TERM='-ltermlib')
|
|
|
|
if test "$GUI_LINK_OPTS_TERM" = ""; then
|
|
|
|
echo Curses library not found: tried curses, ncurses, and termlib.
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2002-09-26 06:36:04 +04:00
|
|
|
if test "$with_term" = yes; then
|
|
|
|
old_LIBS="$LIBS"
|
|
|
|
LIBS="$LIBS $GUI_LINK_OPTS_TERM"
|
|
|
|
AC_CHECK_FUNCS(color_set, AC_DEFINE(BX_HAVE_COLOR_SET, 1))
|
|
|
|
LIBS="$old_LIBS"
|
|
|
|
fi
|
|
|
|
|
2002-09-26 05:45:10 +04:00
|
|
|
if test "$with_rfb" = yes -a "$cross_configure" = 0; then
|
|
|
|
# we need the socket function. if cross configuring, don't bother.
|
|
|
|
AC_CHECK_FUNCS(socket, have_socket=yes)
|
|
|
|
if test "$have_socket" != yes; then
|
|
|
|
AC_CHECK_LIB(socket, socket,
|
2002-09-26 06:15:20 +04:00
|
|
|
[ RFB_LIBS="$RFB_LIBS -lsocket" ],
|
2002-09-26 05:45:10 +04:00
|
|
|
[
|
|
|
|
echo 'ERROR: socket function required for RFB compile'
|
|
|
|
exit 1
|
|
|
|
])
|
|
|
|
fi
|
|
|
|
fi
|
2002-04-18 04:22:20 +04:00
|
|
|
|
|
|
|
# The ACX_PTHREAD function was written by
|
|
|
|
# Steven G. Johnson <stevenj@alum.mit.edu> and
|
|
|
|
# Alejandro Forero Cuervo <bachue@bachue.com>
|
|
|
|
# I found it in the ac-archive project on Source Forge.
|
|
|
|
|
|
|
|
AC_DEFUN([ACX_PTHREAD], [
|
|
|
|
AC_REQUIRE([AC_CANONICAL_HOST])
|
|
|
|
acx_pthread_ok=no
|
|
|
|
|
|
|
|
# First, check if the POSIX threads header, pthread.h, is available.
|
|
|
|
# If it isn't, don't bother looking for the threads libraries.
|
|
|
|
AC_CHECK_HEADER(pthread.h, , acx_pthread_ok=noheader)
|
|
|
|
|
|
|
|
# We must check for the threads library under a number of different
|
|
|
|
# names; the ordering is very important because some systems
|
|
|
|
# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
|
|
|
|
# libraries is broken (non-POSIX).
|
|
|
|
|
|
|
|
# First of all, check if the user has set any of the PTHREAD_LIBS,
|
|
|
|
# etcetera environment variables, and if threads linking works using
|
|
|
|
# them:
|
|
|
|
if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
|
|
|
|
save_CFLAGS="$CFLAGS"
|
|
|
|
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
|
2002-09-16 04:06:16 +04:00
|
|
|
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
|
2002-04-18 04:22:20 +04:00
|
|
|
save_LIBS="$LIBS"
|
|
|
|
LIBS="$PTHREAD_LIBS $LIBS"
|
|
|
|
AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
|
|
|
|
AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
|
|
|
|
AC_MSG_RESULT($acx_pthread_ok)
|
|
|
|
if test x"$acx_pthread_ok" = xno; then
|
|
|
|
PTHREAD_LIBS=""
|
|
|
|
PTHREAD_CFLAGS=""
|
|
|
|
fi
|
|
|
|
LIBS="$save_LIBS"
|
|
|
|
CFLAGS="$save_CFLAGS"
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Create a list of thread flags to try. Items starting with a "-" are
|
|
|
|
# C compiler flags, and other items are library names, except for "none"
|
|
|
|
# which indicates that we try without any flags at all.
|
|
|
|
|
|
|
|
acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt"
|
|
|
|
|
|
|
|
# The ordering *is* (sometimes) important. Some notes on the
|
|
|
|
# individual items follow:
|
|
|
|
|
|
|
|
# pthreads: AIX (must check this before -lpthread)
|
|
|
|
# none: in case threads are in libc; should be tried before -Kthread and
|
|
|
|
# other compiler flags to prevent continual compiler warnings
|
|
|
|
# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
|
|
|
|
# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
|
|
|
|
# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
|
|
|
|
# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
|
|
|
|
# -pthreads: Solaris/gcc
|
|
|
|
# -mthreads: Mingw32/gcc, Lynx/gcc
|
|
|
|
# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
|
|
|
|
# doesn't hurt to check since this sometimes defines pthreads too;
|
|
|
|
# also defines -D_REENTRANT)
|
|
|
|
# pthread: Linux, etcetera
|
|
|
|
# --thread-safe: KAI C++
|
|
|
|
|
|
|
|
case "${host_cpu}-${host_os}" in
|
|
|
|
*solaris*)
|
|
|
|
|
|
|
|
# On Solaris (at least, for some versions), libc contains stubbed
|
|
|
|
# (non-functional) versions of the pthreads routines, so link-based
|
|
|
|
# tests will erroneously succeed. (We need to link with -pthread or
|
|
|
|
# -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
|
|
|
|
# a function called by this macro, so we could check for that, but
|
|
|
|
# who knows whether they'll stub that too in a future libc.) So,
|
|
|
|
# we'll just look for -pthreads and -lpthread first:
|
|
|
|
|
|
|
|
acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
if test x"$acx_pthread_ok" = xno; then
|
|
|
|
for flag in $acx_pthread_flags; do
|
|
|
|
|
|
|
|
case $flag in
|
|
|
|
none)
|
|
|
|
AC_MSG_CHECKING([whether pthreads work without any flags])
|
|
|
|
;;
|
|
|
|
|
|
|
|
-*)
|
|
|
|
AC_MSG_CHECKING([whether pthreads work with $flag])
|
|
|
|
PTHREAD_CFLAGS="$flag"
|
|
|
|
;;
|
|
|
|
|
|
|
|
*)
|
|
|
|
AC_MSG_CHECKING([for the pthreads library -l$flag])
|
|
|
|
PTHREAD_LIBS="-l$flag"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
save_LIBS="$LIBS"
|
|
|
|
save_CFLAGS="$CFLAGS"
|
|
|
|
LIBS="$PTHREAD_LIBS $LIBS"
|
|
|
|
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
|
|
|
|
|
|
|
|
# Check for various functions. We must include pthread.h,
|
|
|
|
# since some functions may be macros. (On the Sequent, we
|
|
|
|
# need a special flag -Kthread to make this header compile.)
|
|
|
|
# We check for pthread_join because it is in -lpthread on IRIX
|
|
|
|
# while pthread_create is in libc. We check for pthread_attr_init
|
|
|
|
# due to DEC craziness with -lpthreads. We check for
|
|
|
|
# pthread_cleanup_push because it is one of the few pthread
|
|
|
|
# functions on Solaris that doesn't have a non-functional libc stub.
|
|
|
|
# We try pthread_create on general principles.
|
|
|
|
AC_TRY_LINK([#include <pthread.h>],
|
|
|
|
[pthread_t th; pthread_join(th, 0);
|
|
|
|
pthread_attr_init(0); pthread_cleanup_push(0, 0);
|
|
|
|
pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
|
|
|
|
[acx_pthread_ok=yes])
|
|
|
|
|
|
|
|
LIBS="$save_LIBS"
|
|
|
|
CFLAGS="$save_CFLAGS"
|
|
|
|
|
|
|
|
AC_MSG_RESULT($acx_pthread_ok)
|
|
|
|
if test "x$acx_pthread_ok" = xyes; then
|
|
|
|
break;
|
|
|
|
fi
|
|
|
|
|
|
|
|
PTHREAD_LIBS=""
|
|
|
|
PTHREAD_CFLAGS=""
|
|
|
|
done
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Various other checks:
|
|
|
|
if test "x$acx_pthread_ok" = xyes; then
|
|
|
|
save_LIBS="$LIBS"
|
|
|
|
LIBS="$PTHREAD_LIBS $LIBS"
|
|
|
|
save_CFLAGS="$CFLAGS"
|
|
|
|
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
|
|
|
|
|
|
|
|
# Detect AIX lossage: threads are created detached by default
|
|
|
|
# and the JOINABLE attribute has a nonstandard name (UNDETACHED).
|
|
|
|
AC_MSG_CHECKING([for joinable pthread attribute])
|
|
|
|
AC_TRY_LINK([#include <pthread.h>],
|
|
|
|
[int attr=PTHREAD_CREATE_JOINABLE;],
|
|
|
|
ok=PTHREAD_CREATE_JOINABLE, ok=unknown)
|
|
|
|
if test x"$ok" = xunknown; then
|
|
|
|
AC_TRY_LINK([#include <pthread.h>],
|
|
|
|
[int attr=PTHREAD_CREATE_UNDETACHED;],
|
|
|
|
ok=PTHREAD_CREATE_UNDETACHED, ok=unknown)
|
|
|
|
fi
|
|
|
|
if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then
|
|
|
|
AC_DEFINE(PTHREAD_CREATE_JOINABLE, $ok,
|
|
|
|
[Define to the necessary symbol if this constant
|
|
|
|
uses a non-standard name on your system.])
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT(${ok})
|
|
|
|
if test x"$ok" = xunknown; then
|
|
|
|
AC_MSG_WARN([we do not know how to create joinable pthreads])
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([if more special flags are required for pthreads])
|
|
|
|
flag=no
|
|
|
|
case "${host_cpu}-${host_os}" in
|
|
|
|
*-aix* | *-freebsd*) flag="-D_THREAD_SAFE";;
|
|
|
|
*solaris* | alpha*-osf*) flag="-D_REENTRANT";;
|
|
|
|
esac
|
|
|
|
AC_MSG_RESULT(${flag})
|
|
|
|
if test "x$flag" != xno; then
|
|
|
|
PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
|
|
|
|
fi
|
|
|
|
|
|
|
|
LIBS="$save_LIBS"
|
|
|
|
CFLAGS="$save_CFLAGS"
|
|
|
|
|
|
|
|
# More AIX lossage: must compile with cc_r
|
|
|
|
AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC})
|
|
|
|
else
|
|
|
|
PTHREAD_CC="$CC"
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_SUBST(PTHREAD_LIBS)
|
|
|
|
AC_SUBST(PTHREAD_CFLAGS)
|
|
|
|
AC_SUBST(PTHREAD_CC)
|
|
|
|
|
|
|
|
# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
|
|
|
|
if test x"$acx_pthread_ok" = xyes; then
|
|
|
|
ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
|
|
|
|
:
|
|
|
|
else
|
|
|
|
acx_pthread_ok=no
|
|
|
|
$2
|
|
|
|
fi
|
|
|
|
|
|
|
|
])dnl ACX_PTHREAD
|
|
|
|
|
|
|
|
pthread_ok=no
|
|
|
|
ACX_PTHREAD([
|
|
|
|
pthread_ok=yes
|
|
|
|
#echo Using PTHREAD_LIBS=$PTHREAD_LIBS
|
|
|
|
#echo Using PTHREAD_CFLAGS=$PTHREAD_CFLAGS
|
|
|
|
#echo Using PTHREAD_CC=$PTHREAD_CC
|
|
|
|
])
|
|
|
|
|
|
|
|
|
2002-09-26 22:23:34 +04:00
|
|
|
# since RFB (usually) needs pthread library, check that it was found.
|
|
|
|
# But on win32 platforms, the pthread library is not needed.
|
|
|
|
if test "$with_rfb" = yes -a "$cross_configure" = 0; then
|
2002-04-18 04:22:20 +04:00
|
|
|
if test "$pthread_ok" = yes; then
|
2002-09-26 06:19:14 +04:00
|
|
|
RFB_LIBS="$RFB_LIBS $PTHREAD_LIBS"
|
2002-04-18 04:22:20 +04:00
|
|
|
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
|
2002-09-16 04:06:16 +04:00
|
|
|
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
|
2002-04-18 04:22:20 +04:00
|
|
|
CC="$PTHREAD_CC"
|
|
|
|
else
|
2002-09-26 22:23:34 +04:00
|
|
|
case "$target" in
|
|
|
|
*-pc-windows* | *-pc-winnt* | *-cygwin* | *-mingw*)
|
|
|
|
# pthread not needed for win32 platform
|
|
|
|
;;
|
|
|
|
*)
|
2002-04-18 04:22:20 +04:00
|
|
|
echo ERROR: --with-rfb requires the pthread library, which could not be found.; exit 1
|
2002-09-26 22:23:34 +04:00
|
|
|
esac
|
2002-04-18 04:22:20 +04:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2001-12-05 19:46:00 +03:00
|
|
|
# Create some subdirectories for when you run configure from some other
|
|
|
|
# directory.
|
|
|
|
if test ! -d instrument; then mkdir instrument; fi
|
|
|
|
if test ! -d build; then mkdir build; fi
|
|
|
|
if test ! -d build/linux; then mkdir build/linux; fi
|
|
|
|
|
2001-10-05 10:06:21 +04:00
|
|
|
AC_SUBST(INSTALL_TARGET)
|
|
|
|
AC_SUBST(INSTALL_LIST_FOR_PLATFORM)
|
2001-06-02 07:07:28 +04:00
|
|
|
AC_SUBST(RFB_LIBS)
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_SUBST(GUI_OBJS)
|
- add -lwinmm to the link lines anytime you use --enable-sb16=win. Now
instead of winmm being a part of GUI_LINK_OPTS_WIN32 only, it is
placed in @DEVICE_LINE_OPTS@ so that it will be used for sdl, rfb, wx,
etc.
- solve compile problems when building bximage, niclist, and any other
console based program. The compile flags returned by wx-config and
sdl-config did strange things to these console programs, for example
redefining main to SDL_main. Because I wanted to use the
configure-generated CFLAGS to compile the programs, but I wanted to
avoid including GUI specific compile options, I split up the configure's
@CFLAGS@ variable into @CFLAGS@ and @GUI_CFLAGS@, and split
@CXXFLAGS@ into @CXXFLAGS@ and @GUI_CXXFLAGS@. All programs in the
Bochs binary will use both, but the console programs will just use
@CFLAGS@ or @CXXFLAGS@.
- gui/Makefile.in, I no longer use the gui specific CFLAGS variables,
SDL_CFLAGS and WX_CXXFLAGS. These values are included in CFLAGS and
CXXFLAGS now.
- modified: configure.in, configure, all Makefile.in's
2002-10-02 03:37:50 +04:00
|
|
|
AC_SUBST(DEVICE_LINK_OPTS)
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_SUBST(GUI_LINK_OPTS)
|
2001-05-08 23:07:26 +04:00
|
|
|
AC_SUBST(GUI_LINK_OPTS_TERM)
|
2002-09-05 19:12:13 +04:00
|
|
|
AC_SUBST(GUI_LINK_OPTS_WX)
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_SUBST(DASH)
|
|
|
|
AC_SUBST(SLASH)
|
|
|
|
AC_SUBST(CXXFP)
|
|
|
|
AC_SUBST(CFP)
|
|
|
|
AC_SUBST(OFP)
|
|
|
|
AC_SUBST(MAKELIB)
|
|
|
|
AC_SUBST(RMCOMMAND)
|
|
|
|
AC_SUBST(LINK)
|
- add -lwinmm to the link lines anytime you use --enable-sb16=win. Now
instead of winmm being a part of GUI_LINK_OPTS_WIN32 only, it is
placed in @DEVICE_LINE_OPTS@ so that it will be used for sdl, rfb, wx,
etc.
- solve compile problems when building bximage, niclist, and any other
console based program. The compile flags returned by wx-config and
sdl-config did strange things to these console programs, for example
redefining main to SDL_main. Because I wanted to use the
configure-generated CFLAGS to compile the programs, but I wanted to
avoid including GUI specific compile options, I split up the configure's
@CFLAGS@ variable into @CFLAGS@ and @GUI_CFLAGS@, and split
@CXXFLAGS@ into @CXXFLAGS@ and @GUI_CXXFLAGS@. All programs in the
Bochs binary will use both, but the console programs will just use
@CFLAGS@ or @CXXFLAGS@.
- gui/Makefile.in, I no longer use the gui specific CFLAGS variables,
SDL_CFLAGS and WX_CXXFLAGS. These values are included in CFLAGS and
CXXFLAGS now.
- modified: configure.in, configure, all Makefile.in's
2002-10-02 03:37:50 +04:00
|
|
|
AC_SUBST(LINK_CONSOLE)
|
2001-04-10 05:04:59 +04:00
|
|
|
AC_SUBST(EXE)
|
|
|
|
AC_SUBST(PRIMARY_TARGET)
|
|
|
|
AC_SUBST(COMMAND_SEPARATOR)
|
|
|
|
AC_SUBST(CD_UP_ONE)
|
|
|
|
AC_SUBST(CD_UP_TWO)
|
2001-11-10 06:48:22 +03:00
|
|
|
AC_SUBST(VERSION)
|
|
|
|
AC_SUBST(VER_STRING)
|
|
|
|
AC_SUBST(REL_STRING)
|
2001-12-08 00:56:15 +03:00
|
|
|
AC_SUBST(EXTRA_LINK_OPTS)
|
2001-04-10 05:04:59 +04:00
|
|
|
|
2001-05-23 12:16:07 +04:00
|
|
|
AC_PATH_PROG(GZIP, gzip)
|
|
|
|
AC_PATH_PROG(TAR, tar)
|
2001-04-10 05:04:59 +04:00
|
|
|
|
|
|
|
AC_OUTPUT(Makefile iodev/Makefile debug/Makefile bios/Makefile \
|
2002-09-17 00:39:32 +04:00
|
|
|
cpu/Makefile memory/Makefile gui/Makefile \
|
2002-09-12 11:16:37 +04:00
|
|
|
disasm/Makefile ${INSTRUMENT_DIR}/Makefile misc/Makefile \
|
2002-09-20 19:34:51 +04:00
|
|
|
fpu/Makefile install-x11-fonts build/linux/bochs-dlx \
|
2001-11-10 06:48:22 +03:00
|
|
|
build/linux/bochs-docs bxversion.h \
|
2002-09-23 07:46:47 +04:00
|
|
|
build/linux/DOC-linux.html \
|
|
|
|
build/macosx/Info.plist)
|