diff options
| author | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-03-18 12:37:28 +0100 |
|---|---|---|
| committer | Xavi Artigas <xavierartigas@yahoo.es> | 2019-03-18 12:40:07 +0100 |
| commit | 09dd53d576bb58222b8591a728070aab407c8288 (patch) | |
| tree | 3e0e804fb5723a57abb80a5a3f416be214f6fd4d /src/examples | |
| parent | ff3d378334f6d5906b04ef285b8cd0f13d77c4d4 (diff) | |
| download | efl-09dd53d576bb58222b8591a728070aab407c8288.tar.gz | |
edje-swallow2: differeniate between build dir and source dir
Summary:
the source dir is used for the bubble.png file, the rest is coming from
the actaull build dir
Depends on D8377
Reviewers: cedric, segfaultxavi, zmike, stefan_schmidt
Reviewed By: segfaultxavi
Subscribers: #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D8378
Diffstat (limited to 'src/examples')
| -rw-r--r-- | src/examples/edje/edje-swallow2.c | 7 | ||||
| -rw-r--r-- | src/examples/edje/meson.build | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/examples/edje/edje-swallow2.c b/src/examples/edje/edje-swallow2.c index fe3f95632d..c393ad811c 100644 --- a/src/examples/edje/edje-swallow2.c +++ b/src/examples/edje/edje-swallow2.c @@ -19,6 +19,11 @@ #define PACKAGE_DATA_DIR "." #endif +#ifndef PACKAGE_SOURCE_DATA_DIR +#define PACKAGE_SOURCE_DATA_DIR "." +#endif + + #include <Ecore.h> #include <Ecore_Evas.h> #include <Edje.h> @@ -36,7 +41,7 @@ int main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) { const char *edje_file = PACKAGE_DATA_DIR"/swallow.edj"; - const char *img_file = PACKAGE_DATA_DIR"/bubble.png"; + const char *img_file = PACKAGE_SOURCE_DATA_DIR"/bubble.png"; Ecore_Evas *ee; Evas *evas; Evas_Object *bg; diff --git a/src/examples/edje/meson.build b/src/examples/edje/meson.build index d73c83a199..a77d9f26fa 100644 --- a/src/examples/edje/meson.build +++ b/src/examples/edje/meson.build @@ -130,6 +130,7 @@ foreach edje_example : edje_examples executable(edje_example, [edje_example + '.c'] + themes, dependencies: [edje, ecore_evas], - c_args: ['-DPACKAGE_DATA_DIR="'+ meson.current_build_dir()+'"',] + c_args: ['-DPACKAGE_DATA_DIR="'+ meson.current_build_dir()+'"', + '-DPACKAGE_SOURCE_DATA_DIR="'+ meson.current_source_dir()+'"',] ) endforeach |