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

25 files changed, 13 insertions, 16 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/LuaSL/src/LuaSL.h b/LuaSL/src/LuaSL.h
index 5dfa0eb..9055ca8 100644
--- a/LuaSL/src/LuaSL.h
+++ b/LuaSL/src/LuaSL.h
@@ -1,7 +1,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #else
-#define PACKAGE_EXAMPLES_DIR "."
+//#define PACKAGE_EXAMPLES_DIR "."
 #define __UNUSED__
 #endif
 
diff --git a/LuaSL/src/LuaSL_compile.c b/LuaSL/src/LuaSL_compile.c
index afff67f..4a0a42f 100644
--- a/LuaSL/src/LuaSL_compile.c
+++ b/LuaSL/src/LuaSL_compile.c
@@ -2119,9 +2119,9 @@ boolean compilerSetup(gameGlobals *ourGlobals)
         }
 
         // Compile the constants.
-        snprintf(buf, sizeof(buf), "lua -e 'require(\"LSL\").gimmeLSL()' > %s/constants.lsl", PACKAGE_DATA_DIR);
+        snprintf(buf, sizeof(buf), "lua -e 'require(\"LSL\").gimmeLSL()' > %s/LuaSL/constants.lsl", PACKAGE_DATA_DIR);
         system(buf);
-        snprintf(buf, sizeof(buf), "%s/constants.lsl", PACKAGE_DATA_DIR);
+        snprintf(buf, sizeof(buf), "%s/LuaSL/constants.lsl", PACKAGE_DATA_DIR);
         compileLSL(ourGlobals, NULL, "FAKE_SID", buf, TRUE);
 
         return TRUE;
diff --git a/LuaSL/src/LuaSL_test.c b/LuaSL/src/LuaSL_test.c
index 51fd902..74236cf 100644
--- a/LuaSL/src/LuaSL_test.c
+++ b/LuaSL/src/LuaSL_test.c
@@ -147,7 +147,7 @@ static Eina_Bool _add(void *data, int type __UNUSED__, Ecore_Con_Event_Server_Ad
 
     ourGlobals->server = ev->server;
     gettimeofday(&startTime, NULL);
-    snprintf(buf, sizeof(buf), "%s/Test sim/objects", PACKAGE_DATA_DIR);
+    snprintf(buf, sizeof(buf), "%s/LuaSL/Test sim/objects", PACKAGE_DATA_DIR);
     eina_file_dir_list(buf, EINA_TRUE, dirList_compile, ourGlobals);
     // Wait awhile, then start sending events for testing.
     ecore_timer_add(0.5, _timer_cb, ourGlobals);
@@ -391,7 +391,7 @@ int main(int argc, char **argv)
                                 evas_object_focus_set(ourGlobals.bg, EINA_TRUE);
 
                                 ourGlobals.edje = edje_object_add(ourGlobals.canvas);
-                                snprintf(buf, sizeof(buf), "%s/%s.edj", PACKAGE_DATA_DIR, "LuaSL");
+                                snprintf(buf, sizeof(buf), "%s/LuaSL/%s.edj", PACKAGE_DATA_DIR, "LuaSL");
                                 if (!edje_object_file_set(ourGlobals.edje, buf, group))
                                 {
                                     int err = edje_object_load_error_get(ourGlobals.edje);
diff --git a/LuaSL/src/images/bubble_sh.png b/LuaSL/src/images/bubble_sh.png
deleted file mode 100644
index b66c1e6..0000000
--- a/LuaSL/src/images/bubble_sh.png
+++ /dev/null
diff --git a/build.lua b/build.lua
index c7177fa..4e37af0 100755
--- a/build.lua
+++ b/build.lua
@@ -71,18 +71,15 @@ CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'ecore-evas')
 CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'ecore-file')
 CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'edje')
 CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'elementary')
--- TODO - The workingDir part of these strings gets set differently depending on who starts the build.
---        Which is a problem for the PACKAGE_*_DIR defines.
---        On the other hand, that part needs to be rethought anyway, coz otherwise they are locked to the build place.
-CFLAGS = CFLAGS .. ' -DPACKAGE_BIN_DIR=\\"'  .. workingDir .. '\\"'
-CFLAGS = CFLAGS .. ' -DPACKAGE_LIB_DIR=\\"'  .. workingDir .. '\\"'
-CFLAGS = CFLAGS .. ' -DPACKAGE_DATA_DIR=\\"' .. workingDir .. '\\"'
+CFLAGS = CFLAGS .. ' -DPACKAGE_BIN_DIR=\\"'  .. baseDir .. '\\"'
+CFLAGS = CFLAGS .. ' -DPACKAGE_LIB_DIR=\\"'  .. baseDir .. '\\"'
+CFLAGS = CFLAGS .. ' -DPACKAGE_DATA_DIR=\\"' .. baseDir .. '\\"'
 CFLAGS = CFLAGS .. ' ' .. CFLAGOPTS
 
 LDFLAGS = '-L ' .. baseDir .. '/libraries ' .. pkgConfig('libs-only-L', 'luajit') .. ' -L /usr/lib -L /lib'
 libs = '-lLumbrJack -lRunnr ' .. pkgConfig('libs', 'elementary') .. ' ' .. pkgConfig('libs', 'luajit') .. ' -lpthread -lm'
 LFLAGS = '-d'
-EDJE_FLAGS = '-id images -fd fonts'
+EDJE_FLAGS = '-id ' .. baseDir .. '/images -fd ' .. baseDir .. '/fonts'
 
 
 if 'nil' == type(args) then
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/LuaSL/src/images/bubble.png b/images/bubble.png
index 8fc50f9..8fc50f9 100644
--- a/LuaSL/src/images/bubble.png
+++ b/images/bubble.png
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/LuaSL/src/images/test.png b/images/test.png
index fb620d7..fb620d7 100644
--- a/LuaSL/src/images/test.png
+++ b/images/test.png
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