Evas examples: Fix examples data dir for out-of-tree builds
authorJean-Philippe Andre <jp.andre@samsung.com>
Fri, 18 Dec 2015 07:43:47 +0000 (16:43 +0900)
committerJean-Philippe Andre <jp.andre@samsung.com>
Fri, 18 Dec 2015 07:48:34 +0000 (16:48 +0900)
This is a quick fix to make out-of-tree builds of the examples
work fine. Don't pass "." as teh resource dir root, instead
pass the path to the source files' folder.

src/examples/evas/Makefile.am
src/examples/evas/evas-3d-hull.c

index 5d3307d..d3235e2 100644 (file)
@@ -47,7 +47,7 @@ ECORE_EVAS_COMMON_CPPFLAGS = \
 -I$(top_builddir)/src/lib/ecore_file \
 -I$(top_srcdir)/src/lib/ecore_input \
 -I$(top_builddir)/src/lib/ecore_evas \
--DPACKAGE_EXAMPLES_DIR=\".\" \
+-DPACKAGE_EXAMPLES_DIR=\"$(top_srcdir)/src/examples/evas\" \
 @EVAS_CFLAGS@
 
 ECORE_EVAS_COMMON_LDADD = \
@@ -91,7 +91,7 @@ EDJE_COMMON_CPPFLAGS = \
 -I$(top_builddir)/src/lib/edje \
 -I$(top_srcdir)/src/lib/edje/include \
 -I$(top_builddir)/src/lib/edje/include \
--DPACKAGE_EXAMPLES_DIR=\".\" \
+-DPACKAGE_EXAMPLES_DIR=\"$(top_srcdir)/src/examples/evas\" \
 @EVAS_CFLAGS@
 
 EDJE_COMMON_LDADD = \
index 3c049ce..30cb845 100644 (file)
@@ -351,7 +351,7 @@ _mesh_setup(Scene_Data *data)
    MODEL_MESH_INIT(column, column_ch)
    MODEL_MESH_INIT(home, home_ch)
    MODEL_MESH_INIT(sonic, sonic_ch)
-   MODEL_MESH_INIT(eagle, "shooter/assets/models/eagle.md2")
+   MODEL_MESH_INIT(eagle, PACKAGE_EXAMPLES_DIR "/shooter/assets/models/eagle.md2")
 
    MODEL_MESH_INIT(blender_sphere, sphere)
    MODEL_MESH_INIT(blender_torus, torus)