forked from enlightenment/efl
parent
d4073fc07a
commit
57e43db8b8
|
@ -569,49 +569,26 @@ if test "x$want_ecore_evas_fb" = "xyes" -a "x$have_ecore_fb" = "xyes"; then
|
|||
fi
|
||||
|
||||
## SDL
|
||||
AC_ARG_WITH(sdl-config, [ --with-sdl-config=SDL_CONFIG use sdl-config specified],
|
||||
[ SDL_CONFIG=$withval;
|
||||
echo "using "$SDL_CONFIG" for sdl-config"; ],
|
||||
[ if test -z "$SDL_CONFIG"; then
|
||||
AC_PATH_PROG(SDL_CONFIG, "sdl-config", "", $PATH)
|
||||
fi
|
||||
])
|
||||
if test -z "$SDL_CONFIG" ; then SDL_CONFIG="sdl-config"; fi
|
||||
|
||||
have_sdl="no"
|
||||
AC_CHECK_HEADER(SDL/SDL.h,
|
||||
PKG_CHECK_MODULES(SDL, sdl >= 1.2.0,
|
||||
[ have_sdl="yes" ],
|
||||
[ have_sdl="no" ]
|
||||
)
|
||||
[ have_sdl="no" ])
|
||||
|
||||
ECORE_CHECK_MODULE([SDL], [yes], [$have_sdl],
|
||||
[requirements_ecore_evas="$requirements_ecore_evas ecore-sdl"])
|
||||
|
||||
want_ecore_evas_sdl="yes";
|
||||
have_ecore_evas_sdl="no";
|
||||
sdl_cflags="";
|
||||
sdl_libs="";
|
||||
|
||||
AC_MSG_CHECKING(whether ecore_evas sdl support is to be built)
|
||||
AC_ARG_ENABLE(ecore-evas-sdl,
|
||||
[ --enable-ecore-evas-sdl enable sdl in the ecore_evas module],
|
||||
[
|
||||
if test x"$enableval" = x"yes"; then
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
want_ecore_evas_sdl="no"
|
||||
fi
|
||||
], [
|
||||
AC_MSG_RESULT(yes)
|
||||
]
|
||||
[ want_ecore_evas_sdl=$enableval ]
|
||||
)
|
||||
if test "x$want_ecore_evas_sdl" = "xyes"; then
|
||||
sdl_cflags=`$SDL_CONFIG --cflags`
|
||||
sdl_libs=`$SDL_CONFIG --libs`
|
||||
AC_MSG_RESULT($want_ecore_evas_sdl)
|
||||
|
||||
if test "x$want_ecore_evas_sdl" = "xyes"; then
|
||||
save_CFLAGS=$CFLAGS
|
||||
CFLAGS=$CFLAGS" $sdl_cflags"
|
||||
CFLAGS=$CFLAGS" $SDL_CFLAGS"
|
||||
AC_CHECK_HEADER(Evas_Engine_SDL.h,
|
||||
[
|
||||
AC_DEFINE(BUILD_ECORE_EVAS_SDL, 1, [Support for SDL in Ecore_Evas])
|
||||
|
@ -631,9 +608,6 @@ if test "x$have_ecore_evas_sdl" = "xyes"; then
|
|||
[ dummy=no ])
|
||||
fi
|
||||
|
||||
AC_SUBST(sdl_cflags)
|
||||
AC_SUBST(sdl_libs)
|
||||
|
||||
want_ecore_evas_buffer="yes";
|
||||
have_ecore_evas_buffer="no";
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ ECORE_WIN32_LIB =
|
|||
endif
|
||||
|
||||
if BUILD_ECORE_SDL
|
||||
ECORE_SDL_INC = -I$(top_srcdir)/src/lib/ecore_sdl @sdl_cflags@
|
||||
ECORE_SDL_INC = -I$(top_srcdir)/src/lib/ecore_sdl @SDL_CFLAGS@
|
||||
ECORE_SDL_LIB = $(top_builddir)/src/lib/ecore_sdl/libecore_sdl.la
|
||||
else
|
||||
ECORE_SDL_INC =
|
||||
|
@ -77,7 +77,7 @@ $(ECORE_WIN32_LIB) \
|
|||
$(ECORE_SDL_LIB) \
|
||||
$(top_builddir)/src/lib/ecore/libecore.la \
|
||||
@EVAS_LIBS@ \
|
||||
@sdl_libs@ \
|
||||
@SDL_LIBS@ \
|
||||
@XCB_LIBS@ \
|
||||
@create_shared_lib@
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src/lib/ecore \
|
||||
-I$(top_builddir)/src/lib/ecore \
|
||||
@sdl_cflags@
|
||||
@SDL_CFLAGS@
|
||||
|
||||
if BUILD_ECORE_SDL
|
||||
|
||||
|
@ -17,7 +17,7 @@ Ecore_Sdl_Keys.h
|
|||
|
||||
libecore_sdl_la_LIBADD = \
|
||||
$(top_builddir)/src/lib/ecore/libecore.la \
|
||||
@sdl_libs@ @create_shared_lib@
|
||||
@SDL_LIBS@ @create_shared_lib@
|
||||
|
||||
libecore_sdl_la_LDFLAGS = -version-info @version_info@
|
||||
|
||||
|
|
Loading…
Reference in New Issue