ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation with GTK2.

This commit is contained in:
Brandon Wright 2018-10-26 15:46:55 -05:00
parent 15930a4d79
commit 84b9d5acaa
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/configure.ac
View File

@ -225,9 +225,13 @@ fi
WAYLAND=0 WAYLAND=0
PKG_CHECK_MODULES([WAYLAND_EGL],[wayland-egl],[ PKG_CHECK_MODULES([WAYLAND_EGL],[wayland-egl],[
CFLAGS="$CFLAGS $WAYLAND_EGL_CFLAGS" if test yes = "$GTK3_WARNING" ; then
LIBS="$LIBS $WAYLAND_EGL_LIBS" CFLAGS="$CFLAGS $WAYLAND_EGL_CFLAGS"
WAYLAND=yes LIBS="$LIBS $WAYLAND_EGL_LIBS"
WAYLAND=yes
else
echo "Found Wayland, but need GTK3 for support."
fi
],[ ],[
echo "Not using Wayland-EGL." echo "Not using Wayland-EGL."
]) ])

2
gtk/src/gtk_display.cpp
View File

@ -1599,7 +1599,7 @@ S9xQueryDrivers (void)
if (GDK_IS_X11_DISPLAY (display)) if (GDK_IS_X11_DISPLAY (display))
{ {
Display *dpy = gdk_x11_display_get_xdisplay (gtk_widget_get_display (GTK_WIDGET (top_level->get_window()))); Display *dpy = gdk_x11_display_get_xdisplay (gtk_widget_get_display (GTK_WIDGET (top_level->get_window())));
Window xid = gdk_x11_window_get_xid (gtk_widget_get_window (GTK_WIDGET (top_level->get_window()))); Window xid = GDK_COMPAT_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (top_level->get_window())));
gui_config->allow_xrandr = 1; gui_config->allow_xrandr = 1;
gui_config->xrr_screen_resources = XRRGetScreenResourcesCurrent (dpy, xid); gui_config->xrr_screen_resources = XRRGetScreenResourcesCurrent (dpy, xid);