jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6826ce1c6fa40a130cf51f4e751e98d3c56c1f85
commit 6826ce1c6fa40a130cf51f4e751e98d3c56c1f85
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Thu Apr 21 17:13:23 2016 +0900
Examples: Fix compilation (disable CXX examples!)
Warning: This disables CXX examples because they use
now-internal APIs that have no EO API binding.
Those examples should be updated to use Efl.Ui widgets... once
we have them.
---
src/examples/ecore/Makefile.am | 3 ++-
src/examples/ecore_avahi/Makefile.am | 3 ++-
src/examples/eio/Makefile.am | 3 ++-
src/examples/eolian_cxx/eolian_cxx_complex_types_01.cc | 9 +++++++--
src/examples/eolian_cxx/eolian_cxx_eo_events_01.cc | 12 +++++++++---
5 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/examples/ecore/Makefile.am b/src/examples/ecore/Makefile.am
index 379f5e0..270943f 100644
--- a/src/examples/ecore/Makefile.am
+++ b/src/examples/ecore/Makefile.am
@@ -1,11 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = \
--I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/eina \
-I$(top_srcdir)/src/lib/eet \
-I$(top_srcdir)/src/lib/emile \
-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_input \
@@ -20,6 +20,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src/lib/eet \
-I$(top_builddir)/src/lib/emile \
-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/efl \
-I$(top_builddir)/src/lib/evas \
-I$(top_builddir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore_file \
diff --git a/src/examples/ecore_avahi/Makefile.am
b/src/examples/ecore_avahi/Makefile.am
index 793f24b..a6c7677 100644
--- a/src/examples/ecore_avahi/Makefile.am
+++ b/src/examples/ecore_avahi/Makefile.am
@@ -1,13 +1,14 @@
MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = \
--I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/eina \
-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/efl \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_avahi\
-I$(top_builddir)/src/lib/eina \
-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/efl \
-I$(top_builddir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore_avahi \
@AVAHI_CLIENT_CFLAGS@
diff --git a/src/examples/eio/Makefile.am b/src/examples/eio/Makefile.am
index 4f5dbcd..53b95fe 100644
--- a/src/examples/eio/Makefile.am
+++ b/src/examples/eio/Makefile.am
@@ -1,7 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = \
--I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/efl \
-I$(top_srcdir)/src/lib/eina \
-I$(top_srcdir)/src/lib/emile \
-I$(top_srcdir)/src/lib/eo \
@@ -11,6 +11,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src/lib/eina \
-I$(top_builddir)/src/lib/emile \
-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/efl \
-I$(top_builddir)/src/lib/eet \
-I$(top_builddir)/src/lib/ecore \
-I$(top_builddir)/src/lib/eio
diff --git a/src/examples/eolian_cxx/eolian_cxx_complex_types_01.cc
b/src/examples/eolian_cxx/eolian_cxx_complex_types_01.cc
index a66244f..04ed7fe 100644
--- a/src/examples/eolian_cxx/eolian_cxx_complex_types_01.cc
+++ b/src/examples/eolian_cxx/eolian_cxx_complex_types_01.cc
@@ -17,12 +17,14 @@
#include <Ecore.hh>
#include <Evas.hh>
+#warning TEST CASE DISABLED: EVAS TYPES NO MORE IN EO API
+
+#if 0
#include <canvas/evas_canvas.eo.hh>
#include <canvas/evas_text.eo.hh>
#include <canvas/evas_rectangle.eo.hh>
#include <canvas/evas_zoomable_interface.eo.hh>
-
-#include "../../lib/evas/canvas/evas_grid.eo.hh"
+#include <canvas/evas_grid.eo.hh>
namespace efl { namespace evas { // XXX only while we don't have namespaces in
EFL
using ::evas::canvas;
@@ -118,4 +120,7 @@ int main()
return 0;
}
+#else
+int main() { abort(); }
+#endif
diff --git a/src/examples/eolian_cxx/eolian_cxx_eo_events_01.cc
b/src/examples/eolian_cxx/eolian_cxx_eo_events_01.cc
index 0ecbdda..2ecdb03 100644
--- a/src/examples/eolian_cxx/eolian_cxx_eo_events_01.cc
+++ b/src/examples/eolian_cxx/eolian_cxx_eo_events_01.cc
@@ -17,11 +17,13 @@
#include <Ecore.hh>
#include <Evas.hh>
+#warning TEST CASE DISABLED: EVAS TYPES NO MORE IN EO API
+
+#if 0
#include <canvas/evas_canvas.eo.hh>
#include <canvas/evas_image.eo.hh>
-
-#include "../../lib/evas/canvas/evas_text.eo.hh"
-#include "../../lib/evas/canvas/evas_grid.eo.hh"
+#include <canvas/evas_text.eo.hh>
+#include <canvas/evas_grid.eo.hh>
namespace efl { namespace evas {
using ::evas::canvas;
@@ -101,3 +103,7 @@ int main()
return 0;
}
+#else
+int main() { abort(); }
+#endif
+
--
