Merge from trunk

This commit is contained in:
SarahW 2019-04-24 12:51:38 +01:00
commit f23dc883fc
22 changed files with 5195 additions and 36 deletions

View file

@ -160,6 +160,18 @@ case "$host" in
exit -1])
build_linux="yes"
;;
*-*-freebsd*)
CFLAGS="$CFLAGS -I/usr/local/include"
CXXFLAGS="$CXXFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
AC_CHECK_LIB([GL], [glGetError], [], \
[echo "You need to install the OpenGL library."
exit -1])
AC_CHECK_LIB([openal], [alGetError], [], \
[echo "You need to install the OpenAL library."
exit -1])
build_other="yes"
;;
*)
AC_CHECK_LIB([GL], [glGetError], [], \
[echo "You need to install the OpenGL library."