Evas: fix static gl engines compilation, and maybe others too

SVN revision: 80085
This commit is contained in:
Vincent Torri 2012-12-03 16:54:10 +00:00
parent 9af2e7f69b
commit 9e8e98f736
2 changed files with 23 additions and 14 deletions

View File

@ -200,7 +200,7 @@ PKG_CHECK_EXISTS([xcb xcb-shm xcb-image >= 0.2.1 pixman-1],
[have_dep="no"])
if test "x${have_dep}" = "xyes" ; then
if test "x$2" = "xstatic" ; then
if test "x$3" = "xstatic" ; then
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else
@ -285,7 +285,7 @@ PKG_CHECK_EXISTS([x11-xcb xcb xcb-glx xcb-render xcb-renderutil],
[have_dep="no"])
if test "x${have_dep}" = "xyes" ; then
if test "x$2" = "xstatic" ; then
if test "x$3" = "xstatic" ; then
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else
@ -500,7 +500,7 @@ PKG_CHECK_EXISTS([sdl >= 1.2.0],
[have_dep="no"])
if test "x${have_dep}" = "xyes" ; then
if test "x$2" = "xstatic" ; then
if test "x$3" = "xstatic" ; then
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else
@ -617,7 +617,7 @@ PKG_CHECK_EXISTS([directfb >= 0.9.16],
[have_dep="no"])
if test "x${have_dep}" = "xyes" ; then
if test "x$2" = "xstatic" ; then
if test "x$3" = "xstatic" ; then
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else
@ -694,7 +694,7 @@ PKG_CHECK_EXISTS([egl >= 7.10 ${gl_library} wayland-client wayland-egl],
[have_dep="no"])
if test "x${have_dep}" = "xyes" ; then
if test "x$2" = "xstatic" ; then
if test "x$3" = "xstatic" ; then
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
else

View File

@ -682,7 +682,6 @@ lib_evas_libevas_la_CPPFLAGS += \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
@evas_engine_gl_cocoa_cflags@
lib_evas_libevas_la_LIBADD += \
modules/evas/engines/gl_common/libevas_engine_gl_common.la \
@evas_engine_gl_cocoa_libs@
else
engineglcocoapkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH)
@ -706,8 +705,12 @@ modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \
@evas_engine_gl_cocoa_cflags@ \
@EFL_CFLAGS@ \
@EVAS_CFLAGS@
modules_evas_engines_gl_cocoa_module_la_LIBADD = \
modules/evas/engines/gl_common/libevas_engine_gl_common.la \
modules_evas_engines_gl_cocoa_module_la_LIBADD =
if ! EVAS_STATIC_BUILD_GL_COMMON
modules_evas_engines_gl_cocoa_module_la_LIBADD += \
modules/evas/engines/gl_common/libevas_engine_gl_common.la
endif
modules_evas_engines_gl_cocoa_module_la_LIBADD += \
lib/eet/libeet.la \
lib/evas/libevas.la \
@EFL_LIBS@ \
@ -728,7 +731,6 @@ lib_evas_libevas_la_CPPFLAGS += \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
@evas_engine_gl_sdl_cflags@
lib_evas_libevas_la_LIBADD += \
modules/evas/engines/gl_common/libevas_engine_gl_common.la \
@evas_engine_gl_sdl_libs@
else
engineglsdlpkgdir = $(libdir)/evas/modules/engines/gl_sdl/$(MODULE_ARCH)
@ -752,8 +754,12 @@ modules_evas_engines_gl_sdl_module_la_CPPFLAGS = \
@evas_engine_gl_sdl_cflags@ \
@EFL_CFLAGS@ \
@EVAS_CFLAGS@
modules_evas_engines_gl_sdl_module_la_LIBADD = \
modules/evas/engines/gl_common/libevas_engine_gl_common.la \
modules_evas_engines_gl_sdl_module_la_LIBADD =
if ! EVAS_STATIC_BUILD_GL_COMMON
modules_evas_engines_gl_sdl_module_la_LIBADD += \
modules/evas/engines/gl_common/libevas_engine_gl_common.la
endif
modules_evas_engines_gl_sdl_module_la_LIBADD += \
lib/evas/libevas.la \
@EFL_LIBS@ \
@evas_engine_gl_sdl_libs@
@ -774,7 +780,6 @@ lib_evas_libevas_la_CPPFLAGS += \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
@evas_engine_gl_xlib_cflags@
lib_evas_libevas_la_LIBADD += \
modules/evas/engines/gl_common/libevas_engine_gl_common.la \
@evas_engine_gl_xlib_libs@
else
engineglx11pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH)
@ -798,8 +803,12 @@ modules_evas_engines_gl_x11_module_la_CPPFLAGS = \
@evas_engine_gl_xlib_cflags@ \
@EFL_CFLAGS@ \
@EVAS_CFLAGS@
modules_evas_engines_gl_x11_module_la_LIBADD = \
modules/evas/engines/gl_common/libevas_engine_gl_common.la \
modules_evas_engines_gl_x11_module_la_LIBADD =
if ! EVAS_STATIC_BUILD_GL_COMMON
modules_evas_engines_gl_x11_module_la_LIBADD += \
modules/evas/engines/gl_common/libevas_engine_gl_common.la
endif
modules_evas_engines_gl_x11_module_la_LIBADD += \
lib/eet/libeet.la \
lib/evas/libevas.la \
@EFL_LIBS@ \