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

Moved the SDL test in linux only part, as it isn't needed for windows.

This commit is contained in:
yabause 2006-04-08 14:23:26 +00:00
parent a3eeac26cf
commit eefd5e7752
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
desmume/configure.ac
View File

@ -16,15 +16,6 @@ AC_C_BIGENDIAN
AC_PATH_PROGS(HAVE_LIBSDL, [sdl-config sdl11-config]) AC_PATH_PROGS(HAVE_LIBSDL, [sdl-config sdl11-config])
if test x$HAVE_LIBSDL = x ; then
AC_MSG_ERROR([You need to install SDL])
else
SDL_CFLAGS=`$HAVE_LIBSDL --cflags`
SDL_LIBS=`$HAVE_LIBSDL --libs`
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
fi
case $target in case $target in
*linux*) *linux*)
AC_CHECK_TOOL(HAVE_PKG, pkg-config) AC_CHECK_TOOL(HAVE_PKG, pkg-config)
@ -32,9 +23,18 @@ case $target in
if test ! x$HAVE_PKG = x ; then if test ! x$HAVE_PKG = x ; then
GTK_CFLAGS=`$HAVE_PKG gtk+-2.0 --cflags` GTK_CFLAGS=`$HAVE_PKG gtk+-2.0 --cflags`
GTK_LIBS=`$HAVE_PKG gtk+-2.0 --libs` GTK_LIBS=`$HAVE_PKG gtk+-2.0 --libs`
fi
if test x$HAVE_LIBSDL = x ; then
AC_MSG_ERROR([You need to install SDL])
else
SDL_CFLAGS=`$HAVE_LIBSDL --cflags`
SDL_LIBS=`$HAVE_LIBSDL --libs`
GTK_CFLAGS="$GTK_CFLAGS $SDL_CFLAGS"
GTK_LIBS="$GTK_LIBS $SDL_LIBS"
fi
AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS) AC_SUBST(GTK_LIBS)
fi
UI_DIR=gtk UI_DIR=gtk
AC_SUBST([UI_DIR]) AC_SUBST([UI_DIR])