joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-18 17:32:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix --enable-sdl2

Browse Source
This commit is contained in:
Jonathan Campbell
2017-12-07 20:21:49 -08:00
parent 8c08f105f0
commit dfcc27b31c
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acinclude.m4
View File

@@ -7,7 +7,7 @@ AC_ARG_WITH(sdl2-exec-prefix,[ --with-sdl2-exec-prefix=PFX Exec prefix where SD
sdl2_exec_prefix="$withval", sdl2_exec_prefix="") sdl2_exec_prefix="$withval", sdl2_exec_prefix="")
AC_ARG_ENABLE(sdl2test, [ --disable-sdl2test Do not try to compile and run a test SDL program], AC_ARG_ENABLE(sdl2test, [ --disable-sdl2test Do not try to compile and run a test SDL program],
enable_sdl2test=no, enable_sdl2test=yes) enable_sdl2test=no, enable_sdl2test=yes)
AC_ARG_ENABLE(sdl2enable, [ --enable-sdl2 Enable SDL 2.x], AC_ARG_ENABLE(sdl2, [ --enable-sdl2 Enable SDL 2.x],
enable_sdl2enable=$enableval, enable_sdl2enable=no) enable_sdl2enable=$enableval, enable_sdl2enable=no)
AH_TEMPLATE(C_SDL2,[Set to 1 to enable SDL 2.x support]) AH_TEMPLATE(C_SDL2,[Set to 1 to enable SDL 2.x support])
@@ -57,7 +57,7 @@ AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL
sdl_exec_prefix="$withval", sdl_exec_prefix="") sdl_exec_prefix="$withval", sdl_exec_prefix="")
AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
enable_sdltest=no, enable_sdltest=yes) enable_sdltest=no, enable_sdltest=yes)
AC_ARG_ENABLE(sdlenable, [ --enable-sdl Enable SDL 1.x], AC_ARG_ENABLE(sdl, [ --enable-sdl Enable SDL 1.x],
enable_sdlenable=$enableval, enable_sdlenable=yes) enable_sdlenable=$enableval, enable_sdlenable=yes)
AH_TEMPLATE(C_SDL1,[Set to 1 to enable SDL 1.x support]) AH_TEMPLATE(C_SDL1,[Set to 1 to enable SDL 1.x support])

16
configure vendored
View File

@@ -752,11 +752,11 @@ enable_alsatest
with_sdl2_prefix with_sdl2_prefix
with_sdl2_exec_prefix with_sdl2_exec_prefix
enable_sdl2test enable_sdl2test
enable_sdl2enable enable_sdl2
with_sdl_prefix with_sdl_prefix
with_sdl_exec_prefix with_sdl_exec_prefix
enable_sdltest enable_sdltest
enable_sdlenable enable_sdl
enable_alsa_midi enable_alsa_midi
enable_mt32 enable_mt32
enable_debug enable_debug
@@ -6787,9 +6787,9 @@ else
enable_sdl2test=yes enable_sdl2test=yes
fi fi
# Check whether --enable-sdl2enable was given. # Check whether --enable-sdl2 was given.
if test "${enable_sdl2enable+set}" = set; then : if test "${enable_sdl2+set}" = set; then :
enableval=$enable_sdl2enable; enable_sdl2enable=$enableval enableval=$enable_sdl2; enable_sdl2enable=$enableval
else else
enable_sdl2enable=no enable_sdl2enable=no
fi fi
@@ -6895,9 +6895,9 @@ else
enable_sdltest=yes enable_sdltest=yes
fi fi
# Check whether --enable-sdlenable was given. # Check whether --enable-sdl was given.
if test "${enable_sdlenable+set}" = set; then : if test "${enable_sdl+set}" = set; then :
enableval=$enable_sdlenable; enable_sdlenable=$enableval enableval=$enable_sdl; enable_sdlenable=$enableval
else else
enable_sdlenable=yes enable_sdlenable=yes
fi fi