summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2018-03-12 14:48:50 +0100
committerBoris Faure <billiob@gmail.com>2018-03-12 15:00:08 +0100
commitbf110393b69954c0a172b0e1f8865aac59606da5 (patch)
treeb9e48554fccc1e5a3a9f41a0d6fb0e6afe7d7074
parent0a0f3605e414cf8c5d2db4655a2de9dec2a2c059 (diff)
meson: detect 'offscale' support in edje_cc. Closes T6770
-rw-r--r--data/test_offscale.edc11
-rw-r--r--data/themes/default.edc6
-rw-r--r--data/themes/meson.build1
-rw-r--r--meson.build9
4 files changed, 27 insertions, 0 deletions
diff --git a/data/test_offscale.edc b/data/test_offscale.edc
new file mode 100644
index 0000000..78a8d05
--- /dev/null
+++ b/data/test_offscale.edc
@@ -0,0 +1,11 @@
1collections {
2 group { name: "offscale_test";
3 parts {
4 part { name: "offscale_part";
5 description { state: "default" 0.0;
6 offscale;
7 }
8 }
9 }
10 }
11}
diff --git a/data/themes/default.edc b/data/themes/default.edc
index ba4e90d..715f931 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -697,7 +697,9 @@ collections {
697 rel.to: "sendfile_request_bg"; 697 rel.to: "sendfile_request_bg";
698 rel1.offset: 4 4; 698 rel1.offset: 4 4;
699 rel2.offset: -5 -5; 699 rel2.offset: -5 -5;
700#if HAS_OFFSCALE
700 offscale; 701 offscale;
702#endif
701 } 703 }
702 description { state: "on" 0.0; 704 description { state: "on" 0.0;
703 inherit: "default" 0.0; 705 inherit: "default" 0.0;
@@ -767,7 +769,9 @@ collections {
767 rel.to: "terminology.sendfile.progress"; 769 rel.to: "terminology.sendfile.progress";
768 rel1.offset: -4 -4; 770 rel1.offset: -4 -4;
769 rel2.offset: 4 4; 771 rel2.offset: 4 4;
772#if HAS_OFFSCALE
770 offscale; 773 offscale;
774#endif
771 } 775 }
772 } 776 }
773 part { name: "terminology.sendfile.progress"; type: SWALLOW; 777 part { name: "terminology.sendfile.progress"; type: SWALLOW;
@@ -779,7 +783,9 @@ collections {
779 rel2.relative: 1.0 0.0; 783 rel2.relative: 1.0 0.0;
780 rel2.offset: -5 -5; 784 rel2.offset: -5 -5;
781 align: 0.5 1.0; 785 align: 0.5 1.0;
786#if HAS_OFFSCALE
782 offscale; 787 offscale;
788#endif
783 } 789 }
784 description { state: "on" 0.0; 790 description { state: "on" 0.0;
785 inherit: "default" 0.0; 791 inherit: "default" 0.0;
diff --git a/data/themes/meson.build b/data/themes/meson.build
index 4397d72..4eeaa68 100644
--- a/data/themes/meson.build
+++ b/data/themes/meson.build
@@ -1,4 +1,5 @@
1command = [edje_cc, 1command = [edje_cc,
2 edje_offscale,
2 '-id', join_paths(meson.source_root(), 'data', 'themes', 'images'), 3 '-id', join_paths(meson.source_root(), 'data', 'themes', 'images'),
3 '-fd', join_paths(meson.source_root(), 'data', 'fonts'), 4 '-fd', join_paths(meson.source_root(), 'data', 'fonts'),
4 '-sd', join_paths(meson.source_root(), 'data', 'themes', 'sounds'), 5 '-sd', join_paths(meson.source_root(), 'data', 'themes', 'sounds'),
diff --git a/meson.build b/meson.build
index bf7df38..0459805 100644
--- a/meson.build
+++ b/meson.build
@@ -97,6 +97,15 @@ if edje_cc == ''
97 edje_cc = edje_cc_path 97 edje_cc = edje_cc_path
98endif 98endif
99 99
100res = run_command(edje_cc, meson.current_source_dir() + '/data/test_offscale.edc')
101if res.returncode() == 0
102 message('edje_cc has support for offscale')
103 edje_offscale='-DHAS_OFFSCALE=1'
104else
105 message('edje_cc does not have support for offscale')
106 edje_offscale='-DHAS_OFFSCALE=0'
107endif
108
100fuzzing = get_option('fuzzing') 109fuzzing = get_option('fuzzing')
101 110
102if fuzzing 111if fuzzing