From 5b6db32b857c6c55ab455af82a9043e157e08fe8 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Tue, 22 Apr 2014 13:59:32 +1000 Subject: Moved images to media, much better idea. --- ClientHamr/extantz/build.lua | 4 ++-- ClientHamr/extantz/extantz.c | 16 ++++++++-------- LuaSL/build.lua | 4 ++-- LuaSL/src/LuaSL_test.c | 6 +++--- build.lua | 2 +- images/animated_logo.gif | Bin 81411 -> 0 bytes images/bubble.png | Bin 4737 -> 0 bytes images/bubble_sh.png | Bin 1600 -> 0 bytes images/cube-blue.png | Bin 3734 -> 0 bytes images/cube-purple.png | Bin 5835 -> 0 bytes images/logo.png | Bin 81162 -> 0 bytes images/logo_small.png | Bin 5655 -> 0 bytes images/plant_01.jpg | Bin 165867 -> 0 bytes images/pt.png | Bin 875 -> 0 bytes images/rock_01.jpg | Bin 330094 -> 0 bytes images/rock_02.jpg | Bin 285555 -> 0 bytes images/sky_01.jpg | Bin 134813 -> 0 bytes images/sky_02.jpg | Bin 31413 -> 0 bytes images/sky_03.jpg | Bin 73364 -> 0 bytes images/sky_04.jpg | Bin 25078 -> 0 bytes images/test.png | Bin 22869 -> 0 bytes images/wood_01.jpg | Bin 96136 -> 0 bytes media/animated_logo.gif | Bin 0 -> 81411 bytes media/bubble.png | Bin 0 -> 4737 bytes media/bubble_sh.png | Bin 0 -> 1600 bytes media/cube-blue.png | Bin 0 -> 3734 bytes media/cube-purple.png | Bin 0 -> 5835 bytes media/logo.png | Bin 0 -> 81162 bytes media/logo_small.png | Bin 0 -> 5655 bytes media/plant_01.jpg | Bin 0 -> 165867 bytes media/pt.png | Bin 0 -> 875 bytes media/rock_01.jpg | Bin 0 -> 330094 bytes media/rock_02.jpg | Bin 0 -> 285555 bytes media/sky_01.jpg | Bin 0 -> 134813 bytes media/sky_02.jpg | Bin 0 -> 31413 bytes media/sky_03.jpg | Bin 0 -> 73364 bytes media/sky_04.jpg | Bin 0 -> 25078 bytes media/test.png | Bin 0 -> 22869 bytes media/wood_01.jpg | Bin 0 -> 96136 bytes 39 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 images/animated_logo.gif delete mode 100644 images/bubble.png delete mode 100644 images/bubble_sh.png delete mode 100644 images/cube-blue.png delete mode 100644 images/cube-purple.png delete mode 100644 images/logo.png delete mode 100644 images/logo_small.png delete mode 100644 images/plant_01.jpg delete mode 100644 images/pt.png delete mode 100644 images/rock_01.jpg delete mode 100644 images/rock_02.jpg delete mode 100644 images/sky_01.jpg delete mode 100644 images/sky_02.jpg delete mode 100644 images/sky_03.jpg delete mode 100644 images/sky_04.jpg delete mode 100644 images/test.png delete mode 100644 images/wood_01.jpg create mode 100644 media/animated_logo.gif create mode 100644 media/bubble.png create mode 100644 media/bubble_sh.png create mode 100644 media/cube-blue.png create mode 100644 media/cube-purple.png create mode 100644 media/logo.png create mode 100644 media/logo_small.png create mode 100644 media/plant_01.jpg create mode 100644 media/pt.png create mode 100644 media/rock_01.jpg create mode 100644 media/rock_02.jpg create mode 100644 media/sky_01.jpg create mode 100644 media/sky_02.jpg create mode 100644 media/sky_03.jpg create mode 100644 media/sky_04.jpg create mode 100644 media/test.png create mode 100644 media/wood_01.jpg 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/images/animated_logo.gif deleted file mode 100644 index ef201af..0000000 Binary files a/images/animated_logo.gif and /dev/null differ diff --git a/images/bubble.png b/images/bubble.png deleted file mode 100644 index 8fc50f9..0000000 Binary files a/images/bubble.png and /dev/null differ diff --git a/images/bubble_sh.png b/images/bubble_sh.png deleted file mode 100644 index b66c1e6..0000000 Binary files a/images/bubble_sh.png and /dev/null differ diff --git a/images/cube-blue.png b/images/cube-blue.png deleted file mode 100644 index e848d2b..0000000 Binary files a/images/cube-blue.png and /dev/null differ diff --git a/images/cube-purple.png b/images/cube-purple.png deleted file mode 100644 index 096cdbb..0000000 Binary files a/images/cube-purple.png and /dev/null differ diff --git a/images/logo.png b/images/logo.png deleted file mode 100644 index 7dbae67..0000000 Binary files a/images/logo.png and /dev/null differ diff --git a/images/logo_small.png b/images/logo_small.png deleted file mode 100644 index c7dc665..0000000 Binary files a/images/logo_small.png and /dev/null differ diff --git a/images/plant_01.jpg b/images/plant_01.jpg deleted file mode 100644 index f1714dd..0000000 Binary files a/images/plant_01.jpg and /dev/null differ diff --git a/images/pt.png b/images/pt.png deleted file mode 100644 index 612d117..0000000 Binary files a/images/pt.png and /dev/null differ diff --git a/images/rock_01.jpg b/images/rock_01.jpg deleted file mode 100644 index c50ccb3..0000000 Binary files a/images/rock_01.jpg and /dev/null differ diff --git a/images/rock_02.jpg b/images/rock_02.jpg deleted file mode 100644 index 04aea8a..0000000 Binary files a/images/rock_02.jpg and /dev/null differ diff --git a/images/sky_01.jpg b/images/sky_01.jpg deleted file mode 100644 index 22f3050..0000000 Binary files a/images/sky_01.jpg and /dev/null differ diff --git a/images/sky_02.jpg b/images/sky_02.jpg deleted file mode 100644 index d0d7448..0000000 Binary files a/images/sky_02.jpg and /dev/null differ diff --git a/images/sky_03.jpg b/images/sky_03.jpg deleted file mode 100644 index cbad02a..0000000 Binary files a/images/sky_03.jpg and /dev/null differ diff --git a/images/sky_04.jpg b/images/sky_04.jpg deleted file mode 100644 index c5cbc18..0000000 Binary files a/images/sky_04.jpg and /dev/null differ diff --git a/images/test.png b/images/test.png deleted file mode 100644 index fb620d7..0000000 Binary files a/images/test.png and /dev/null differ diff --git a/images/wood_01.jpg b/images/wood_01.jpg deleted file mode 100644 index 89f1006..0000000 Binary files a/images/wood_01.jpg and /dev/null differ diff --git a/media/animated_logo.gif b/media/animated_logo.gif new file mode 100644 index 0000000..ef201af Binary files /dev/null and b/media/animated_logo.gif differ diff --git a/media/bubble.png b/media/bubble.png new file mode 100644 index 0000000..8fc50f9 Binary files /dev/null and b/media/bubble.png differ diff --git a/media/bubble_sh.png b/media/bubble_sh.png new file mode 100644 index 0000000..b66c1e6 Binary files /dev/null and b/media/bubble_sh.png differ diff --git a/media/cube-blue.png b/media/cube-blue.png new file mode 100644 index 0000000..e848d2b Binary files /dev/null and b/media/cube-blue.png differ diff --git a/media/cube-purple.png b/media/cube-purple.png new file mode 100644 index 0000000..096cdbb Binary files /dev/null and b/media/cube-purple.png differ diff --git a/media/logo.png b/media/logo.png new file mode 100644 index 0000000..7dbae67 Binary files /dev/null and b/media/logo.png differ diff --git a/media/logo_small.png b/media/logo_small.png new file mode 100644 index 0000000..c7dc665 Binary files /dev/null and b/media/logo_small.png differ diff --git a/media/plant_01.jpg b/media/plant_01.jpg new file mode 100644 index 0000000..f1714dd Binary files /dev/null and b/media/plant_01.jpg differ diff --git a/media/pt.png b/media/pt.png new file mode 100644 index 0000000..612d117 Binary files /dev/null and b/media/pt.png differ diff --git a/media/rock_01.jpg b/media/rock_01.jpg new file mode 100644 index 0000000..c50ccb3 Binary files /dev/null and b/media/rock_01.jpg differ diff --git a/media/rock_02.jpg b/media/rock_02.jpg new file mode 100644 index 0000000..04aea8a Binary files /dev/null and b/media/rock_02.jpg differ diff --git a/media/sky_01.jpg b/media/sky_01.jpg new file mode 100644 index 0000000..22f3050 Binary files /dev/null and b/media/sky_01.jpg differ diff --git a/media/sky_02.jpg b/media/sky_02.jpg new file mode 100644 index 0000000..d0d7448 Binary files /dev/null and b/media/sky_02.jpg differ diff --git a/media/sky_03.jpg b/media/sky_03.jpg new file mode 100644 index 0000000..cbad02a Binary files /dev/null and b/media/sky_03.jpg differ diff --git a/media/sky_04.jpg b/media/sky_04.jpg new file mode 100644 index 0000000..c5cbc18 Binary files /dev/null and b/media/sky_04.jpg differ diff --git a/media/test.png b/media/test.png new file mode 100644 index 0000000..fb620d7 Binary files /dev/null and b/media/test.png differ diff --git a/media/wood_01.jpg b/media/wood_01.jpg new file mode 100644 index 0000000..89f1006 Binary files /dev/null and b/media/wood_01.jpg differ -- cgit v1.1