From 6099a79ef6397ca80cc892fecbfe7faf5b49cb00 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 21 Apr 2014 18:59:33 +1000
Subject: Move images to the base directory, and point all the special EFL
 directories to the base.

---
 ClientHamr/extantz/build.lua                |   4 ++--
 ClientHamr/extantz/extantz.c                |   4 ++--
 ClientHamr/extantz/images/animated_logo.gif | Bin 81411 -> 0 bytes
 ClientHamr/extantz/images/bubble.png        | Bin 4878 -> 0 bytes
 ClientHamr/extantz/images/bubble_sh.png     | Bin 1600 -> 0 bytes
 ClientHamr/extantz/images/cube-blue.png     | Bin 3734 -> 0 bytes
 ClientHamr/extantz/images/cube-purple.png   | Bin 5835 -> 0 bytes
 ClientHamr/extantz/images/logo.png          | Bin 81162 -> 0 bytes
 ClientHamr/extantz/images/logo_small.png    | Bin 5655 -> 0 bytes
 ClientHamr/extantz/images/plant_01.jpg      | Bin 165867 -> 0 bytes
 ClientHamr/extantz/images/pt.png            | Bin 875 -> 0 bytes
 ClientHamr/extantz/images/rock_01.jpg       | Bin 330094 -> 0 bytes
 ClientHamr/extantz/images/rock_02.jpg       | Bin 285555 -> 0 bytes
 ClientHamr/extantz/images/sky_01.jpg        | Bin 134813 -> 0 bytes
 ClientHamr/extantz/images/sky_02.jpg        | Bin 31413 -> 0 bytes
 ClientHamr/extantz/images/sky_03.jpg        | Bin 73364 -> 0 bytes
 ClientHamr/extantz/images/sky_04.jpg        | Bin 25078 -> 0 bytes
 ClientHamr/extantz/images/wood_01.jpg       | Bin 96136 -> 0 bytes
 LuaSL/src/LuaSL.h                           |   2 +-
 LuaSL/src/LuaSL_compile.c                   |   4 ++--
 LuaSL/src/LuaSL_test.c                      |   4 ++--
 LuaSL/src/images/bubble.png                 | Bin 4737 -> 0 bytes
 LuaSL/src/images/bubble_sh.png              | Bin 1600 -> 0 bytes
 LuaSL/src/images/test.png                   | Bin 22869 -> 0 bytes
 build.lua                                   |  11 ++++-------
 images/animated_logo.gif                    | Bin 0 -> 81411 bytes
 images/bubble.png                           | Bin 0 -> 4737 bytes
 images/bubble_sh.png                        | Bin 0 -> 1600 bytes
 images/cube-blue.png                        | Bin 0 -> 3734 bytes
 images/cube-purple.png                      | Bin 0 -> 5835 bytes
 images/logo.png                             | Bin 0 -> 81162 bytes
 images/logo_small.png                       | Bin 0 -> 5655 bytes
 images/plant_01.jpg                         | Bin 0 -> 165867 bytes
 images/pt.png                               | Bin 0 -> 875 bytes
 images/rock_01.jpg                          | Bin 0 -> 330094 bytes
 images/rock_02.jpg                          | Bin 0 -> 285555 bytes
 images/sky_01.jpg                           | Bin 0 -> 134813 bytes
 images/sky_02.jpg                           | Bin 0 -> 31413 bytes
 images/sky_03.jpg                           | Bin 0 -> 73364 bytes
 images/sky_04.jpg                           | Bin 0 -> 25078 bytes
 images/test.png                             | Bin 0 -> 22869 bytes
 images/wood_01.jpg                          | Bin 0 -> 96136 bytes
 42 files changed, 13 insertions(+), 16 deletions(-)
 delete mode 100644 ClientHamr/extantz/images/animated_logo.gif
 delete mode 100644 ClientHamr/extantz/images/bubble.png
 delete mode 100644 ClientHamr/extantz/images/bubble_sh.png
 delete mode 100644 ClientHamr/extantz/images/cube-blue.png
 delete mode 100644 ClientHamr/extantz/images/cube-purple.png
 delete mode 100644 ClientHamr/extantz/images/logo.png
 delete mode 100644 ClientHamr/extantz/images/logo_small.png
 delete mode 100644 ClientHamr/extantz/images/plant_01.jpg
 delete mode 100644 ClientHamr/extantz/images/pt.png
 delete mode 100644 ClientHamr/extantz/images/rock_01.jpg
 delete mode 100644 ClientHamr/extantz/images/rock_02.jpg
 delete mode 100644 ClientHamr/extantz/images/sky_01.jpg
 delete mode 100644 ClientHamr/extantz/images/sky_02.jpg
 delete mode 100644 ClientHamr/extantz/images/sky_03.jpg
 delete mode 100644 ClientHamr/extantz/images/sky_04.jpg
 delete mode 100644 ClientHamr/extantz/images/wood_01.jpg
 delete mode 100644 LuaSL/src/images/bubble.png
 delete mode 100644 LuaSL/src/images/bubble_sh.png
 delete mode 100644 LuaSL/src/images/test.png
 create mode 100644 images/animated_logo.gif
 create mode 100644 images/bubble.png
 create mode 100644 images/bubble_sh.png
 create mode 100644 images/cube-blue.png
 create mode 100644 images/cube-purple.png
 create mode 100644 images/logo.png
 create mode 100644 images/logo_small.png
 create mode 100644 images/plant_01.jpg
 create mode 100644 images/pt.png
 create mode 100644 images/rock_01.jpg
 create mode 100644 images/rock_02.jpg
 create mode 100644 images/sky_01.jpg
 create mode 100644 images/sky_02.jpg
 create mode 100644 images/sky_03.jpg
 create mode 100644 images/sky_04.jpg
 create mode 100644 images/test.png
 create mode 100644 images/wood_01.jpg

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/animated_logo.gif b/ClientHamr/extantz/images/animated_logo.gif
deleted file mode 100644
index ef201af..0000000
Binary files a/ClientHamr/extantz/images/animated_logo.gif and /dev/null differ
diff --git a/ClientHamr/extantz/images/bubble.png b/ClientHamr/extantz/images/bubble.png
deleted file mode 100644
index dfb71b7..0000000
Binary files a/ClientHamr/extantz/images/bubble.png and /dev/null differ
diff --git a/ClientHamr/extantz/images/bubble_sh.png b/ClientHamr/extantz/images/bubble_sh.png
deleted file mode 100644
index b66c1e6..0000000
Binary files a/ClientHamr/extantz/images/bubble_sh.png and /dev/null differ
diff --git a/ClientHamr/extantz/images/cube-blue.png b/ClientHamr/extantz/images/cube-blue.png
deleted file mode 100644
index e848d2b..0000000
Binary files a/ClientHamr/extantz/images/cube-blue.png and /dev/null differ
diff --git a/ClientHamr/extantz/images/cube-purple.png b/ClientHamr/extantz/images/cube-purple.png
deleted file mode 100644
index 096cdbb..0000000
Binary files a/ClientHamr/extantz/images/cube-purple.png and /dev/null differ
diff --git a/ClientHamr/extantz/images/logo.png b/ClientHamr/extantz/images/logo.png
deleted file mode 100644
index 7dbae67..0000000
Binary files a/ClientHamr/extantz/images/logo.png and /dev/null differ
diff --git a/ClientHamr/extantz/images/logo_small.png b/ClientHamr/extantz/images/logo_small.png
deleted file mode 100644
index c7dc665..0000000
Binary files a/ClientHamr/extantz/images/logo_small.png and /dev/null differ
diff --git a/ClientHamr/extantz/images/plant_01.jpg b/ClientHamr/extantz/images/plant_01.jpg
deleted file mode 100644
index f1714dd..0000000
Binary files a/ClientHamr/extantz/images/plant_01.jpg and /dev/null differ
diff --git a/ClientHamr/extantz/images/pt.png b/ClientHamr/extantz/images/pt.png
deleted file mode 100644
index 612d117..0000000
Binary files a/ClientHamr/extantz/images/pt.png and /dev/null differ
diff --git a/ClientHamr/extantz/images/rock_01.jpg b/ClientHamr/extantz/images/rock_01.jpg
deleted file mode 100644
index c50ccb3..0000000
Binary files a/ClientHamr/extantz/images/rock_01.jpg and /dev/null differ
diff --git a/ClientHamr/extantz/images/rock_02.jpg b/ClientHamr/extantz/images/rock_02.jpg
deleted file mode 100644
index 04aea8a..0000000
Binary files a/ClientHamr/extantz/images/rock_02.jpg and /dev/null differ
diff --git a/ClientHamr/extantz/images/sky_01.jpg b/ClientHamr/extantz/images/sky_01.jpg
deleted file mode 100644
index 22f3050..0000000
Binary files a/ClientHamr/extantz/images/sky_01.jpg and /dev/null differ
diff --git a/ClientHamr/extantz/images/sky_02.jpg b/ClientHamr/extantz/images/sky_02.jpg
deleted file mode 100644
index d0d7448..0000000
Binary files a/ClientHamr/extantz/images/sky_02.jpg and /dev/null differ
diff --git a/ClientHamr/extantz/images/sky_03.jpg b/ClientHamr/extantz/images/sky_03.jpg
deleted file mode 100644
index cbad02a..0000000
Binary files a/ClientHamr/extantz/images/sky_03.jpg and /dev/null differ
diff --git a/ClientHamr/extantz/images/sky_04.jpg b/ClientHamr/extantz/images/sky_04.jpg
deleted file mode 100644
index c5cbc18..0000000
Binary files a/ClientHamr/extantz/images/sky_04.jpg and /dev/null differ
diff --git a/ClientHamr/extantz/images/wood_01.jpg b/ClientHamr/extantz/images/wood_01.jpg
deleted file mode 100644
index 89f1006..0000000
Binary files a/ClientHamr/extantz/images/wood_01.jpg and /dev/null differ
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.png b/LuaSL/src/images/bubble.png
deleted file mode 100644
index 8fc50f9..0000000
Binary files a/LuaSL/src/images/bubble.png and /dev/null differ
diff --git a/LuaSL/src/images/bubble_sh.png b/LuaSL/src/images/bubble_sh.png
deleted file mode 100644
index b66c1e6..0000000
Binary files a/LuaSL/src/images/bubble_sh.png and /dev/null differ
diff --git a/LuaSL/src/images/test.png b/LuaSL/src/images/test.png
deleted file mode 100644
index fb620d7..0000000
Binary files a/LuaSL/src/images/test.png and /dev/null differ
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/images/animated_logo.gif b/images/animated_logo.gif
new file mode 100644
index 0000000..ef201af
Binary files /dev/null and b/images/animated_logo.gif differ
diff --git a/images/bubble.png b/images/bubble.png
new file mode 100644
index 0000000..8fc50f9
Binary files /dev/null and b/images/bubble.png differ
diff --git a/images/bubble_sh.png b/images/bubble_sh.png
new file mode 100644
index 0000000..b66c1e6
Binary files /dev/null and b/images/bubble_sh.png differ
diff --git a/images/cube-blue.png b/images/cube-blue.png
new file mode 100644
index 0000000..e848d2b
Binary files /dev/null and b/images/cube-blue.png differ
diff --git a/images/cube-purple.png b/images/cube-purple.png
new file mode 100644
index 0000000..096cdbb
Binary files /dev/null and b/images/cube-purple.png differ
diff --git a/images/logo.png b/images/logo.png
new file mode 100644
index 0000000..7dbae67
Binary files /dev/null and b/images/logo.png differ
diff --git a/images/logo_small.png b/images/logo_small.png
new file mode 100644
index 0000000..c7dc665
Binary files /dev/null and b/images/logo_small.png differ
diff --git a/images/plant_01.jpg b/images/plant_01.jpg
new file mode 100644
index 0000000..f1714dd
Binary files /dev/null and b/images/plant_01.jpg differ
diff --git a/images/pt.png b/images/pt.png
new file mode 100644
index 0000000..612d117
Binary files /dev/null and b/images/pt.png differ
diff --git a/images/rock_01.jpg b/images/rock_01.jpg
new file mode 100644
index 0000000..c50ccb3
Binary files /dev/null and b/images/rock_01.jpg differ
diff --git a/images/rock_02.jpg b/images/rock_02.jpg
new file mode 100644
index 0000000..04aea8a
Binary files /dev/null and b/images/rock_02.jpg differ
diff --git a/images/sky_01.jpg b/images/sky_01.jpg
new file mode 100644
index 0000000..22f3050
Binary files /dev/null and b/images/sky_01.jpg differ
diff --git a/images/sky_02.jpg b/images/sky_02.jpg
new file mode 100644
index 0000000..d0d7448
Binary files /dev/null and b/images/sky_02.jpg differ
diff --git a/images/sky_03.jpg b/images/sky_03.jpg
new file mode 100644
index 0000000..cbad02a
Binary files /dev/null and b/images/sky_03.jpg differ
diff --git a/images/sky_04.jpg b/images/sky_04.jpg
new file mode 100644
index 0000000..c5cbc18
Binary files /dev/null and b/images/sky_04.jpg differ
diff --git a/images/test.png b/images/test.png
new file mode 100644
index 0000000..fb620d7
Binary files /dev/null and b/images/test.png differ
diff --git a/images/wood_01.jpg b/images/wood_01.jpg
new file mode 100644
index 0000000..89f1006
Binary files /dev/null and b/images/wood_01.jpg differ
-- 
cgit v1.1