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

Changing configure a bit (again)

This commit is contained in:
Greg Kennedy 2015-12-19 22:19:27 -06:00
parent 3d7f5e78ec
commit b5be2ef3f9
3 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
unix/Makefile.in
View File

@ -1,4 +1,3 @@
@S9XXVIDEO@
@S9XDEBUGGER@
@S9XNETPLAY@
@S9XZIP@
@ -11,11 +10,6 @@ BUILDDIR = .
OBJECTS = ../apu/apu.o ../apu/bapu/dsp/sdsp.o ../apu/bapu/dsp/SPC_DSP.o ../apu/bapu/smp/smp.o ../apu/bapu/smp/smp_state.o ../bsx.o ../c4.o ../c4emu.o ../cheats.o ../cheats2.o ../clip.o ../conffile.o ../controls.o ../cpu.o ../cpuexec.o ../cpuops.o ../crosshairs.o ../dma.o ../dsp.o ../dsp1.o ../dsp2.o ../dsp3.o ../dsp4.o ../fxinst.o ../fxemu.o ../gfx.o ../globals.o ../logger.o ../memmap.o ../movie.o ../obc1.o ../ppu.o ../stream.o ../sa1.o ../sa1cpu.o ../screenshot.o ../sdd1.o ../sdd1emu.o ../seta.o ../seta010.o ../seta011.o ../seta018.o ../snapshot.o ../snes9x.o ../spc7110.o ../srtc.o ../tile.o ../filter/2xsai.o ../filter/blit.o ../filter/epx.o ../filter/hq2x.o ../filter/snes_ntsc.o ../statemanager.o unix.o x11.o
DEFS = -DMITSHM
ifdef S9XXVIDEO
DEFS += -DUSE_XVIDEO
LIBS += -lXv
endif
ifdef S9XDEBUGGER
OBJECTS += ../debug.o ../fxdbg.o
endif

11
unix/configure vendored
View File

@ -1357,7 +1357,7 @@ Optional Features:
--enable-jma enable JMA support (default: yes)
--enable-screenshot enable screenshot support through libpng (default:
yes)
--enable-xvideo enable XVideo if available (default: yes)
--enable-xvideo enable Xvideo if available (default: yes)
--enable-sound enable sound if available (default: yes)
Optional Packages:
@ -5998,9 +5998,7 @@ if test "x$snes9x_sar_int8" = "xyes" -a "x$snes9x_sar_int16" = "xyes" -a "x$snes
S9XDEFS="$S9XDEFS -DRIGHTSHIFT_IS_SAR"
fi
# Check if we can build with XVideo acceleration support
S9XXVIDEO="#S9XXVIDEO=1"
# Check if we can build with Xvideo acceleration support
# Check whether --enable-xvideo was given.
if test "${enable_xvideo+set}" = set; then :
enableval=$enable_xvideo;
@ -6015,7 +6013,8 @@ if test "x$enable_xvideo" = "xyes"; then
if test "x$ac_cv_header_X11_extensions_Xv_h" = xyes; then :
enable_xvideo="yes"
S9XXVIDEO="S9XXVIDEO=1"
S9XLIBS="$S9XLIBS -lXv"
S9XDEFS="$S9XDEFS -DUSE_XVIDEO"
fi
@ -6094,7 +6093,7 @@ defines.............. $S9XDEFS
libs................. $S9XLIBS
features:
XVideo support....... $enable_xvideo
Xvideo support....... $enable_xvideo
sound support........ $enable_sound
screenshot support... $enable_screenshot
netplay support...... $enable_netplay

11
unix/configure.ac
View File

@ -375,12 +375,10 @@ if test "x$snes9x_sar_int8" = "xyes" -a "x$snes9x_sar_int16" = "xyes" -a "x$snes
S9XDEFS="$S9XDEFS -DRIGHTSHIFT_IS_SAR"
fi
# Check if we can build with XVideo acceleration support
S9XXVIDEO="#S9XXVIDEO=1"
# Check if we can build with Xvideo acceleration support
AC_ARG_ENABLE([xvideo],
[AS_HELP_STRING([--enable-xvideo],
[enable XVideo if available (default: yes)])],
[enable Xvideo if available (default: yes)])],
[], [enable_xvideo="yes"])
if test "x$enable_xvideo" = "xyes"; then
@ -388,7 +386,8 @@ if test "x$enable_xvideo" = "xyes"; then
AC_CHECK_HEADER([X11/extensions/Xv.h],
[
enable_xvideo="yes"
S9XXVIDEO="S9XXVIDEO=1"
S9XLIBS="$S9XLIBS -lXv"
S9XDEFS="$S9XDEFS -DUSE_XVIDEO"
])
fi
@ -453,7 +452,7 @@ defines.............. $S9XDEFS
libs................. $S9XLIBS
features:
XVideo support....... $enable_xvideo
Xvideo support....... $enable_xvideo
sound support........ $enable_sound
screenshot support... $enable_screenshot
netplay support...... $enable_netplay