mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed compiling with configure option combination '--enable-sb16 --disable-gameport'

Browse Source
This commit is contained in:
Volker Ruppert 2005-12-13 20:54:21 +00:00
parent 8627bc1596
commit e09bf42881
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bochs/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in,v 1.303 2005/11/29 19:27:42 vruppert Exp .
# From configure.in Id: configure.in,v 1.304 2005/12/13 20:53:37 vruppert Exp .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59.
#
@ -36402,10 +36402,6 @@ if test "${enable_sb16+set}" = set; then
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\_ACEOF
#define BX_SUPPORT_SB16 0
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define BX_SUPPORT_GAME 0
_ACEOF
else
@ -36519,10 +36515,6 @@ echo "${ECHO_T}dummy" >&6
_ACEOF
GAME_OBJS='gameport.o'
cat >>confdefs.h <<\_ACEOF
#define BX_SUPPORT_GAME 1
_ACEOF
gameport_present=1
fi
else
@ -36533,10 +36525,6 @@ echo "${ECHO_T}no" >&6
#define BX_SUPPORT_SB16 0
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define BX_SUPPORT_GAME 0
_ACEOF
fi;
@ -36552,12 +36540,12 @@ if test "${enable_gameport+set}" = set; then
if test "$enableval" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
if test "$gameport_present" = 0; then
GAME_OBJS='gameport.o'
cat >>confdefs.h <<\_ACEOF
#define BX_SUPPORT_GAME 1
_ACEOF
if test "$gameport_present" = 0; then
GAME_OBJS='gameport.o'
case $target in
*-cygwin* | *-mingw32*)
DEVICE_LINK_OPTS="$DEVICE_LINK_OPTS -lwinmm"
@ -36576,9 +36564,17 @@ _ACEOF
else
if test "$gameport_present" = 1; then
cat >>confdefs.h <<\_ACEOF
#define BX_SUPPORT_GAME 1
_ACEOF
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
cat >>confdefs.h <<\_ACEOF
#define BX_SUPPORT_GAME 0
_ACEOF
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi

9
bochs/configure.in
View File

@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
AC_INIT(bochs.h)
AC_REVISION([[$Id: configure.in,v 1.303 2005-11-29 19:27:42 vruppert Exp $]])
AC_REVISION([[$Id: configure.in,v 1.304 2005-12-13 20:53:37 vruppert Exp $]])
AC_CONFIG_HEADER(config.h)
AC_CONFIG_HEADER(ltdlconf.h)
@ -1784,7 +1784,6 @@ AC_ARG_ENABLE(sb16,
[if test "$enableval" = no; then
AC_MSG_RESULT(no)
AC_DEFINE(BX_SUPPORT_SB16, 0)
AC_DEFINE(BX_SUPPORT_GAME, 0)
else
case "$enableval" in
dummy)
@ -1857,14 +1856,12 @@ AC_ARG_ENABLE(sb16,
SB16_OBJS='sb16.o'
AC_DEFINE(BX_SUPPORT_SB16, 1)
GAME_OBJS='gameport.o'
AC_DEFINE(BX_SUPPORT_GAME, 1)
gameport_present=1
fi],
[
AC_MSG_RESULT(no)
AC_DEFINE(BX_SUPPORT_SB16, 0)
AC_DEFINE(BX_SUPPORT_GAME, 0)
]
)
AC_SUBST(SB16_OBJS)
@ -1876,9 +1873,9 @@ AC_ARG_ENABLE(gameport,
[ --enable-gameport enable standard PC gameport support],
[if test "$enableval" = yes; then
AC_MSG_RESULT(yes)
AC_DEFINE(BX_SUPPORT_GAME, 1)
if test "$gameport_present" = 0; then
GAME_OBJS='gameport.o'
AC_DEFINE(BX_SUPPORT_GAME, 1)
case $target in
*-cygwin* | *-mingw32*)
DEVICE_LINK_OPTS="$DEVICE_LINK_OPTS -lwinmm"
@ -1892,8 +1889,10 @@ AC_ARG_ENABLE(gameport,
fi],
[
if test "$gameport_present" = 1; then
AC_DEFINE(BX_SUPPORT_GAME, 1)
AC_MSG_RESULT(yes)
else
AC_DEFINE(BX_SUPPORT_GAME, 0)
AC_MSG_RESULT(no)
fi]
)