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

Update SDL 1.x to look towards our own internal copy IF the one

Browse Source 
compiling our source has first compiled and built SDL 1.x within our
source dir.
This commit is contained in:
Jonathan Campbell
2017-12-13 16:16:29 -08:00
parent d2d9d7d376
commit 593e92d7f6
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acinclude.m4
View File

@@ -76,6 +76,10 @@ AC_ARG_ENABLE(sdl, [ --enable-sdl Enable SDL 1.x],
SDL_CONFIG=$sdl_prefix/bin/sdl-config
fi
fi
if test -x vs2015/sdl/linux-host/bin/sdl-config ; then
SDL_CONFIG=vs2015/sdl/linux-host/bin/sdl-config
PATH=vs2015/sdl/linux-host/bin:$PATH
fi
AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
min_sdl_version=ifelse([$1], ,0.11.0,$1)

4
configure vendored
View File

@@ -6919,6 +6919,10 @@ fi
SDL_CONFIG=$sdl_prefix/bin/sdl-config
fi
fi
if test -x vs2015/sdl/linux-host/bin/sdl-config ; then
SDL_CONFIG=vs2015/sdl/linux-host/bin/sdl-config
PATH=vs2015/sdl/linux-host/bin:$PATH
fi
# Extract the first word of "sdl-config", so it can be a program name with args.
set dummy sdl-config; ac_word=$2