Moved images to media, much better idea.

22 files changed, 16 insertions, 16 deletions

diff --git a/ClientHamr/extantz/build.lua b/ClientHamr/extantz/build.lua
index baddae6..7e8c29c 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', '../../images/extantz.edj'})
+removeFiles(dir, {'extantz', 'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', '../../media/extantz.edj'})
 
-runCommand('edje_cc',           dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../images/extantz.edj')
+runCommand('edje_cc',           dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../media/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 cb8b323..09b5196 100644
--- a/ClientHamr/extantz/extantz.c
+++ b/ClientHamr/extantz/extantz.c
@@ -37,9 +37,9 @@ static Elm_Genlist_Item_Class *grid_gic = NULL;
 static Elm_Genlist_Item_Class *account_gic = NULL;
 static Elm_Genlist_Item_Class *viewer_gic = NULL;
 
-//static const char *img1 = PACKAGE_DATA_DIR "/images/plant_01.jpg";
-//static const char *img2 = PACKAGE_DATA_DIR "/images/sky_01.jpg";
-static const char *img3 = PACKAGE_DATA_DIR "/images/rock_01.jpg";
+//static const char *img1 = PACKAGE_DATA_DIR "/media/plant_01.jpg";
+//static const char *img2 = PACKAGE_DATA_DIR "/media/sky_01.jpg";
+static const char *img3 = PACKAGE_DATA_DIR "/media/rock_01.jpg";
 
 
 #define EPHYSICS_TEST_THEME "extantz"
@@ -1090,7 +1090,7 @@ static void create_handles(Evas_Object *obj)
 
         hand = evas_object_image_filled_add(evas_object_evas_get(obj));
         evas_object_resize(hand, 31, 31);
-        snprintf(buf, sizeof(buf), "%s/images/pt.png", elm_app_data_dir_get());
+        snprintf(buf, sizeof(buf), "%s/media/pt.png", elm_app_data_dir_get());
         evas_object_image_file_set(hand, buf, NULL);
         if (i == 0)      evas_object_move(hand, x     - 15, y     - 15);
         else if (i == 1) evas_object_move(hand, x + w - 15, y     - 15);
@@ -1404,7 +1404,7 @@ EAPI_MAIN int elm_main(int argc, char **argv)
     // If you want efl to handle finding your bin/lib/data dirs, you must do this below.
     elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR);
     elm_app_compile_data_dir_set(PACKAGE_DATA_DIR);
-    elm_app_info_set(elm_main, "datadir", "images/sky_03.jpg");
+    elm_app_info_set(elm_main, "datadir", "media/sky_03.jpg");
     fprintf(stdout, "prefix was set to: %s\n", elm_app_prefix_dir_get());
     fprintf(stdout, "data directory is: %s\n", elm_app_data_dir_get());
     fprintf(stdout, "library directory is: %s\n", elm_app_lib_dir_get());
@@ -1444,7 +1444,7 @@ EAPI_MAIN int elm_main(int argc, char **argv)
     bg = elm_bg_add(gld->win);
     elm_bg_load_size_set(bg, gld->win_w, gld->win_h);
     elm_bg_option_set(bg, ELM_BG_OPTION_CENTER);
-    snprintf(buf, sizeof(buf), "%s/images/sky_03.jpg", elm_app_data_dir_get());
+    snprintf(buf, sizeof(buf), "%s/media/sky_03.jpg", elm_app_data_dir_get());
     elm_bg_file_set(bg, buf, NULL);
     evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
     elm_win_resize_object_add(gld->win, bg);
@@ -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 "/images/" EPHYSICS_TEST_THEME ".edj", "blue-cube");
+    elm_image_file_set(box1, PACKAGE_DATA_DIR "/media/" 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 "/images/" EPHYSICS_TEST_THEME ".edj", "purple-cube");
+    elm_image_file_set(box2, PACKAGE_DATA_DIR "/media/" 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/LuaSL/build.lua b/LuaSL/build.lua
index e69a0b9..f626fb0 100755
--- a/LuaSL/build.lua
+++ b/LuaSL/build.lua
@@ -15,11 +15,11 @@ end
 
 dir = dir .. '/src'
 
-removeFiles(dir, {'../LuaSL', '*.o', '*.output', '*.backup', '../../images/LuaSL.edj', 'LuaSL_lexer.h', 'LuaSL_lexer.c', 'LuaSL_lemon_yaccer.h', 'LuaSL_lemon_yaccer.c', 'LuaSL_lemon_yaccer.out'})
+removeFiles(dir, {'../LuaSL', '*.o', '*.output', '*.backup', '../../media/LuaSL.edj', 'LuaSL_lexer.h', 'LuaSL_lexer.c', 'LuaSL_lemon_yaccer.h', 'LuaSL_lemon_yaccer.c', 'LuaSL_lemon_yaccer.out'})
 
 -- Run lemon first, flex depends on it to define the symbol values.
 runCommand('lemon',   dir, '../../libraries/lemon/lemon -s -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y')
 runCommand('flex',    dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l')
-runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' LuaSL.edc ../../images/LuaSL.edj')
+runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' LuaSL.edc ../../media/LuaSL.edj')
 compileFiles('../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_utilities', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'})
 compileFiles('../LuaSL_test', dir, {'LuaSL_test', 'LuaSL_utilities'})
diff --git a/LuaSL/src/LuaSL_test.c b/LuaSL/src/LuaSL_test.c
index fb69fc1..6994984 100644
--- a/LuaSL/src/LuaSL_test.c
+++ b/LuaSL/src/LuaSL_test.c
@@ -392,7 +392,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/images/%s.edj", PACKAGE_DATA_DIR, "LuaSL");
+                                snprintf(buf, sizeof(buf), "%s/media/%s.edj", PACKAGE_DATA_DIR, "LuaSL");
                                 if (!edje_object_file_set(ourGlobals.edje, buf, group))
                                 {
                                     int err = edje_object_load_error_get(ourGlobals.edje);
@@ -409,7 +409,7 @@ int main(int argc, char **argv)
                                 evas_object_resize(ourGlobals.edje, WIDTH, HEIGHT);
                                 evas_object_show(ourGlobals.edje);
 
-                                snprintf(buf, sizeof(buf), "%s/images/bubble_sh.png", PACKAGE_DATA_DIR);
+                                snprintf(buf, sizeof(buf), "%s/media/bubble_sh.png", PACKAGE_DATA_DIR);
                                 for (i = 0; i < (sizeof(names) / sizeof(char *) / 2); i++)
                                 {
                                     sh = evas_object_image_filled_add(ourGlobals.canvas);
@@ -419,7 +419,7 @@ int main(int argc, char **argv)
                                     evas_object_data_set(ourGlobals.bg, names[(i * 2) + 1], sh);
                                 }
 
-                                snprintf(buf, sizeof(buf), "%s/images/bubble.png", PACKAGE_DATA_DIR);
+                                snprintf(buf, sizeof(buf), "%s/media/bubble.png", PACKAGE_DATA_DIR);
                                 for (i = 0; i < (sizeof(names) / sizeof(char *) / 2); i++)
                                 {
                                     bub = evas_object_image_filled_add(ourGlobals.canvas);
diff --git a/build.lua b/build.lua
index f9cd6c2..dadbb32 100755
--- a/build.lua
+++ b/build.lua
@@ -79,7 +79,7 @@ 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 -Wl,-rpath,' .. baseDir .. '/libraries'
 LFLAGS = '-d'
-EDJE_FLAGS = '-id ' .. baseDir .. '/images -fd ' .. baseDir .. '/fonts'
+EDJE_FLAGS = '-id ' .. baseDir .. '/media -fd ' .. baseDir .. '/media'
 
 
 if 'nil' == type(args) then
diff --git a/images/animated_logo.gif b/media/animated_logo.gif
index ef201af..ef201af 100644
--- a/images/animated_logo.gif
+++ b/media/animated_logo.gif
diff --git a/images/bubble.png b/media/bubble.png
index 8fc50f9..8fc50f9 100644
--- a/images/bubble.png
+++ b/media/bubble.png
diff --git a/images/bubble_sh.png b/media/bubble_sh.png
index b66c1e6..b66c1e6 100644
--- a/images/bubble_sh.png
+++ b/media/bubble_sh.png
diff --git a/images/cube-blue.png b/media/cube-blue.png
index e848d2b..e848d2b 100644
--- a/images/cube-blue.png
+++ b/media/cube-blue.png
diff --git a/images/cube-purple.png b/media/cube-purple.png
index 096cdbb..096cdbb 100644
--- a/images/cube-purple.png
+++ b/media/cube-purple.png
diff --git a/images/logo.png b/media/logo.png
index 7dbae67..7dbae67 100644
--- a/images/logo.png
+++ b/media/logo.png
diff --git a/images/logo_small.png b/media/logo_small.png
index c7dc665..c7dc665 100644
--- a/images/logo_small.png
+++ b/media/logo_small.png
diff --git a/images/plant_01.jpg b/media/plant_01.jpg
index f1714dd..f1714dd 100644
--- a/images/plant_01.jpg
+++ b/media/plant_01.jpg
diff --git a/images/pt.png b/media/pt.png
index 612d117..612d117 100644
--- a/images/pt.png
+++ b/media/pt.png
diff --git a/images/rock_01.jpg b/media/rock_01.jpg
index c50ccb3..c50ccb3 100644
--- a/images/rock_01.jpg
+++ b/media/rock_01.jpg
diff --git a/images/rock_02.jpg b/media/rock_02.jpg
index 04aea8a..04aea8a 100644
--- a/images/rock_02.jpg
+++ b/media/rock_02.jpg
diff --git a/images/sky_01.jpg b/media/sky_01.jpg
index 22f3050..22f3050 100644
--- a/images/sky_01.jpg
+++ b/media/sky_01.jpg
diff --git a/images/sky_02.jpg b/media/sky_02.jpg
index d0d7448..d0d7448 100644
--- a/images/sky_02.jpg
+++ b/media/sky_02.jpg
diff --git a/images/sky_03.jpg b/media/sky_03.jpg
index cbad02a..cbad02a 100644
--- a/images/sky_03.jpg
+++ b/media/sky_03.jpg
diff --git a/images/sky_04.jpg b/media/sky_04.jpg
index c5cbc18..c5cbc18 100644
--- a/images/sky_04.jpg
+++ b/media/sky_04.jpg
diff --git a/images/test.png b/media/test.png
index fb620d7..fb620d7 100644
--- a/images/test.png
+++ b/media/test.png
diff --git a/images/wood_01.jpg b/media/wood_01.jpg
index 89f1006..89f1006 100644
--- a/images/wood_01.jpg
+++ b/media/wood_01.jpg