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

Compile enhanced gui debugger core only if enabled.

Browse Source
This commit is contained in:
Volker Ruppert 2014-08-31 17:08:58 +00:00
parent d30d9bc667
commit 34d4983cba
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bochs/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 12437 2014-07-25 08:35:06Z vruppert .
# From configure.in Id: configure.in 12442 2014-07-26 06:54:34Z vruppert .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69.
#
@ -24658,7 +24658,7 @@ if test "$with_wx" = yes; then
fi
;;
esac
# The enhanced X debugger depends on GTK2 (unused yet, but fixes link failure)
# The enhanced X debugger depends on GTK2
if test "$gui_debugger" = 1 -a "$DEFAULT_GUI" != win32; then
needs_gtk2=1
fi
@ -24899,9 +24899,9 @@ esac
ENH_DBG_OBJS=""
if test "$gui_debugger" = 1; then
if test "$needs_gtk2" = 1; then
ENH_DBG_OBJS="gtk_enh_dbg_osdep.o"
ENH_DBG_OBJS="enh_dbg.o gtk_enh_dbg_osdep.o"
elif test "$DEFAULT_GUI" = win32 -o "$with_win32" = yes; then
ENH_DBG_OBJS="win32_enh_dbg_osdep.o"
ENH_DBG_OBJS="enh_dbg.o win32_enh_dbg_osdep.o"
fi
fi

6
bochs/configure.in
View File

@ -2422,7 +2422,7 @@ if test "$with_wx" = yes; then
fi
;;
esac
# The enhanced X debugger depends on GTK2 (unused yet, but fixes link failure)
# The enhanced X debugger depends on GTK2
if test "$gui_debugger" = 1 -a "$DEFAULT_GUI" != win32; then
needs_gtk2=1
fi
@ -2596,9 +2596,9 @@ AC_SUBST(CXXFLAGS_CONSOLE)
ENH_DBG_OBJS=""
if test "$gui_debugger" = 1; then
if test "$needs_gtk2" = 1; then
ENH_DBG_OBJS="gtk_enh_dbg_osdep.o"
ENH_DBG_OBJS="enh_dbg.o gtk_enh_dbg_osdep.o"
elif test "$DEFAULT_GUI" = win32 -o "$with_win32" = yes; then
ENH_DBG_OBJS="win32_enh_dbg_osdep.o"
ENH_DBG_OBJS="enh_dbg.o win32_enh_dbg_osdep.o"
fi
fi
AC_SUBST(ENH_DBG_OBJS)

2
bochs/gui/Makefile.in
View File

@ -65,7 +65,7 @@ GUI_OBJS_VNCSRV = vncsrv.o
GUI_OBJS_AMIGAOS = amigaos.o
GUI_OBJS_WX = wx.o
GUI_OBJS_WX_SUPPORT = wxmain.o wxdialog.o
OBJS_THAT_CANNOT_BE_PLUGINS = keymap.o gui.o siminterface.o paramtree.o textconfig.o enh_dbg.o @ENH_DBG_OBJS@ @DIALOG_OBJS@
OBJS_THAT_CANNOT_BE_PLUGINS = keymap.o gui.o siminterface.o paramtree.o textconfig.o @ENH_DBG_OBJS@ @DIALOG_OBJS@
OBJS_THAT_CAN_BE_PLUGINS = @GUI_OBJS@
X_LIBS = @X_LIBS@