Move images to the base directory, and point all the special EFL directories to the base.

18 files changed, 4 insertions, 4 deletions

diff --git a/ClientHamr/extantz/build.lua b/ClientHamr/extantz/build.lua
index 096c5ff..baddae6 100755
--- a/ClientHamr/extantz/build.lua
+++ b/ClientHamr/extantz/build.lua
@@ -17,9 +17,9 @@ CFLAGS  = CFLAGS  .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/inc
 LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux'
 libs    = libs    .. ' -lIrrlicht -lGL -lbz2'
 
-removeFiles(dir, {'extantz', 'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'extantz.edj'})
+removeFiles(dir, {'extantz', 'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', '../../images/extantz.edj'})
 
-runCommand('edje_cc',           dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc extantz.edj')
+runCommand('edje_cc',           dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../images/extantz.edj')
 runCommand('Irrlicht files',    dir, 'g++ ' .. CFLAGS .. ' -O3 -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS)
 runCommand(nil,                 dir, 'g++ ' .. CFLAGS .. ' -O3 -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS)
 runCommand('extantz',           dir, 'g++ ' .. CFLAGS .. ' -O3 -ffast-math -c extantzCamera.cpp -o extantzCamera.o ' .. LDFLAGS)
diff --git a/ClientHamr/extantz/extantz.c b/ClientHamr/extantz/extantz.c
index 7cdf799..cb8b323 100644
--- a/ClientHamr/extantz/extantz.c
+++ b/ClientHamr/extantz/extantz.c
@@ -1538,7 +1538,7 @@ EAPI_MAIN int elm_main(int argc, char **argv)
     ephysics_body_friction_set(boundary, 0);
 
     box1 = elm_image_add(gld->win);
-    elm_image_file_set(box1, PACKAGE_DATA_DIR "/" EPHYSICS_TEST_THEME ".edj", "blue-cube");
+    elm_image_file_set(box1, PACKAGE_DATA_DIR "/images/" EPHYSICS_TEST_THEME ".edj", "blue-cube");
     evas_object_move(box1, gld->win_w / 2 - 80, gld->win_h - 200);
     evas_object_resize(box1, 70, 70);
     evas_object_show(box1);
@@ -1552,7 +1552,7 @@ EAPI_MAIN int elm_main(int argc, char **argv)
     ephysics_body_sleeping_threshold_set(box_body1, 0.1, 0.1);
 
     box2 = elm_image_add(gld->win);
-    elm_image_file_set(box2, PACKAGE_DATA_DIR "/" EPHYSICS_TEST_THEME ".edj", "purple-cube");
+    elm_image_file_set(box2, PACKAGE_DATA_DIR "/images/" EPHYSICS_TEST_THEME ".edj", "purple-cube");
     evas_object_move(box2, gld->win_w / 2 + 10, gld->win_h - 200);
     evas_object_resize(box2, 70, 70);
     evas_object_show(box2);
diff --git a/ClientHamr/extantz/images/bubble.png b/ClientHamr/extantz/images/bubble.png
deleted file mode 100644
index dfb71b7..0000000
--- a/ClientHamr/extantz/images/bubble.png
+++ /dev/null
diff --git a/ClientHamr/extantz/images/animated_logo.gif b/images/animated_logo.gif
index ef201af..ef201af 100644
--- a/ClientHamr/extantz/images/animated_logo.gif
+++ b/images/animated_logo.gif
diff --git a/ClientHamr/extantz/images/bubble_sh.png b/images/bubble_sh.png
index b66c1e6..b66c1e6 100644
--- a/ClientHamr/extantz/images/bubble_sh.png
+++ b/images/bubble_sh.png
diff --git a/ClientHamr/extantz/images/cube-blue.png b/images/cube-blue.png
index e848d2b..e848d2b 100644
--- a/ClientHamr/extantz/images/cube-blue.png
+++ b/images/cube-blue.png
diff --git a/ClientHamr/extantz/images/cube-purple.png b/images/cube-purple.png
index 096cdbb..096cdbb 100644
--- a/ClientHamr/extantz/images/cube-purple.png
+++ b/images/cube-purple.png
diff --git a/ClientHamr/extantz/images/logo.png b/images/logo.png
index 7dbae67..7dbae67 100644
--- a/ClientHamr/extantz/images/logo.png
+++ b/images/logo.png
diff --git a/ClientHamr/extantz/images/logo_small.png b/images/logo_small.png
index c7dc665..c7dc665 100644
--- a/ClientHamr/extantz/images/logo_small.png
+++ b/images/logo_small.png
diff --git a/ClientHamr/extantz/images/plant_01.jpg b/images/plant_01.jpg
index f1714dd..f1714dd 100644
--- a/ClientHamr/extantz/images/plant_01.jpg
+++ b/images/plant_01.jpg
diff --git a/ClientHamr/extantz/images/pt.png b/images/pt.png
index 612d117..612d117 100644
--- a/ClientHamr/extantz/images/pt.png
+++ b/images/pt.png
diff --git a/ClientHamr/extantz/images/rock_01.jpg b/images/rock_01.jpg
index c50ccb3..c50ccb3 100644
--- a/ClientHamr/extantz/images/rock_01.jpg
+++ b/images/rock_01.jpg
diff --git a/ClientHamr/extantz/images/rock_02.jpg b/images/rock_02.jpg
index 04aea8a..04aea8a 100644
--- a/ClientHamr/extantz/images/rock_02.jpg
+++ b/images/rock_02.jpg
diff --git a/ClientHamr/extantz/images/sky_01.jpg b/images/sky_01.jpg
index 22f3050..22f3050 100644
--- a/ClientHamr/extantz/images/sky_01.jpg
+++ b/images/sky_01.jpg
diff --git a/ClientHamr/extantz/images/sky_02.jpg b/images/sky_02.jpg
index d0d7448..d0d7448 100644
--- a/ClientHamr/extantz/images/sky_02.jpg
+++ b/images/sky_02.jpg
diff --git a/ClientHamr/extantz/images/sky_03.jpg b/images/sky_03.jpg
index cbad02a..cbad02a 100644
--- a/ClientHamr/extantz/images/sky_03.jpg
+++ b/images/sky_03.jpg
diff --git a/ClientHamr/extantz/images/sky_04.jpg b/images/sky_04.jpg
index c5cbc18..c5cbc18 100644
--- a/ClientHamr/extantz/images/sky_04.jpg
+++ b/images/sky_04.jpg
diff --git a/ClientHamr/extantz/images/wood_01.jpg b/images/wood_01.jpg
index 89f1006..89f1006 100644
--- a/ClientHamr/extantz/images/wood_01.jpg
+++ b/images/wood_01.jpg