forked from enlightenment/efl
Evas: Allow independent static compilation of software_16_sdl engine
SVN revision: 63247
This commit is contained in:
parent
47c39e976c
commit
efea89b471
|
@ -103,6 +103,7 @@ want_evas_engine_software_8_x11="no"
|
||||||
want_evas_engine_software_16_x11="no"
|
want_evas_engine_software_16_x11="no"
|
||||||
want_evas_engine_software_16_ddraw="no"
|
want_evas_engine_software_16_ddraw="no"
|
||||||
want_evas_engine_software_16_wince="no"
|
want_evas_engine_software_16_wince="no"
|
||||||
|
want_evas_engine_software_16_sdl="no"
|
||||||
want_evas_engine_gl_xlib="no"
|
want_evas_engine_gl_xlib="no"
|
||||||
want_evas_engine_gl_xcb="no"
|
want_evas_engine_gl_xcb="no"
|
||||||
want_evas_engine_gl_sdl="no"
|
want_evas_engine_gl_sdl="no"
|
||||||
|
@ -681,6 +682,8 @@ EVAS_CHECK_ENGINE([software-16-ddraw], [${want_evas_engine_software_16_ddraw}],
|
||||||
|
|
||||||
EVAS_CHECK_ENGINE([software-16-wince], [${want_evas_engine_software_16_wince}], [no], [Software Windows CE 16 bits])
|
EVAS_CHECK_ENGINE([software-16-wince], [${want_evas_engine_software_16_wince}], [no], [Software Windows CE 16 bits])
|
||||||
|
|
||||||
|
EVAS_CHECK_ENGINE([software-16-sdl], [${want_evas_engine_software_16_sdl}], [no], [Software SDL 16 bits])
|
||||||
|
|
||||||
# SDL primitive
|
# SDL primitive
|
||||||
sdl_primitive="no"
|
sdl_primitive="no"
|
||||||
|
|
||||||
|
@ -875,7 +878,7 @@ have_evas_engine_software_16="no"
|
||||||
if test "x$have_evas_engine_software_16_x11" = "xyes" -o "x$have_evas_engine_software_16_x11" = "xstatic"; then
|
if test "x$have_evas_engine_software_16_x11" = "xyes" -o "x$have_evas_engine_software_16_x11" = "xstatic"; then
|
||||||
have_evas_engine_software_16="yes"
|
have_evas_engine_software_16="yes"
|
||||||
fi
|
fi
|
||||||
if test "x$have_evas_engine_software_sdl" = "xyes" -o "x$have_evas_engine_software_sdl" = "xstatic"; then
|
if test "x$have_evas_engine_software_16_sdl" = "xyes" -o "x$have_evas_engine_software_16_sdl" = "xstatic"; then
|
||||||
have_evas_engine_software_16="yes"
|
have_evas_engine_software_16="yes"
|
||||||
fi
|
fi
|
||||||
if test "x$have_evas_engine_software_16_ddraw" = "xyes" -o "x$have_evas_engine_software_16_ddraw" = "xstatic"; then
|
if test "x$have_evas_engine_software_16_ddraw" = "xyes" -o "x$have_evas_engine_software_16_ddraw" = "xstatic"; then
|
||||||
|
@ -1846,7 +1849,7 @@ echo " Software 16bit ............: $have_evas_engine_software_16"
|
||||||
echo " Software 16bit X11.........: $have_evas_engine_software_16_x11"
|
echo " Software 16bit X11.........: $have_evas_engine_software_16_x11"
|
||||||
echo " Software 16bit Directdraw..: $have_evas_engine_software_16_ddraw"
|
echo " Software 16bit Directdraw..: $have_evas_engine_software_16_ddraw"
|
||||||
echo " Software 16bit WinCE.......: $have_evas_engine_software_16_wince"
|
echo " Software 16bit WinCE.......: $have_evas_engine_software_16_wince"
|
||||||
echo " Software 16bit SDL.........: $have_evas_engine_software_sdl (primitive: $sdl_primitive)"
|
echo " Software 16bit SDL.........: $have_evas_engine_software_16_sdl (primitive: $sdl_primitive)"
|
||||||
echo
|
echo
|
||||||
echo "Image Loaders:"
|
echo "Image Loaders:"
|
||||||
echo " BMP.....................: $have_evas_image_loader_bmp"
|
echo " BMP.....................: $have_evas_image_loader_bmp"
|
||||||
|
|
|
@ -446,6 +446,42 @@ fi
|
||||||
|
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
|
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_SDL(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||||
|
|
||||||
|
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_SDL],
|
||||||
|
[
|
||||||
|
|
||||||
|
requirement=""
|
||||||
|
have_dep="no"
|
||||||
|
evas_engine_[]$1[]_cflags=""
|
||||||
|
evas_engine_[]$1[]_libs=""
|
||||||
|
|
||||||
|
PKG_CHECK_MODULES([SDL],
|
||||||
|
[sdl >= 1.2.0],
|
||||||
|
[
|
||||||
|
have_dep="yes"
|
||||||
|
requirement="sdl"
|
||||||
|
evas_engine_[]$1[]_cflags="${SDL_CFLAGS}"
|
||||||
|
evas_engine_[]$1[]_libs="${SDL_LIBS}"
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
AC_SUBST([evas_engine_$1_cflags])
|
||||||
|
AC_SUBST([evas_engine_$1_libs])
|
||||||
|
|
||||||
|
if test "x$3" = "xstatic" ; then
|
||||||
|
requirement_evas="${requirement} ${requirement_evas}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x${have_dep}" = "xyes" ; then
|
||||||
|
m4_default([$4], [:])
|
||||||
|
else
|
||||||
|
m4_default([$5], [:])
|
||||||
|
fi
|
||||||
|
|
||||||
|
])
|
||||||
|
|
||||||
dnl use: EVAS_CHECK_ENGINE_DEP_GL_SDL(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
dnl use: EVAS_CHECK_ENGINE_DEP_GL_SDL(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||||
|
|
||||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_SDL],
|
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_SDL],
|
||||||
|
|
|
@ -47,7 +47,10 @@ if !EVAS_STATIC_BUILD_SOFTWARE_16_X11
|
||||||
SUBDIRS += software_16_x11
|
SUBDIRS += software_16_x11
|
||||||
endif
|
endif
|
||||||
if !EVAS_STATIC_BUILD_SOFTWARE_SDL
|
if !EVAS_STATIC_BUILD_SOFTWARE_SDL
|
||||||
SUBDIRS += software_16_sdl software_sdl
|
SUBDIRS += software_sdl
|
||||||
|
endif
|
||||||
|
if !EVAS_STATIC_BUILD_SOFTWARE_16_SDL
|
||||||
|
SUBDIRS += software_16_sdl
|
||||||
endif
|
endif
|
||||||
if !EVAS_STATIC_BUILD_SOFTWARE_DDRAW
|
if !EVAS_STATIC_BUILD_SOFTWARE_DDRAW
|
||||||
SUBDIRS += software_ddraw
|
SUBDIRS += software_ddraw
|
||||||
|
|
Loading…
Reference in New Issue