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

Fixed GTK version detection.

Browse Source
This commit is contained in:
Volker Ruppert 2019-11-11 20:47:13 +00:00
parent 9a27303afa
commit 207c0a55b1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 13588 2019-11-02 19:30:39Z vruppert .
# From configure.in Id: configure.in 13593 2019-11-11 19:40:09Z vruppert .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69.
#
@ -24906,7 +24906,7 @@ if test "$needs_gtk2" = 1; then
# pkg-config is required to set TOOLKIT_CXXFLAGS and LIBS
if test "$PKGCONFIG" != not_found; then
# if wxGTK is based on GTK 3.0, use it for gui debugger to avoid conflicts
if test "$wx_needs_gdk_version" = 3; then
if test "$with_wx" = yes -a "$wx_needs_gdk_version" = 3; then
pkg-config --exists gtk+-3.0
if test x$? = x0; then
TOOLKIT_CXXFLAGS="`pkg-config --cflags gtk+-3.0`"
@ -25161,7 +25161,7 @@ esac
ENH_DBG_OBJS=""
if test "$gui_debugger" = 1; then
if test "$bx_have_gtk_version" > 1; then
if test "$bx_have_gtk_version" -ge 2; then
ENH_DBG_OBJS="enh_dbg.o gtk_enh_dbg_osdep.o"
$as_echo "#define BX_DEBUGGER_GUI 1" >>confdefs.h

4
bochs/configure.in
View File

@ -2640,7 +2640,7 @@ if test "$needs_gtk2" = 1; then
# pkg-config is required to set TOOLKIT_CXXFLAGS and LIBS
if test "$PKGCONFIG" != not_found; then
# if wxGTK is based on GTK 3.0, use it for gui debugger to avoid conflicts
if test "$wx_needs_gdk_version" = 3; then
if test "$with_wx" = yes -a "$wx_needs_gdk_version" = 3; then
pkg-config --exists gtk+-3.0
if test x$? = x0; then
TOOLKIT_CXXFLAGS="`pkg-config --cflags gtk+-3.0`"
@ -2829,7 +2829,7 @@ AC_SUBST(CXXFLAGS_CONSOLE)
ENH_DBG_OBJS=""
if test "$gui_debugger" = 1; then
if test "$bx_have_gtk_version" > 1; then
if test "$bx_have_gtk_version" -ge 2; then
ENH_DBG_OBJS="enh_dbg.o gtk_enh_dbg_osdep.o"
AC_DEFINE(BX_DEBUGGER_GUI, 1)
elif test "$DEFAULT_GUI" = win32 -o "$with_win32" = yes; then