summaryrefslogtreecommitdiff
path: root/unsorted
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-08-21 15:07:40 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-08-21 15:46:58 -0400
commitbf52453fc49d031825076df0b11f493e9e0dd148 (patch)
tree4efbf8216070ca2ef1e7a0e7313b039d1f30c32a /unsorted
parent3671163a5817f365f7f0af2f8649b323f1169b10 (diff)
sync edje examples build with current efl tree build
Diffstat (limited to 'unsorted')
-rw-r--r--unsorted/edje/Makefile.examples135
-rw-r--r--unsorted/edje/edje-focus.c2
-rw-r--r--unsorted/edje/edje-multiseat-custom-names.c2
-rw-r--r--unsorted/edje/edje-multiseat-filter.c2
-rw-r--r--unsorted/edje/edje-multiseat.c2
5 files changed, 89 insertions, 54 deletions
diff --git a/unsorted/edje/Makefile.examples b/unsorted/edje/Makefile.examples
index ad1c59c8..10abacd2 100644
--- a/unsorted/edje/Makefile.examples
+++ b/unsorted/edje/Makefile.examples
@@ -3,38 +3,54 @@ EDJE_CC=edje_cc
3EDJE_CODEGEN=edje_codegen 3EDJE_CODEGEN=edje_codegen
4COMMON_FLAGS=`pkg-config --libs --cflags eina,ecore,evas,ecore-evas,edje` 4COMMON_FLAGS=`pkg-config --libs --cflags eina,ecore,evas,ecore-evas,edje`
5 5
6EDJE_OBJS= animations.edj \ 6EDJE_OBJS= \
7 animations2.edj \ 7animations.edj \
8 basic.edj \ 8animations2.edj \
9 basic2.edj \ 9basic.edj \
10 box.edj \ 10basic2.edj \
11 codegen.edj \ 11bezier-transition-example.edj \
12 color-class.edj \ 12box.edj \
13 drag.edj \ 13box_example.edj \
14 edje_example.edj \ 14codegen.edj \
15 edje-nested.edj \ 15color-class.edj \
16 embryo_custom_state.edj \ 16drag.edj \
17 embryo_pong.edj \ 17dynamic_multiseat.edj \
18 embryo_run_program.edj \ 18edje-anchors.edj \
19 embryo_set_state.edj \ 19edje-group.edj \
20 embryo_set_text.edj \ 20edje-map-color.edj \
21 embryo_timer.edj \ 21edje-nested.edj \
22 external_elm_anchorblock.edj \ 22edje-threshold.edj \
23 external_elm_button.edj \ 23edje_example.edj \
24 external_elm_check.edj \ 24embryo_custom_state.edj \
25 external_elm_panes.edj \ 25embryo_pong.edj \
26 external_emotion_elm.edj \ 26embryo_run_program.edj \
27 lua_script.edj \ 27embryo_set_state.edj \
28 messages_echo.edj \ 28embryo_set_state_anim.edj \
29 multisense.edj \ 29embryo_set_text.edj \
30 perspective.edj \ 30embryo_timer.edj \
31 signalsBubble.edj \ 31embryo_tween_anim.edj \
32 signals-messages.edj \ 32entry.edj \
33 sigtest.edj \ 33external_elm_anchorblock.edj \
34 swallow.edj \ 34external_elm_button.edj \
35 table.edj \ 35external_elm_check.edj \
36 text.edj \ 36external_elm_panes.edj \
37 toggle_using_filter.edj 37external_emotion_elm.edj \
38focus.edj \
39lua_script.edj \
40messages_echo.edj \
41multiseat.edj \
42multiseat_custom_names.edj \
43multiseat_filter.edj \
44perspective.edj \
45signals-messages.edj \
46signalsBubble.edj \
47sigtest.edj \
48svg.edj \
49swallow.edj \
50table.edj \
51text.edj \
52textblock-hyphen.edj \
53toggle_using_filter.edj
38 54
39PHYSICS_OBJS = \ 55PHYSICS_OBJS = \
40 physics_3d.edj \ 56 physics_3d.edj \
@@ -45,24 +61,35 @@ PHYSICS_OBJS = \
45 physics_soft_bodies.edj 61 physics_soft_bodies.edj
46 62
47 63
48EXAMPLES= animations2 \ 64EXAMPLES = \
49 edje-animations \ 65animations2 \
50 edje-basic \ 66edje-anchors \
51 edje-basic2 \ 67edje-animations \
52 edje-box \ 68edje-basic \
53 edje-box2 \ 69edje-basic2 \
54 edje-color-class \ 70edje-box \
55 edje-drag \ 71edje-box2 \
56 edje_example \ 72edje-color-class \
57 edje-multisense \ 73edje-drag \
58 edje-perspective \ 74edje-dynamic-multiseat \
59 edje-signals-messages \ 75edje-edit-part-box \
60 edje-swallow \ 76edje-entry \
61 edje-swallow2 \ 77edje-focus \
62 edje-table \ 78edje-multiseat \
63 edje-text \ 79edje-multiseat-custom-names \
64 signals2 \ 80edje-multiseat-filter \
65 sigtest 81edje-multisense \
82edje-perspective \
83edje-signals-messages \
84edje-swallow \
85edje-swallow2 \
86edje-table \
87edje-text \
88edje-textblock-hyphenation \
89edje_example \
90signals2 \
91sigtest \
92svg-test
66 93
67all: edje examples edje-codegen-example 94all: edje examples edje-codegen-example
68physics-edje: $(PHYSICS_OBJS) 95physics-edje: $(PHYSICS_OBJS)
@@ -70,10 +97,7 @@ edje: $(EDJE_OBJS)
70examples: $(EXAMPLES) 97examples: $(EXAMPLES)
71 98
72%.edj: %.edc 99%.edj: %.edc
73 $(EDJE_CC) -md . $< 100 $(EDJE_CC) -beta -md . $<
74
75$(EXAMPLES):
76 $(CC) -o $@ $@.c $(COMMON_FLAGS)
77 101
78codegen: 102codegen:
79 $(EDJE_CODEGEN) --prefix=codegen_example codegen.edj example_group codegen_example_generated.c codegen_example_generated.h 103 $(EDJE_CODEGEN) --prefix=codegen_example codegen.edj example_group codegen_example_generated.c codegen_example_generated.h
@@ -81,6 +105,9 @@ codegen:
81edje-codegen-example: codegen 105edje-codegen-example: codegen
82 $(CC) -o edje-codegen-example codegen_example_generated.c edje-codegen-example.c $(COMMON_FLAGS) 106 $(CC) -o edje-codegen-example codegen_example_generated.c edje-codegen-example.c $(COMMON_FLAGS)
83 107
108$(EXAMPLES): edje-codegen-example
109 $(CC) -o $@ $@.c $(COMMON_FLAGS)
110
84clean: 111clean:
85 @echo "Cleaning up built objects..." 112 @echo "Cleaning up built objects..."
86 @rm -Rf $(EXAMPLES) *.edj edje-codegen-example 113 @rm -Rf $(EXAMPLES) *.edj edje-codegen-example
diff --git a/unsorted/edje/edje-focus.c b/unsorted/edje/edje-focus.c
index 5d9b6337..ae99f979 100644
--- a/unsorted/edje/edje-focus.c
+++ b/unsorted/edje/edje-focus.c
@@ -10,6 +10,8 @@
10# include "config.h" 10# include "config.h"
11#else 11#else
12# define EINA_UNUSED 12# define EINA_UNUSED
13# define EFL_BETA_API_SUPPORT
14# define EFL_EO_API_SUPPORT
13#endif 15#endif
14 16
15#ifndef PACKAGE_DATA_DIR 17#ifndef PACKAGE_DATA_DIR
diff --git a/unsorted/edje/edje-multiseat-custom-names.c b/unsorted/edje/edje-multiseat-custom-names.c
index 9da96b83..53fb5425 100644
--- a/unsorted/edje/edje-multiseat-custom-names.c
+++ b/unsorted/edje/edje-multiseat-custom-names.c
@@ -10,6 +10,8 @@
10# include "config.h" 10# include "config.h"
11#else 11#else
12# define EINA_UNUSED 12# define EINA_UNUSED
13# define EFL_BETA_API_SUPPORT
14# define EFL_EO_API_SUPPORT
13#endif 15#endif
14 16
15#ifndef PACKAGE_DATA_DIR 17#ifndef PACKAGE_DATA_DIR
diff --git a/unsorted/edje/edje-multiseat-filter.c b/unsorted/edje/edje-multiseat-filter.c
index 92a7e7c7..89e37f06 100644
--- a/unsorted/edje/edje-multiseat-filter.c
+++ b/unsorted/edje/edje-multiseat-filter.c
@@ -21,6 +21,8 @@
21# include "config.h" 21# include "config.h"
22#else 22#else
23# define EINA_UNUSED 23# define EINA_UNUSED
24# define EFL_BETA_API_SUPPORT
25# define EFL_EO_API_SUPPORT
24#endif 26#endif
25 27
26#ifndef PACKAGE_DATA_DIR 28#ifndef PACKAGE_DATA_DIR
diff --git a/unsorted/edje/edje-multiseat.c b/unsorted/edje/edje-multiseat.c
index 18abfec7..082e5d1e 100644
--- a/unsorted/edje/edje-multiseat.c
+++ b/unsorted/edje/edje-multiseat.c
@@ -15,6 +15,8 @@
15# include "config.h" 15# include "config.h"
16#else 16#else
17# define EINA_UNUSED 17# define EINA_UNUSED
18# define EFL_BETA_API_SUPPORT
19# define EFL_EO_API_SUPPORT
18#endif 20#endif
19 21
20#ifndef PACKAGE_DATA_DIR 22#ifndef PACKAGE_DATA_DIR