mirror of
https://github.com/kanjitalk755/macemu.git
synced 2024-06-02 13:41:37 +00:00
fixed issue #12: make autotools test for SDL2
This commit is contained in:
parent
99f50637e1
commit
d871b70240
2
BasiliskII/src/CrossPlatform/sigsegv.cpp
Normal file → Executable file
2
BasiliskII/src/CrossPlatform/sigsegv.cpp
Normal file → Executable file
|
@ -31,7 +31,9 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <list>
|
#include <list>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
2
BasiliskII/src/CrossPlatform/vm_alloc.cpp
Normal file → Executable file
2
BasiliskII/src/CrossPlatform/vm_alloc.cpp
Normal file → Executable file
|
@ -19,7 +19,9 @@
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_FCNTL_H
|
#ifdef HAVE_FCNTL_H
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
12
BasiliskII/src/Unix/configure.ac
Normal file → Executable file
12
BasiliskII/src/Unix/configure.ac
Normal file → Executable file
|
@ -266,7 +266,7 @@ AC_DEFUN([AC_CHECK_SDLFRAMEWORK], [
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
saved_CPPFLAGS="$CPPFLAGS"
|
saved_CPPFLAGS="$CPPFLAGS"
|
||||||
CPPFLAGS="$CPPFLAGS -I$SDL_FRAMEWORK/SDL.framework/Headers"
|
CPPFLAGS="$CPPFLAGS -I$SDL_FRAMEWORK/SDL2.framework/Headers"
|
||||||
AC_TRY_LINK(
|
AC_TRY_LINK(
|
||||||
[$2
|
[$2
|
||||||
#undef main], [],
|
#undef main], [],
|
||||||
|
@ -295,15 +295,15 @@ if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; then
|
||||||
fi
|
fi
|
||||||
if [[ "x$WANT_SDL" = "xyes" ]]; then
|
if [[ "x$WANT_SDL" = "xyes" ]]; then
|
||||||
if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
|
if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
|
||||||
AC_CHECK_SDLFRAMEWORK(SDL, [#include <SDL.h>])
|
AC_CHECK_SDLFRAMEWORK(SDL2, [#include <SDL.h>])
|
||||||
else
|
else
|
||||||
ac_cv_framework_SDL=no
|
ac_cv_framework_SDL=no
|
||||||
fi
|
fi
|
||||||
if [[ "x$ac_cv_framework_SDL" = "xno" ]]; then
|
if [[ "x$ac_cv_framework_SDL" = "xno" ]]; then
|
||||||
PKG_CHECK_MODULES([sdl], [sdl >= 1.2], [
|
PKG_CHECK_MODULES([sdl2], [sdl2 >= 2.0], [
|
||||||
CFLAGS="$CFLAGS $sdl_CFLAGS"
|
CFLAGS="$CFLAGS $sdl2_CFLAGS"
|
||||||
CXXFLAGS="$CXXFLAGS $sdl_CFLAGS"
|
CXXFLAGS="$CXXFLAGS $sdl2_CFLAGS"
|
||||||
LIBS="$LIBS $sdl_LIBS"
|
LIBS="$LIBS $sdl2_LIBS"
|
||||||
], [
|
], [
|
||||||
WANT_SDL=no
|
WANT_SDL=no
|
||||||
])
|
])
|
||||||
|
|
Loading…
Reference in New Issue
Block a user