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

Fixed compilation after upgrading Linux host to openSUSE Leap 15.1.

Browse Source 
- configure script now supports wxGTK 3.1 (using GTK 3.0).
- added workaround for GDK keysym name change.
- define deprecated WXWIN symbol wxADJUST_MINSIZE for compatibility.
- compilation fix for Linux in the slirp code.
This commit is contained in:
Volker Ruppert 2019-11-02 19:30:39 +00:00
parent c098ab7de1
commit 9ab4b36ec1
5 changed files with 75 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bochs/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 13425 2018-01-05 17:43:51Z vruppert .
# From configure.in Id: configure.in 13559 2019-04-21 20:08:32Z vruppert .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69.
#
@ -24444,6 +24444,7 @@ ok_wx_version=0
wx_multi_lib=0
needs_gtk2=0
wx_needs_gdk2=0
wx_needs_gdk3=0
wx_msw_unicode=0
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets library version" >&5
$as_echo_n "checking for wxWidgets library version... " >&6; }
@ -24473,6 +24474,7 @@ if test x$WX_CONFIG != xnot_found; then
wx_multi_lib=1
case x$WX_BASENAME in
xwx_gtk2|xwx_gtk2u) wx_needs_gdk2=1 ;;
xwx_gtk3|xwx_gtk3u) wx_needs_gdk3=1 ;;
*) ;;
esac
;;
@ -24839,6 +24841,11 @@ if test "$with_wx" = yes; then
WX_CFLAGS="$WX_CFLAGS $GDK_CFLAGS"
WX_CXXFLAGS="$WX_CXXFLAGS $GDK_CFLAGS"
fi
if test "$wx_needs_gdk3" = 1; then
GDK_CFLAGS="`pkg-config --cflags gdk-3.0`"
WX_CFLAGS="$WX_CFLAGS $GDK_CFLAGS"
WX_CXXFLAGS="$WX_CXXFLAGS $GDK_CFLAGS"
fi
if test "$wx_multi_lib" = 1; then
GUI_LINK_OPTS_WX="`$WX_CONFIG --libs core,base`"
else

7
bochs/configure.in
View File

@ -2263,6 +2263,7 @@ ok_wx_version=0
wx_multi_lib=0
needs_gtk2=0
wx_needs_gdk2=0
wx_needs_gdk3=0
wx_msw_unicode=0
AC_MSG_CHECKING(for wxWidgets library version)
if test x$WX_CONFIG != xnot_found; then
@ -2291,6 +2292,7 @@ if test x$WX_CONFIG != xnot_found; then
wx_multi_lib=1
case x$WX_BASENAME in
xwx_gtk2|xwx_gtk2u) wx_needs_gdk2=1 ;;
xwx_gtk3|xwx_gtk3u) wx_needs_gdk3=1 ;;
*) ;;
esac
;;
@ -2578,6 +2580,11 @@ if test "$with_wx" = yes; then
WX_CFLAGS="$WX_CFLAGS $GDK_CFLAGS"
WX_CXXFLAGS="$WX_CXXFLAGS $GDK_CFLAGS"
fi
if test "$wx_needs_gdk3" = 1; then
GDK_CFLAGS="`pkg-config --cflags gdk-3.0`"
WX_CFLAGS="$WX_CFLAGS $GDK_CFLAGS"
WX_CXXFLAGS="$WX_CXXFLAGS $GDK_CFLAGS"
fi
if test "$wx_multi_lib" = 1; then
GUI_LINK_OPTS_WX="`$WX_CONFIG --libs core,base`"
else

55
bochs/gui/wx.cc
View File

@ -2,7 +2,7 @@
// $Id$
/////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002-2017 The Bochs Project
// Copyright (C) 2002-2019 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@ -623,6 +623,59 @@ bx_bool MyPanel::fillBxKeyEvent_MSW (wxKeyEvent& wxev, BxKeyEvent& bxev, bx_bool
#if defined (wxHAS_RAW_KEY_CODES) && defined(__WXGTK__)
// get those keysym definitions
#include <gdk/gdkkeysyms.h>
#if defined(GDK_KEY_space)
#define GDK_space GDK_KEY_space
#define GDK_asciitilde GDK_KEY_asciitilde
#define GDK_KP_1 GDK_KEY_KP_1
#define GDK_KP_2 GDK_KEY_KP_2
#define GDK_KP_3 GDK_KEY_KP_3
#define GDK_KP_4 GDK_KEY_KP_4
#define GDK_KP_5 GDK_KEY_KP_5
#define GDK_KP_6 GDK_KEY_KP_6
#define GDK_KP_7 GDK_KEY_KP_7
#define GDK_KP_8 GDK_KEY_KP_8
#define GDK_KP_9 GDK_KEY_KP_9
#define GDK_KP_0 GDK_KEY_KP_0
#define GDK_KP_Decimal GDK_KEY_KP_Decimal
#define GDK_KP_Subtract GDK_KEY_KP_Subtract
#define GDK_KP_Add GDK_KEY_KP_Add
#define GDK_KP_Multiply GDK_KEY_KP_Multiply
#define GDK_KP_Divide GDK_KEY_KP_Divide
#define GDK_Up GDK_KEY_Up
#define GDK_Down GDK_KEY_Down
#define GDK_Left GDK_KEY_Left
#define GDK_Right GDK_KEY_Right
#define GDK_Delete GDK_KEY_Delete
#define GDK_BackSpace GDK_KEY_BackSpace
#define GDK_Tab GDK_KEY_Tab
#define GDK_Return GDK_KEY_Return
#define GDK_Escape GDK_KEY_Escape
#define GDK_F1 GDK_KEY_F1
#define GDK_F2 GDK_KEY_F2
#define GDK_F3 GDK_KEY_F3
#define GDK_F4 GDK_KEY_F4
#define GDK_F5 GDK_KEY_F5
#define GDK_F6 GDK_KEY_F6
#define GDK_F7 GDK_KEY_F7
#define GDK_F8 GDK_KEY_F8
#define GDK_F9 GDK_KEY_F9
#define GDK_F10 GDK_KEY_F10
#define GDK_F11 GDK_KEY_F11
#define GDK_F12 GDK_KEY_F12
#define GDK_Control_L GDK_KEY_Control_L
#define GDK_Shift_L GDK_KEY_Shift_L
#define GDK_Shift_R GDK_KEY_Shift_R
#define GDK_Alt_L GDK_KEY_Alt_L
#define GDK_Caps_Lock GDK_KEY_Caps_Lock
#define GDK_Num_Lock GDK_KEY_Num_Lock
#define GDK_Insert GDK_KEY_Insert
#define GDK_Home GDK_KEY_Home
#define GDK_End GDK_KEY_End
#define GDK_Page_Up GDK_KEY_Page_Up
#define GDK_Page_Down GDK_KEY_Page_Down
#endif
#endif
// GTK specific key mapping, which uses wxKeyEvent::m_rawCode.

6
bochs/gui/wxdialog.cc
View File

@ -2,7 +2,7 @@
// $Id$
/////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002-2018 The Bochs Project
// Copyright (C) 2002-2019 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@ -49,6 +49,10 @@
#include "wxdialog.h" // custom dialog boxes
#include "wxmain.h" // wxwidgets shared stuff
#if !defined(wxADJUST_MINSIZE)
#define wxADJUST_MINSIZE 0
#endif
//////////////////////////////////////////////////////////////////////
// constants, prototypes
//////////////////////////////////////////////////////////////////////

3
bochs/iodev/network/slirp/slirp.h
View File

@ -1,4 +1,3 @@
/////////////////////////////////////////////////////////////////////////
// $Id$
/////////////////////////////////////////////////////////////////////////
@ -45,7 +44,7 @@ typedef char *caddr_t;
#endif
#include <sys/types.h>
#if defined(__OpenBSD__)
#if defined(__OpenBSD__) || defined(__linux__)
#include <stdint.h>
#include <sys/wait.h>
#endif