summaryrefslogtreecommitdiff
path: root/unsorted
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-08-09 18:15:52 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-08-10 09:38:12 -0400
commitfa5d7f80c510050384fd4c685b50aec37128d14e (patch)
treef36dbc49da5507c12b946b3af5b53d2d1821f587 /unsorted
parentfabab68024619b066d79bdaff0c85d2aeeedb83a (diff)
fix some example builds
Diffstat (limited to 'unsorted')
-rw-r--r--unsorted/Makefile25
-rw-r--r--unsorted/ecore/Makefile.examples15
-rw-r--r--unsorted/ecore_avahi/Makefile.examples16
-rw-r--r--unsorted/edje/Makefile.examples18
-rw-r--r--unsorted/emotion/Makefile.examples2
-rw-r--r--unsorted/evas/evas-hints.c5
6 files changed, 57 insertions, 24 deletions
diff --git a/unsorted/Makefile b/unsorted/Makefile
new file mode 100644
index 00000000..65fd9751
--- /dev/null
+++ b/unsorted/Makefile
@@ -0,0 +1,25 @@
1EXAMPLES_SUBDIRS = \
2ecore_avahi \
3ecore \
4edje \
5eet \
6eina \
7eio \
8eldbus \
9elocation \
10emile \
11emotion \
12ethumb_client \
13evas
14
15
16# eolian_cxx broken for now T7273
17
18all:
19 for d in $(EXAMPLES_SUBDIRS); do \
20 echo "Making examples in $$d"; \
21 $(MAKE) $(AM_MAKEFLAGS) -C $$d -f Makefile.examples || exit 1; \
22 done
23
24clean:
25 git clean -dxf .
diff --git a/unsorted/ecore/Makefile.examples b/unsorted/ecore/Makefile.examples
index 63e5f6b7..68d30678 100644
--- a/unsorted/ecore/Makefile.examples
+++ b/unsorted/ecore/Makefile.examples
@@ -1,18 +1,12 @@
1CC=gcc 1CC=gcc
2 2
3if HAVE_GSTREAMER_1 3GSTREAMER_DEP="gstreamer-1.0"
4 GSTREAMER_DEP="gstreamer-1.0" 4# GSTREAMER_DEP="gstreamer-0.10"
5else
6 GSTREAMER_DEP="gstreamer-0.10"
7endif
8 5
9COMMON_FLAGS=`pkg-config --libs --cflags eina,ecore,evas,ecore-evas,ecore-audio,ecore-con,ecore-file, \ 6COMMON_FLAGS=`pkg-config --libs --cflags eina,ecore,evas,ecore-evas,ecore-con,ecore-file, \
10 eo,evas-software-buffer,gnutls,ecore-imf,ecore-imf-evas,$(GSTREAMER_DEP)` -lm 7 eo,evas-software-buffer,ecore-imf,ecore-imf-evas,$(GSTREAMER_DEP)` -lm
11 8
12EXAMPLES= ecore_animator_example \ 9EXAMPLES= ecore_animator_example \
13 ecore_audio_custom \
14 ecore_audio_playback \
15 ecore_audio_to_ogg \
16 ecore_client_bench \ 10 ecore_client_bench \
17 ecore_con_client_example \ 11 ecore_con_client_example \
18 ecore_con_client_simple_example \ 12 ecore_con_client_simple_example \
@@ -35,7 +29,6 @@ EXAMPLES= ecore_animator_example \
35 ecore_exe_example \ 29 ecore_exe_example \
36 ecore_exe_example_child \ 30 ecore_exe_example_child \
37 ecore_fd_handler_example \ 31 ecore_fd_handler_example \
38 ecore_fd_handler_gnutls_example \
39 ecore_file_download_example \ 32 ecore_file_download_example \
40 ecore_idler_example \ 33 ecore_idler_example \
41 ecore_imf_example \ 34 ecore_imf_example \
diff --git a/unsorted/ecore_avahi/Makefile.examples b/unsorted/ecore_avahi/Makefile.examples
new file mode 100644
index 00000000..b53ae3f2
--- /dev/null
+++ b/unsorted/ecore_avahi/Makefile.examples
@@ -0,0 +1,16 @@
1CC=gcc
2COMMON_FLAGS=`pkg-config --libs --cflags eina,ecore,ecore-avahi`
3
4EXAMPLES= \
5ecore_avahi_browse_example \
6ecore_avahi_example
7
8all: examples
9examples: $(EXAMPLES)
10
11$(EXAMPLES):
12 $(CC) -o $@ $@.c $(COMMON_FLAGS)
13
14clean:
15 @echo "Cleaning up built objects..."
16 @rm -Rf $(EXAMPLES)
diff --git a/unsorted/edje/Makefile.examples b/unsorted/edje/Makefile.examples
index 8d734949..ad1c59c8 100644
--- a/unsorted/edje/Makefile.examples
+++ b/unsorted/edje/Makefile.examples
@@ -28,12 +28,6 @@ EDJE_OBJS= animations.edj \
28 messages_echo.edj \ 28 messages_echo.edj \
29 multisense.edj \ 29 multisense.edj \
30 perspective.edj \ 30 perspective.edj \
31 physics_3d.edj \
32 physics_actions.edj \
33 physics_backcull.edj \
34 physics_basic.edj \
35 physics_complex.edj \
36 physics_soft_bodies.edj \
37 signalsBubble.edj \ 31 signalsBubble.edj \
38 signals-messages.edj \ 32 signals-messages.edj \
39 sigtest.edj \ 33 sigtest.edj \
@@ -42,6 +36,15 @@ EDJE_OBJS= animations.edj \
42 text.edj \ 36 text.edj \
43 toggle_using_filter.edj 37 toggle_using_filter.edj
44 38
39PHYSICS_OBJS = \
40 physics_3d.edj \
41 physics_actions.edj \
42 physics_backcull.edj \
43 physics_basic.edj \
44 physics_complex.edj \
45 physics_soft_bodies.edj
46
47
45EXAMPLES= animations2 \ 48EXAMPLES= animations2 \
46 edje-animations \ 49 edje-animations \
47 edje-basic \ 50 edje-basic \
@@ -62,11 +65,12 @@ EXAMPLES= animations2 \
62 sigtest 65 sigtest
63 66
64all: edje examples edje-codegen-example 67all: edje examples edje-codegen-example
68physics-edje: $(PHYSICS_OBJS)
65edje: $(EDJE_OBJS) 69edje: $(EDJE_OBJS)
66examples: $(EXAMPLES) 70examples: $(EXAMPLES)
67 71
68%.edj: %.edc 72%.edj: %.edc
69 $(EDJE_CC) $< 73 $(EDJE_CC) -md . $<
70 74
71$(EXAMPLES): 75$(EXAMPLES):
72 $(CC) -o $@ $@.c $(COMMON_FLAGS) 76 $(CC) -o $@ $@.c $(COMMON_FLAGS)
diff --git a/unsorted/emotion/Makefile.examples b/unsorted/emotion/Makefile.examples
index e97882d8..b890993a 100644
--- a/unsorted/emotion/Makefile.examples
+++ b/unsorted/emotion/Makefile.examples
@@ -1,5 +1,5 @@
1CC=gcc 1CC=gcc
2COMMON_FLAGS=`pkg-config --libs --cflags eina,ecore,evas,ecore-evas,emotion` 2COMMON_FLAGS=`pkg-config --libs --cflags eo,eina,ecore,evas,ecore-evas,emotion`
3 3
4EXAMPLES= emotion_basic_example \ 4EXAMPLES= emotion_basic_example \
5 emotion_border_example \ 5 emotion_border_example \
diff --git a/unsorted/evas/evas-hints.c b/unsorted/evas/evas-hints.c
index d5f1d37b..dc6e3b66 100644
--- a/unsorted/evas/evas-hints.c
+++ b/unsorted/evas/evas-hints.c
@@ -112,17 +112,12 @@ static void
112_print_rect_stats(Evas_Object *rect) 112_print_rect_stats(Evas_Object *rect)
113{ 113{
114 Evas_Coord w, h, l, r, t, b; 114 Evas_Coord w, h, l, r, t, b;
115 Eina_Size2D cmin;
116 double x, y; 115 double x, y;
117 116
118 evas_object_size_hint_align_get(rect, &x, &y); 117 evas_object_size_hint_align_get(rect, &x, &y);
119 printf("\talign hints: h(%f), v(%f)\n", 118 printf("\talign hints: h(%f), v(%f)\n",
120 x, y); 119 x, y);
121 120
122 cmin = efl_gfx_size_hint_combined_min_get(rect);
123 printf("\tmin. size hints: h(%d), v(%d)\n",
124 cmin.w, cmin.h);
125
126 evas_object_size_hint_max_get(rect, &w, &h); 121 evas_object_size_hint_max_get(rect, &w, &h);
127 printf("\tmax. size hints: h(%d), v(%d)\n", 122 printf("\tmax. size hints: h(%d), v(%d)\n",
128 w, h); 123 w, h);