forked from enlightenment/efl
Fix build with static modules, thanks Gentoo ;-)
I don't know if this is useful to backport to stable branch, if you think so please do it as I don't even have that checkout... svn is annoying :-P SVN revision: 58012
This commit is contained in:
parent
3470b9f817
commit
9f0b807db4
|
@ -192,3 +192,8 @@
|
|||
* Proxy: Bypass the clip on smart clipped objects. This is probably
|
||||
what you want if you are using proxies, as it means clips don't cause
|
||||
the object to be invisible by the proxy.
|
||||
|
||||
2011-03-22 Gustavo Sverzut Barbieri (k-s)
|
||||
|
||||
* Fix build of GL and static modules.
|
||||
* Fix ico loader static build.
|
||||
|
|
|
@ -633,13 +633,17 @@ EVAS_CHECK_ENGINE([software-16-wince], [${want_evas_engine_software_16_wince}],
|
|||
|
||||
# common gl
|
||||
have_evas_engine_gl_common="no"
|
||||
have_static_evas_engine_gl_common="no"
|
||||
if test "x$have_evas_engine_gl_x11" = "xyes" \
|
||||
|| test "x$have_evas_engine_gl_x11" = "xstatic" \
|
||||
|| test "x$have_evas_engine_gl_glew" = "xyes" \
|
||||
|| test "x$have_evas_engine_gl_sdl" = "xyes"; then
|
||||
have_evas_engine_gl_common="yes"
|
||||
fi
|
||||
if test "x$have_evas_engine_gl_x11" = "xstatic" \
|
||||
|| test "x$have_evas_engine_gl_glew" = "xstatic" \
|
||||
|| test "x$have_evas_engine_gl_sdl" = "xyes" \
|
||||
|| test "x$have_evas_engine_gl_sdl" = "xstatic"; then
|
||||
have_evas_engine_gl_common="yes"
|
||||
have_static_evas_engine_gl_common="yes"
|
||||
fi
|
||||
|
||||
if test "x$have_evas_engine_gl_common" = "xyes"; then
|
||||
|
@ -651,6 +655,11 @@ AC_SUBST([evas_engine_gl_common_libs])
|
|||
|
||||
AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, [test "x$have_evas_engine_gl_common" = "xyes"])
|
||||
|
||||
AM_CONDITIONAL(EVAS_STATIC_BUILD_GL_COMMON, test "x${have_static_evas_engine_gl_common}" = "xyes")
|
||||
if test "x${have_static_evas_engine_gl_common}" = "xyes"; then
|
||||
AC_DEFINE(EVAS_STATIC_BUILD_GL_COMMON, [1], [Build GL generic engine as part of libevas])
|
||||
fi
|
||||
|
||||
# gl_sdl
|
||||
if test "x$have_evas_engine_gl_sdl" = "xyes" || test "x$have_evas_engine_gl_sdl" = "xstatic" ; then
|
||||
AC_CHECK_DECL(SDL_GL_CONTEXT_MAJOR_VERSION,
|
||||
|
@ -687,6 +696,11 @@ AC_ARG_ENABLE([static-software-generic],
|
|||
AC_MSG_CHECKING([Whether to build software generic engine as part of libevas])
|
||||
AC_MSG_RESULT([${have_static_software_generic}])
|
||||
|
||||
if test "x${have_static_module}" = "xyes" -a "x${have_static_software_generic}" = "xno"; then
|
||||
AC_MSG_WARN([Forcing --enable-static-software-generic as engines must be compiled statically])
|
||||
have_static_software_generic="yes"
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(EVAS_STATIC_BUILD_SOFTWARE_GENERIC, test "x${have_static_software_generic}" = "xyes")
|
||||
if test "x${have_static_software_generic}" = "xyes"; then
|
||||
AC_DEFINE(EVAS_STATIC_BUILD_SOFTWARE_GENERIC, [1], [Build software generic engine as part of libevas])
|
||||
|
|
|
@ -133,6 +133,11 @@ SUBDIRS += ../modules/loaders/gif
|
|||
EVAS_STATIC_MODULE += ../modules/loaders/gif/libevas_loader_gif.la
|
||||
EVAS_STATIC_LIBADD += @evas_image_loader_gif_libs@
|
||||
endif
|
||||
if EVAS_STATIC_BUILD_ICO
|
||||
SUBDIRS += ../modules/loaders/ico
|
||||
EVAS_STATIC_MODULE += ../modules/loaders/ico/libevas_loader_ico.la
|
||||
EVAS_STATIC_LIBADD += @evas_image_loader_ico_libs@
|
||||
endif
|
||||
if EVAS_STATIC_BUILD_JPEG
|
||||
SUBDIRS += ../modules/loaders/jpeg
|
||||
EVAS_STATIC_MODULE += ../modules/loaders/jpeg/libevas_loader_jpeg.la
|
||||
|
|
|
@ -17,15 +17,20 @@ endif
|
|||
if !EVAS_STATIC_BUILD_FB
|
||||
SUBDIRS += fb
|
||||
endif
|
||||
|
||||
if !EVAS_STATIC_BUILD_GL_COMMON
|
||||
SUBDIRS += gl_common
|
||||
endif
|
||||
if !EVAS_STATIC_BUILD_GL_GLEW
|
||||
SUBDIRS += gl_common gl_glew
|
||||
SUBDIRS += gl_glew
|
||||
endif
|
||||
if !EVAS_STATIC_BUILD_GL_X11
|
||||
SUBDIRS += gl_common gl_x11
|
||||
SUBDIRS += gl_x11
|
||||
endif
|
||||
if !EVAS_STATIC_BUILD_GL_SDL
|
||||
SUBDIRS += gl_common gl_sdl
|
||||
SUBDIRS += gl_sdl
|
||||
endif
|
||||
|
||||
if !EVAS_STATIC_BUILD_QUARTZ
|
||||
SUBDIRS += quartz
|
||||
endif
|
||||
|
|
Loading…
Reference in New Issue