Add configure option to disable VOSF; add it to python build script

This commit is contained in:
Andrew Tonner 2017-01-19 21:38:21 -08:00
parent 1229eb0ea9
commit 69a3c31fff
2 changed files with 16 additions and 4 deletions

View File

@ -62,6 +62,10 @@ def parse_args():
parser.add_argument("--build-jit",
default=False,
action="store_true")
parser.add_argument("--debug-build",
default=False,
action="store_true",
help="disable things in the build that are a problem for debugging")
return parser.parse_args()
@ -125,7 +129,7 @@ def log(msg):
sys.stdout.flush()
def install(make_args, show_build_environment, use_precompiled_dyngen, build_jit, install_to_dir=None):
def install(make_args, show_build_environment, use_precompiled_dyngen, build_jit, debug_build, install_to_dir=None):
root_dir = os.path.abspath(os.path.join(script_path, "..", "..", ".."))
dep_tracker = BuildDepTracker(root_dir)
@ -280,6 +284,8 @@ def install(make_args, show_build_environment, use_precompiled_dyngen, build_jit
sheepshaver_configure_options = []
if not build_jit:
sheepshaver_configure_options.append("--enable-jit=no")
if debug_build:
sheepshaver_configure_options.append("--enable-vosf=no")
run([msys_bash, "./configure", "--with-gtk=no"] + sheepshaver_configure_options,
cwd=script_path, env=configure_macemu_env)
@ -619,7 +625,7 @@ def main():
log("Will install to %s" % options.install_to_dir)
install(make_args, options.show_build_environment, options.use_precompiled_dyngen, options.build_jit,
install_to_dir=options.install_to_dir)
options.debug_build, install_to_dir=options.install_to_dir)
if __name__ == "__main__":

View File

@ -14,6 +14,7 @@ AC_CANONICAL_TARGET
dnl Options.
AC_ARG_ENABLE(jit, [ --enable-jit enable JIT compiler [default=yes]], [WANT_JIT=$enableval], [WANT_JIT=yes])
AC_ARG_WITH(gtk, [ --with-gtk use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
AC_ARG_ENABLE(vosf, [ --enable-vosf enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
dnl Checks for programs.
AC_PROG_CC
@ -153,8 +154,12 @@ AC_CACHE_CHECK([whether we can skip instruction in SIGSEGV handler],
AC_TRANSLATE_DEFINE(HAVE_SIGSEGV_SKIP_INSTRUCTION, "$ac_cv_have_skip_instruction",
[Define if we can ignore the fault (instruction skipping in SIGSEGV handler).])
dnl We really want VOSF (Video on SEGV Signals) screen updates acceleration
AC_DEFINE(ENABLE_VOSF, 1, [Define if using video enabled on SEGV signals.])
dnl Enable VOSF screen updates with this feature is requested
if [[ "x$WANT_VOSF" = "xyes" ]]; then
AC_DEFINE(ENABLE_VOSF, 1, [Define if using video enabled on SEGV signals.])
else
WANT_VOSF=no
fi
dnl Check for GCC 2.7 or higher.
HAVE_GCC27=no
@ -262,5 +267,6 @@ echo SheepShaver configuration summary:
echo
echo Enable JIT compiler .............. : $WANT_JIT
echo GTK user interface ............... : $WANT_GTK
echo Enable VOSF ...................... : $WANT_VOSF
echo
echo "Configuration done. Now type \"make\"."