summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-07 18:24:49 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-07 18:24:49 +0000
commitaaf18a71a4b671842d80bb2c5623be200c6bd0b1 (patch)
treed5db51470badfba9f7b636d4dba732237f7e46d3
parent4c534eb0e0f184742522f645a1ef87ad059fa037 (diff)
efl: baby steps to get sharing of options between evas and ecore-evas.
SVN revision: 80482
-rw-r--r--configure.ac74
-rw-r--r--m4/ecore_check_module.m42
-rw-r--r--src/Makefile_Ecore_Evas.am16
3 files changed, 62 insertions, 30 deletions
diff --git a/configure.ac b/configure.ac
index 196edfcace..d9e9d17f16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1125,6 +1125,24 @@ AC_ARG_ENABLE([fb],
1125 ], 1125 ],
1126 [want_fb="no"]) 1126 [want_fb="no"])
1127 1127
1128# SDL
1129AC_ARG_ENABLE([sdl],
1130 [AC_HELP_STRING([--enable-sdl],
1131 [disable SDL support. @<:@default=disabled@:>@])],
1132 [
1133 if test "x${enableval}" = "xyes" ; then
1134 want_sdl="yes"
1135 else
1136 want_sdl="no"
1137 fi
1138 ],
1139 [want_sdl="no"])
1140
1141want_gl_sdl="no"
1142if test "${want_sdl}" = "yes" && test "${with_opengl}" != "none"; then
1143 want_gl_sdl="yes"
1144fi
1145
1128# Fontconfig 1146# Fontconfig
1129AC_ARG_ENABLE([fontconfig], 1147AC_ARG_ENABLE([fontconfig],
1130 [AC_HELP_STRING([--disable-fontconfig], 1148 [AC_HELP_STRING([--disable-fontconfig],
@@ -1335,7 +1353,6 @@ want_evas_engine_software_gdi="no"
1335want_evas_engine_software_ddraw="no" 1353want_evas_engine_software_ddraw="no"
1336want_evas_engine_gl_xlib="no" 1354want_evas_engine_gl_xlib="no"
1337want_evas_engine_gl_xcb="no" 1355want_evas_engine_gl_xcb="no"
1338want_evas_engine_gl_sdl="no"
1339want_evas_engine_gl_cocoa="no" 1356want_evas_engine_gl_cocoa="no"
1340want_evas_engine_wayland_shm="no" 1357want_evas_engine_wayland_shm="no"
1341want_evas_engine_wayland_egl="no" 1358want_evas_engine_wayland_egl="no"
@@ -1377,8 +1394,6 @@ case "$host_os" in
1377 want_evas_engine_gl_xlib="auto" 1394 want_evas_engine_gl_xlib="auto"
1378 want_evas_engine_software_xcb="no" 1395 want_evas_engine_software_xcb="no"
1379 want_evas_engine_gl_xcb="no" 1396 want_evas_engine_gl_xcb="no"
1380 want_evas_engine_wayland_shm="auto"
1381 want_evas_engine_wayland_egl="auto"
1382 ;; 1397 ;;
1383esac 1398esac
1384 1399
@@ -1388,7 +1403,7 @@ requirements_libs_evas="${requirements_libs_evas} ${DLSYM_LIBS}"
1388if test "x${efl_func_dlsym}" = "xno" ; then 1403if test "x${efl_func_dlsym}" = "xno" ; then
1389 want_evas_engine_gl_xlib="no" 1404 want_evas_engine_gl_xlib="no"
1390 want_evas_engine_gl_xcb="no" 1405 want_evas_engine_gl_xcb="no"
1391 want_evas_engine_gl_sdl="no" 1406 want_gl_sdl="no"
1392fi 1407fi
1393 1408
1394### Checks for programs 1409### Checks for programs
@@ -1470,7 +1485,7 @@ EVAS_ENGINE([wayland-shm], [${want_wayland}])
1470 1485
1471# XXX TODO: 1486# XXX TODO:
1472EVAS_CHECK_ENGINE([gl-cocoa], [${want_evas_engine_gl_cocoa}], [no], [OpenGL Cocoa]) 1487EVAS_CHECK_ENGINE([gl-cocoa], [${want_evas_engine_gl_cocoa}], [no], [OpenGL Cocoa])
1473EVAS_CHECK_ENGINE([gl-sdl], [${want_evas_engine_gl_sdl}], [no], [OpenGL SDL]) 1488EVAS_CHECK_ENGINE([gl-sdl], [${want_gl_sdl}], [no], [OpenGL SDL])
1474EVAS_CHECK_ENGINE([software-gdi], [${want_evas_engine_software_gdi}], [no], [Software GDI]) 1489EVAS_CHECK_ENGINE([software-gdi], [${want_evas_engine_software_gdi}], [no], [Software GDI])
1475EVAS_CHECK_ENGINE([software-ddraw], [${want_evas_engine_software_ddraw}], [no], [Software DirectDraw]) 1490EVAS_CHECK_ENGINE([software-ddraw], [${want_evas_engine_software_ddraw}], [no], [Software DirectDraw])
1476EVAS_CHECK_ENGINE([wayland-egl], [${want_evas_engine_wayland_egl}], [no], [Wayland Egl]) 1491EVAS_CHECK_ENGINE([wayland-egl], [${want_evas_engine_wayland_egl}], [no], [Wayland Egl])
@@ -3320,13 +3335,8 @@ want_ecore_evas_opengl_x11="no"
3320want_ecore_evas_software_xcb="no" 3335want_ecore_evas_software_xcb="no"
3321want_ecore_evas_software_gdi="no" 3336want_ecore_evas_software_gdi="no"
3322want_ecore_evas_software_ddraw="no" 3337want_ecore_evas_software_ddraw="no"
3323want_ecore_evas_software_sdl="no"
3324want_ecore_evas_gl_sdl="no"
3325want_ecore_evas_gl_cocoa="no" 3338want_ecore_evas_gl_cocoa="no"
3326want_ecore_evas_fb="no"
3327want_ecore_evas_ews="yes"
3328want_ecore_evas_extn="yes" 3339want_ecore_evas_extn="yes"
3329want_ecore_evas_wayland_shm="no"
3330want_ecore_evas_wayland_egl="no" 3340want_ecore_evas_wayland_egl="no"
3331 3341
3332case "$host_os" in 3342case "$host_os" in
@@ -3336,25 +3346,16 @@ case "$host_os" in
3336 mingw*) 3346 mingw*)
3337 want_ecore_evas_software_gdi="yes" 3347 want_ecore_evas_software_gdi="yes"
3338 want_ecore_evas_software_ddraw="yes" 3348 want_ecore_evas_software_ddraw="yes"
3339 want_ecore_evas_software_sdl="yes"
3340 want_ecore_evas_gl_sdl="yes"
3341 want_ecore_evas_extn="no" 3349 want_ecore_evas_extn="no"
3342 ;; 3350 ;;
3343 darwin*) 3351 darwin*)
3344 want_ecore_evas_software_sdl="yes"
3345 want_ecore_evas_gl_sdl="yes"
3346 want_ecore_evas_gl_cocoa="yes" 3352 want_ecore_evas_gl_cocoa="yes"
3347 ;; 3353 ;;
3348 *) 3354 *)
3349 want_ecore_evas_software_x11="yes" 3355 want_ecore_evas_software_x11="yes"
3350 want_ecore_evas_opengl_x11="yes" 3356 want_ecore_evas_opengl_x11="yes"
3351 want_ecore_evas_software_xcb="no" 3357 want_ecore_evas_software_xcb="no"
3352 want_ecore_evas_software_sdl="yes"
3353 want_ecore_evas_gl_sdl="yes"
3354 want_ecore_evas_gl_cocoa="no" 3358 want_ecore_evas_gl_cocoa="no"
3355 want_ecore_evas_fb="yes"
3356 want_ecore_evas_wayland_shm="yes"
3357 want_ecore_evas_wayland_egl="yes"
3358 ;; 3359 ;;
3359esac 3360esac
3360 3361
@@ -3375,17 +3376,43 @@ ECORE_EVAS_MODULE([psl1ght], [${have_ps3}])
3375 3376
3376# XXX TODO: 3377# XXX TODO:
3377ECORE_EVAS_MODULE([opengl-cocoa], [${want_ecore_evas_gl_cocoa}]) 3378ECORE_EVAS_MODULE([opengl-cocoa], [${want_ecore_evas_gl_cocoa}])
3378ECORE_EVAS_MODULE([software-sdl], [${want_ecore_evas_software_sdl}]) 3379
3379ECORE_EVAS_MODULE([opengl-sdl], [${want_ecore_evas_gl_sdl}]) 3380ECORE_EVAS_MODULE([software-sdl], [${want_sdl}])
3380ECORE_EVAS_MODULE([wayland-shm], [${want_ecore_evas_wayland_shm}]) 3381ECORE_EVAS_MODULE([opengl-sdl], [${want_gl_sdl}])
3382
3383build_ecore_evas_sdl="no"
3384if test "x${have_ecore_evas_software_sdl}" = "xyes" || \
3385 test "x${have_ecore_evas_opengl_sdl}" = "xyes" ; then
3386 build_ecore_evas_sdl="yes"
3387 AC_DEFINE(BUILD_ECORE_EVAS_SDL, 1, [Support for SDL Engine in Ecore_Evas])
3388fi
3389AM_CONDITIONAL([BUILD_ECORE_EVAS_SDL],
3390 [test "${build_ecore_evas_sdl}" = "yes"])
3391
3392ECORE_EVAS_MODULE([wayland-shm], [${want_wayland}])
3393# XXX TODO want_ecore_evas_wayland_egl
3381ECORE_EVAS_MODULE([wayland-egl], [${want_ecore_evas_wayland_egl}]) 3394ECORE_EVAS_MODULE([wayland-egl], [${want_ecore_evas_wayland_egl}])
3395
3396build_ecore_evas_wayland="no"
3397if test "x${have_ecore_evas_wayland_shm}" = "xyes" || \
3398 test "x${have_ecore_evas_wayland_egl}" = "xyes" ; then
3399 build_ecore_evas_wayland="yes"
3400 AC_DEFINE(BUILD_ECORE_EVAS_WAYLAND, 1, [Support for Wayland Engine in Ecore_Evas])
3401fi
3402AM_CONDITIONAL([BUILD_ECORE_EVAS_WAYLAND],
3403 [test "${build_ecore_evas_wayland}" = "yes"])
3404
3382ECORE_EVAS_MODULE([software-gdi], [${want_ecore_evas_software_gdi}]) 3405ECORE_EVAS_MODULE([software-gdi], [${want_ecore_evas_software_gdi}])
3383ECORE_EVAS_MODULE([software-ddraw], [${want_ecore_evas_software_ddraw}]) 3406ECORE_EVAS_MODULE([software-ddraw], [${want_ecore_evas_software_ddraw}])
3384 3407
3408build_ecore_evas_win32="no"
3385if test "x${have_ecore_evas_software_gdi}" = "xyes" || \ 3409if test "x${have_ecore_evas_software_gdi}" = "xyes" || \
3386 test "x${have_ecore_evas_software_ddraw}" = "xyes" ; then 3410 test "x${have_ecore_evas_software_ddraw}" = "xyes" ; then
3411 build_ecore_evas_win32="yes"
3387 AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas]) 3412 AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas])
3388fi 3413fi
3414AM_CONDITIONAL([BUILD_ECORE_EVAS_WIN32],
3415 [test "${build_ecore_evas_win32}" = "yes"])
3389 3416
3390# XXX TODO: ecore_evas_extn 3417# XXX TODO: ecore_evas_extn
3391 3418
@@ -3466,11 +3493,14 @@ if test "x${have_ecore_evas_opengl_x11}" = "xyes" || test "x${have_ecore_evas_op
3466 fi 3493 fi
3467fi 3494fi
3468 3495
3496build_ecore_evas_x11="no"
3469if test "x$have_ecore_evas_software_x11" = "xyes" || \ 3497if test "x$have_ecore_evas_software_x11" = "xyes" || \
3470 test "x$have_ecore_evas_opengl_x11" = "xyes" || \ 3498 test "x$have_ecore_evas_opengl_x11" = "xyes" || \
3471 test "x$have_ecore_evas_software_xcb" = "xyes"; then 3499 test "x$have_ecore_evas_software_xcb" = "xyes"; then
3472 AC_DEFINE([BUILD_ECORE_EVAS_X11], [1], [Support for X Window Engines in Ecore_Evas]) 3500 AC_DEFINE([BUILD_ECORE_EVAS_X11], [1], [Support for X Window Engines in Ecore_Evas])
3501 build_ecore_evas_x11="yes"
3473fi 3502fi
3503AM_CONDITIONAL([BUILD_ECORE_EVAS_X11], [test "${build_ecore_evas_x11}" = "yes"])
3474 3504
3475if test "x${requirements_pc_deps_ecore_evas}" = "x" ; then 3505if test "x${requirements_pc_deps_ecore_evas}" = "x" ; then
3476 ECORE_EVAS_CFLAGS="" 3506 ECORE_EVAS_CFLAGS=""
diff --git a/m4/ecore_check_module.m4 b/m4/ecore_check_module.m4
index 2ceda79441..554992d1b7 100644
--- a/m4/ecore_check_module.m4
+++ b/m4/ecore_check_module.m4
@@ -108,6 +108,8 @@ fi
108AC_MSG_CHECKING([whether ecore_evas $4 support is built]) 108AC_MSG_CHECKING([whether ecore_evas $4 support is built])
109AC_MSG_RESULT([$have_ecore_evas_]m4_defn([DOWN])) 109AC_MSG_RESULT([$have_ecore_evas_]m4_defn([DOWN]))
110 110
111AM_CONDITIONAL([BUILD_ECORE_EVAS_]UP, [test "x$have_ecore_evas_]m4_defn([DOWN])[" = "xyes"])
112
111AS_IF([test "x$have_ecore_evas_[]m4_defn([DOWN])" = "xyes"], [$6], [$7]) 113AS_IF([test "x$have_ecore_evas_[]m4_defn([DOWN])" = "xyes"], [$6], [$7])
112 114
113m4_popdef([UP]) 115m4_popdef([UP])
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index 0735eeb8cd..edc168f576 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -60,7 +60,7 @@ lib_ecore_evas_libecore_evas_la_LDFLAGS = -no-undefined -version-info @version_i
60 60
61# Engines 61# Engines
62 62
63if BUILD_ENGINE_BUFFER 63if BUILD_ECORE_EVAS_BUFFER
64BUFFERSOURCES = \ 64BUFFERSOURCES = \
65modules/ecore_evas/engines/buffer/ecore_evas_buffer.c \ 65modules/ecore_evas/engines/buffer/ecore_evas_buffer.c \
66modules/ecore_evas/engines/buffer/ecore_evas_extn.c \ 66modules/ecore_evas/engines/buffer/ecore_evas_extn.c \
@@ -74,7 +74,7 @@ modules_ecore_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avo
74modules_ecore_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static 74modules_ecore_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static
75endif 75endif
76 76
77if HAVE_ECORE_X 77if BUILD_ECORE_EVAS_X11
78XSOURCES = modules/ecore_evas/engines/x/ecore_evas_x.c 78XSOURCES = modules/ecore_evas/engines/x/ecore_evas_x.c
79ecoreevasenginexpkgdir = $(libdir)/ecore_evas/engines/x/$(MODULE_ARCH) 79ecoreevasenginexpkgdir = $(libdir)/ecore_evas/engines/x/$(MODULE_ARCH)
80ecoreevasenginexpkg_LTLIBRARIES = modules/ecore_evas/engines/x/module.la 80ecoreevasenginexpkg_LTLIBRARIES = modules/ecore_evas/engines/x/module.la
@@ -94,7 +94,7 @@ modules_ecore_evas_engines_x_module_la_LDFLAGS = -no-undefined -module -avoid-ve
94modules_ecore_evas_engines_x_module_la_LIBTOOLFLAGS = --tag=disable-static 94modules_ecore_evas_engines_x_module_la_LIBTOOLFLAGS = --tag=disable-static
95endif 95endif
96 96
97if HAVE_ECORE_COCOA 97if BUILD_ECORE_EVAS_OPENGL_COCOA
98COCOASOURCES = modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c 98COCOASOURCES = modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
99ecoreevasenginecocoapkgdir = $(libdir)/ecore_evas/engines/cocoa/$(MODULE_ARCH) 99ecoreevasenginecocoapkgdir = $(libdir)/ecore_evas/engines/cocoa/$(MODULE_ARCH)
100ecoreevasenginecocoapkg_LTLIBRARIES = modules/ecore_evas/engines/cocoa/module.la 100ecoreevasenginecocoapkg_LTLIBRARIES = modules/ecore_evas/engines/cocoa/module.la
@@ -112,7 +112,7 @@ modules_ecore_evas_engines_cocoa_module_la_LDFLAGS = -no-undefined -module -avoi
112modules_ecore_evas_engines_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static 112modules_ecore_evas_engines_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static
113endif 113endif
114 114
115if HAVE_ECORE_FB 115if BUILD_ECORE_EVAS_FB
116FBSOURCES = modules/ecore_evas/engines/fb/ecore_evas_fb.c 116FBSOURCES = modules/ecore_evas/engines/fb/ecore_evas_fb.c
117ecoreevasenginefbpkgdir = $(libdir)/ecore_evas/engines/fb/$(MODULE_ARCH) 117ecoreevasenginefbpkgdir = $(libdir)/ecore_evas/engines/fb/$(MODULE_ARCH)
118ecoreevasenginefbpkg_LTLIBRARIES = modules/ecore_evas/engines/fb/module.la 118ecoreevasenginefbpkg_LTLIBRARIES = modules/ecore_evas/engines/fb/module.la
@@ -130,7 +130,7 @@ modules_ecore_evas_engines_fb_module_la_LDFLAGS = -no-undefined -module -avoid-v
130modules_ecore_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static 130modules_ecore_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static
131endif 131endif
132 132
133if HAVE_PS3 133if BUILD_ECORE_EVAS_PSL1GHT
134PSL1GHTSOURCES = modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c 134PSL1GHTSOURCES = modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
135ecoreevasenginepsl1ghtpkgdir = $(libdir)/ecore_evas/engines/psl1ght/$(MODULE_ARCH) 135ecoreevasenginepsl1ghtpkgdir = $(libdir)/ecore_evas/engines/psl1ght/$(MODULE_ARCH)
136ecoreevasenginepsl1ghtpkg_LTLIBRARIES = modules/ecore_evas/engines/psl1ght/module.la 136ecoreevasenginepsl1ghtpkg_LTLIBRARIES = modules/ecore_evas/engines/psl1ght/module.la
@@ -148,7 +148,7 @@ modules_ecore_evas_engines_psl1ght_module_la_LDFLAGS = -no-undefined -module -av
148modules_ecore_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static 148modules_ecore_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static
149endif 149endif
150 150
151if HAVE_ECORE_WAYLAND 151if BUILD_ECORE_EVAS_WAYLAND
152WAYLANDSOURCES = \ 152WAYLANDSOURCES = \
153modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c \ 153modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c \
154modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c \ 154modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c \
@@ -173,7 +173,7 @@ modules_ecore_evas_engines_wayland_module_la_LDFLAGS = -no-undefined -module -av
173modules_ecore_evas_engines_wayland_module_la_LIBTOOLFLAGS = --tag=disable-static 173modules_ecore_evas_engines_wayland_module_la_LIBTOOLFLAGS = --tag=disable-static
174endif 174endif
175 175
176if HAVE_ECORE_SDL 176if BUILD_ECORE_EVAS_SDL
177SDLSOURCES = \ 177SDLSOURCES = \
178modules/ecore_evas/engines/sdl/ecore_evas_sdl.c 178modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
179ecoreevasenginesdlpkgdir = $(libdir)/ecore_evas/engines/sdl/$(MODULE_ARCH) 179ecoreevasenginesdlpkgdir = $(libdir)/ecore_evas/engines/sdl/$(MODULE_ARCH)
@@ -192,7 +192,7 @@ modules_ecore_evas_engines_sdl_module_la_LDFLAGS = -no-undefined -module -avoid-
192modules_ecore_evas_engines_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static 192modules_ecore_evas_engines_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static
193endif 193endif
194 194
195if HAVE_WIN32 195if BUILD_ECORE_EVAS_WIN32
196WIN32SOURCES = \ 196WIN32SOURCES = \
197modules/ecore_evas/engines/win32/ecore_evas_win32.c 197modules/ecore_evas/engines/win32/ecore_evas_win32.c
198ecoreevasengineswin32pkgdir = $(libdir)/ecore_evas/engines/win32/$(MODULE_ARCH) 198ecoreevasengineswin32pkgdir = $(libdir)/ecore_evas/engines/win32/$(MODULE_ARCH)