- fixed link failures with wxGTK
- without both plugins and X11 configured, -lX11 is required for XStringToKeysym - GTK debugger must be enabled, although is not used yet
This commit is contained in:
parent
3d7205116f
commit
ae74c5a1d0
12
bochs/configure
vendored
12
bochs/configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 11354 2012-08-21 16:21:55Z vruppert .
|
||||
# From configure.in Id: configure.in 11368 2012-08-26 07:17:43Z vruppert .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.68.
|
||||
#
|
||||
@ -24339,7 +24339,17 @@ if test "$with_wx" = yes; then
|
||||
EXTRA_BX_OBJS="$EXTRA_BX_OBJS wxbochs_resources.o"
|
||||
GUI_LINK_OPTS_WX="$GUI_LINK_OPTS_WX --subsystem,windows -mwindows"
|
||||
;;
|
||||
*)
|
||||
# This is required for XStringToKeysym
|
||||
if test "$with_x11" != yes -a "$bx_plugins" != 1; then
|
||||
GUI_LINK_OPTS="$GUI_LINK_OPTS -lX11"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
# The enhanced X debugger depends on GTK2 (unused yet, but fixes link failure)
|
||||
if test "$gui_debugger" = 1 -a "$DEFAULT_GUI" != win32; then
|
||||
needs_gtk2=1
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$with_nogui" = yes; then
|
||||
|
Loading…
Reference in New Issue
Block a user