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
This commit is contained in:
parent
ff3d378334
commit
09dd53d576
|
@ -19,6 +19,11 @@
|
||||||
#define PACKAGE_DATA_DIR "."
|
#define PACKAGE_DATA_DIR "."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef PACKAGE_SOURCE_DATA_DIR
|
||||||
|
#define PACKAGE_SOURCE_DATA_DIR "."
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#include <Ecore.h>
|
#include <Ecore.h>
|
||||||
#include <Ecore_Evas.h>
|
#include <Ecore_Evas.h>
|
||||||
#include <Edje.h>
|
#include <Edje.h>
|
||||||
|
@ -36,7 +41,7 @@ int
|
||||||
main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
|
main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
|
||||||
{
|
{
|
||||||
const char *edje_file = PACKAGE_DATA_DIR"/swallow.edj";
|
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;
|
Ecore_Evas *ee;
|
||||||
Evas *evas;
|
Evas *evas;
|
||||||
Evas_Object *bg;
|
Evas_Object *bg;
|
||||||
|
|
|
@ -130,6 +130,7 @@ foreach edje_example : edje_examples
|
||||||
executable(edje_example,
|
executable(edje_example,
|
||||||
[edje_example + '.c'] + themes,
|
[edje_example + '.c'] + themes,
|
||||||
dependencies: [edje, ecore_evas],
|
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
|
endforeach
|
||||||
|
|
Loading…
Reference in New Issue