Dasko/snes9x
Dasko/snes9x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GTK+: More cleaning.

Browse Source
This commit is contained in:
Brandon Wright 2018-11-18 12:30:58 -06:00
parent 09f06a6167
commit 870bda8efb
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gtk/configure.ac
View File

@ -167,23 +167,18 @@ fi
LIBS="$LIBS -lX11 -ldl -lXext" LIBS="$LIBS -lX11 -ldl -lXext"
JMA='#JMA=yes' JMA=yes
CPUINC='' NETPLAY=yes
NETPLAY='#NETPLAY=yes' OPENGL=no
SYSLIBS=''
OPENGL=0
if test yes = "$with_opengl" ; then if test yes = "$with_opengl" ; then
OPENGL=yes OPENGL=yes
fi fi
GTK=yes GTK3=no
snes9x_info_display="GTK"
GTK3_WARNING=no
if test yes = "$with_gtk3" -a no = "$with_gtk2"; then if test yes = "$with_gtk3" -a no = "$with_gtk2"; then
GTK_VERSION="gtk+-3.0 >= 3.22" GTK_VERSION="gtk+-3.0 >= 3.22"
GTK3_WARNING=yes GTK3=yes
else else
GTK_VERSION="gtk+-2.0 >= 2.16" GTK_VERSION="gtk+-2.0 >= 2.16"
fi fi
@ -207,10 +202,10 @@ if test yes = "$with_opengl" ; then
LIBS="$LIBS $EPOXY_LIBS" LIBS="$LIBS $EPOXY_LIBS"
fi fi
WAYLAND=0 WAYLAND=no
if test yes = "$with_wayland"; then if test yes = "$with_wayland"; then
PKG_CHECK_MODULES([WAYLAND_EGL],[wayland-egl],[ PKG_CHECK_MODULES([WAYLAND_EGL],[wayland-egl],[
if test yes = "$GTK3_WARNING" ; then if test yes = "$GTK3" ; then
CFLAGS="$CFLAGS -DUSE_WAYLAND $WAYLAND_EGL_CFLAGS" CFLAGS="$CFLAGS -DUSE_WAYLAND $WAYLAND_EGL_CFLAGS"
LIBS="$LIBS $WAYLAND_EGL_LIBS" LIBS="$LIBS $WAYLAND_EGL_LIBS"
WAYLAND=yes WAYLAND=yes
@ -222,7 +217,7 @@ if test yes = "$with_wayland"; then
]) ])
fi fi
GTKJOY=0 GTKJOY=no
SDL_CFLAGS="" SDL_CFLAGS=""
SDL_LIBS="" SDL_LIBS=""
if test yes = "$with_joystick"; then if test yes = "$with_joystick"; then
@ -242,7 +237,7 @@ if test yes = "$with_joystick"; then
]) ])
fi fi
XV=0 XV=no
XV_CFLAGS="" XV_CFLAGS=""
XV_LIBS="" XV_LIBS=""
if test yes = "$with_xv" ; then if test yes = "$with_xv" ; then
@ -255,7 +250,7 @@ if test yes = "$with_xv" ; then
]) ])
fi fi
PORTAUDIO=0 PORTAUDIO=no
PORTAUDIO_CFLAGS="" PORTAUDIO_CFLAGS=""
PORTAUDIO_LIBS="" PORTAUDIO_LIBS=""
if test yes = "$with_portaudio" ; then if test yes = "$with_portaudio" ; then
@ -268,7 +263,7 @@ if test yes = "$with_portaudio" ; then
]) ])
fi fi
OSS=0 OSS=no
if test yes = "$with_oss" ; then if test yes = "$with_oss" ; then
AC_CHECK_HEADER(sys/soundcard.h, [ AC_CHECK_HEADER(sys/soundcard.h, [
@ -280,7 +275,7 @@ if test yes = "$with_oss" ; then
]) ])
fi fi
ALSA=0 ALSA=no
ALSA_CFLAGS="" ALSA_CFLAGS=""
ALSA_LIBS="" ALSA_LIBS=""
if test yes = "$with_alsa" ; then if test yes = "$with_alsa" ; then
@ -294,7 +289,7 @@ if test yes = "$with_alsa" ; then
]) ])
fi fi
PULSEAUDIO=0 PULSEAUDIO=no
PULSEAUDIO_CFLAGS="" PULSEAUDIO_CFLAGS=""
PULSEAUDIO_LIBS="" PULSEAUDIO_LIBS=""
if test yes = "$with_pulseaudio" ; then if test yes = "$with_pulseaudio" ; then
@ -318,7 +313,7 @@ if test yes = "$with_screenshot"; then
]) ])
fi fi
SYSTEM_ZIP=0 SYSTEM_ZIP=no
SYSTEM_ZIP_CFLAGS="" SYSTEM_ZIP_CFLAGS=""
SYSTEM_ZIP_LIBS="" SYSTEM_ZIP_LIBS=""
ZIP_CFLAGS="-I../unzip" ZIP_CFLAGS="-I../unzip"
@ -341,14 +336,14 @@ if test yes = "$with_hq2x" ; then
HQ2X=yes HQ2X=yes
CFLAGS="$CFLAGS -DUSE_HQ2X" CFLAGS="$CFLAGS -DUSE_HQ2X"
else else
HQ2X=0 HQ2X=no
fi fi
if test yes = "$with_xbrz" ; then if test yes = "$with_xbrz" ; then
XBRZ=yes XBRZ=yes
CFLAGS="$CFLAGS -DUSE_XBRZ" CFLAGS="$CFLAGS -DUSE_XBRZ"
else else
XBRZ=0 XBRZ=no
fi fi
CFLAGS="$CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $PORTAUDIO_CFLAGS $LIBPNG_CFLAGS $SDL_CFLAGS $XV_CFLAGS $XRANDR_CFLAGS $ALSA_CFLAGS $PULSEAUDIO_CFLAGS" CFLAGS="$CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $PORTAUDIO_CFLAGS $LIBPNG_CFLAGS $SDL_CFLAGS $XV_CFLAGS $XRANDR_CFLAGS $ALSA_CFLAGS $PULSEAUDIO_CFLAGS"
@ -482,7 +477,7 @@ echo ""
echo "Snes9x will build with support for the following:" echo "Snes9x will build with support for the following:"
echo "" echo ""
if test yes = "$GTK3_WARNING" ; then if test yes = "$GTK3" ; then
echo " GTK+ 3.0" echo " GTK+ 3.0"
else else
echo " GTK+ 2.0" echo " GTK+ 2.0"