diff options
author | David Walter Seikel | 2014-04-22 13:59:32 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-04-22 13:59:32 +1000 |
commit | 5b6db32b857c6c55ab455af82a9043e157e08fe8 (patch) | |
tree | 7ad87e1a5488b739648d60d477d6d3f0e4b05b80 | |
parent | We don't need the testlua directory any more. (diff) | |
download | SledjHamr-5b6db32b857c6c55ab455af82a9043e157e08fe8.zip SledjHamr-5b6db32b857c6c55ab455af82a9043e157e08fe8.tar.gz SledjHamr-5b6db32b857c6c55ab455af82a9043e157e08fe8.tar.bz2 SledjHamr-5b6db32b857c6c55ab455af82a9043e157e08fe8.tar.xz |
Moved images to media, much better idea.
Diffstat (limited to '')
-rwxr-xr-x | ClientHamr/extantz/build.lua | 4 | ||||
-rw-r--r-- | ClientHamr/extantz/extantz.c | 16 | ||||
-rwxr-xr-x | LuaSL/build.lua | 4 | ||||
-rw-r--r-- | LuaSL/src/LuaSL_test.c | 6 | ||||
-rwxr-xr-x | build.lua | 2 | ||||
-rw-r--r-- | media/animated_logo.gif (renamed from images/animated_logo.gif) | bin | 81411 -> 81411 bytes | |||
-rw-r--r-- | media/bubble.png (renamed from images/bubble.png) | bin | 4737 -> 4737 bytes | |||
-rw-r--r-- | media/bubble_sh.png (renamed from images/bubble_sh.png) | bin | 1600 -> 1600 bytes | |||
-rw-r--r-- | media/cube-blue.png (renamed from images/cube-blue.png) | bin | 3734 -> 3734 bytes | |||
-rw-r--r-- | media/cube-purple.png (renamed from images/cube-purple.png) | bin | 5835 -> 5835 bytes | |||
-rw-r--r-- | media/logo.png (renamed from images/logo.png) | bin | 81162 -> 81162 bytes | |||
-rw-r--r-- | media/logo_small.png (renamed from images/logo_small.png) | bin | 5655 -> 5655 bytes | |||
-rw-r--r-- | media/plant_01.jpg (renamed from images/plant_01.jpg) | bin | 165867 -> 165867 bytes | |||
-rw-r--r-- | media/pt.png (renamed from images/pt.png) | bin | 875 -> 875 bytes | |||
-rw-r--r-- | media/rock_01.jpg (renamed from images/rock_01.jpg) | bin | 330094 -> 330094 bytes | |||
-rw-r--r-- | media/rock_02.jpg (renamed from images/rock_02.jpg) | bin | 285555 -> 285555 bytes | |||
-rw-r--r-- | media/sky_01.jpg (renamed from images/sky_01.jpg) | bin | 134813 -> 134813 bytes | |||
-rw-r--r-- | media/sky_02.jpg (renamed from images/sky_02.jpg) | bin | 31413 -> 31413 bytes | |||
-rw-r--r-- | media/sky_03.jpg (renamed from images/sky_03.jpg) | bin | 73364 -> 73364 bytes | |||
-rw-r--r-- | media/sky_04.jpg (renamed from images/sky_04.jpg) | bin | 25078 -> 25078 bytes | |||
-rw-r--r-- | media/test.png (renamed from images/test.png) | bin | 22869 -> 22869 bytes | |||
-rw-r--r-- | media/wood_01.jpg (renamed from images/wood_01.jpg) | bin | 96136 -> 96136 bytes |
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 | |||
17 | LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux' | 17 | LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux' |
18 | libs = libs .. ' -lIrrlicht -lGL -lbz2' | 18 | libs = libs .. ' -lIrrlicht -lGL -lbz2' |
19 | 19 | ||
20 | removeFiles(dir, {'extantz', 'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', '../../images/extantz.edj'}) | 20 | removeFiles(dir, {'extantz', 'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', '../../media/extantz.edj'}) |
21 | 21 | ||
22 | runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../images/extantz.edj') | 22 | runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../media/extantz.edj') |
23 | runCommand('Irrlicht files', dir, 'g++ ' .. CFLAGS .. ' -O3 -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS) | 23 | runCommand('Irrlicht files', dir, 'g++ ' .. CFLAGS .. ' -O3 -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS) |
24 | runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -O3 -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS) | 24 | runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -O3 -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS) |
25 | runCommand('extantz', dir, 'g++ ' .. CFLAGS .. ' -O3 -ffast-math -c extantzCamera.cpp -o extantzCamera.o ' .. LDFLAGS) | 25 | 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; | |||
37 | static Elm_Genlist_Item_Class *account_gic = NULL; | 37 | static Elm_Genlist_Item_Class *account_gic = NULL; |
38 | static Elm_Genlist_Item_Class *viewer_gic = NULL; | 38 | static Elm_Genlist_Item_Class *viewer_gic = NULL; |
39 | 39 | ||
40 | //static const char *img1 = PACKAGE_DATA_DIR "/images/plant_01.jpg"; | 40 | //static const char *img1 = PACKAGE_DATA_DIR "/media/plant_01.jpg"; |
41 | //static const char *img2 = PACKAGE_DATA_DIR "/images/sky_01.jpg"; | 41 | //static const char *img2 = PACKAGE_DATA_DIR "/media/sky_01.jpg"; |
42 | static const char *img3 = PACKAGE_DATA_DIR "/images/rock_01.jpg"; | 42 | static const char *img3 = PACKAGE_DATA_DIR "/media/rock_01.jpg"; |
43 | 43 | ||
44 | 44 | ||
45 | #define EPHYSICS_TEST_THEME "extantz" | 45 | #define EPHYSICS_TEST_THEME "extantz" |
@@ -1090,7 +1090,7 @@ static void create_handles(Evas_Object *obj) | |||
1090 | 1090 | ||
1091 | hand = evas_object_image_filled_add(evas_object_evas_get(obj)); | 1091 | hand = evas_object_image_filled_add(evas_object_evas_get(obj)); |
1092 | evas_object_resize(hand, 31, 31); | 1092 | evas_object_resize(hand, 31, 31); |
1093 | snprintf(buf, sizeof(buf), "%s/images/pt.png", elm_app_data_dir_get()); | 1093 | snprintf(buf, sizeof(buf), "%s/media/pt.png", elm_app_data_dir_get()); |
1094 | evas_object_image_file_set(hand, buf, NULL); | 1094 | evas_object_image_file_set(hand, buf, NULL); |
1095 | if (i == 0) evas_object_move(hand, x - 15, y - 15); | 1095 | if (i == 0) evas_object_move(hand, x - 15, y - 15); |
1096 | else if (i == 1) evas_object_move(hand, x + w - 15, y - 15); | 1096 | 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) | |||
1404 | // If you want efl to handle finding your bin/lib/data dirs, you must do this below. | 1404 | // If you want efl to handle finding your bin/lib/data dirs, you must do this below. |
1405 | elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR); | 1405 | elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR); |
1406 | elm_app_compile_data_dir_set(PACKAGE_DATA_DIR); | 1406 | elm_app_compile_data_dir_set(PACKAGE_DATA_DIR); |
1407 | elm_app_info_set(elm_main, "datadir", "images/sky_03.jpg"); | 1407 | elm_app_info_set(elm_main, "datadir", "media/sky_03.jpg"); |
1408 | fprintf(stdout, "prefix was set to: %s\n", elm_app_prefix_dir_get()); | 1408 | fprintf(stdout, "prefix was set to: %s\n", elm_app_prefix_dir_get()); |
1409 | fprintf(stdout, "data directory is: %s\n", elm_app_data_dir_get()); | 1409 | fprintf(stdout, "data directory is: %s\n", elm_app_data_dir_get()); |
1410 | fprintf(stdout, "library directory is: %s\n", elm_app_lib_dir_get()); | 1410 | 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) | |||
1444 | bg = elm_bg_add(gld->win); | 1444 | bg = elm_bg_add(gld->win); |
1445 | elm_bg_load_size_set(bg, gld->win_w, gld->win_h); | 1445 | elm_bg_load_size_set(bg, gld->win_w, gld->win_h); |
1446 | elm_bg_option_set(bg, ELM_BG_OPTION_CENTER); | 1446 | elm_bg_option_set(bg, ELM_BG_OPTION_CENTER); |
1447 | snprintf(buf, sizeof(buf), "%s/images/sky_03.jpg", elm_app_data_dir_get()); | 1447 | snprintf(buf, sizeof(buf), "%s/media/sky_03.jpg", elm_app_data_dir_get()); |
1448 | elm_bg_file_set(bg, buf, NULL); | 1448 | elm_bg_file_set(bg, buf, NULL); |
1449 | evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 1449 | evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
1450 | elm_win_resize_object_add(gld->win, bg); | 1450 | elm_win_resize_object_add(gld->win, bg); |
@@ -1538,7 +1538,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
1538 | ephysics_body_friction_set(boundary, 0); | 1538 | ephysics_body_friction_set(boundary, 0); |
1539 | 1539 | ||
1540 | box1 = elm_image_add(gld->win); | 1540 | box1 = elm_image_add(gld->win); |
1541 | elm_image_file_set(box1, PACKAGE_DATA_DIR "/images/" EPHYSICS_TEST_THEME ".edj", "blue-cube"); | 1541 | elm_image_file_set(box1, PACKAGE_DATA_DIR "/media/" EPHYSICS_TEST_THEME ".edj", "blue-cube"); |
1542 | evas_object_move(box1, gld->win_w / 2 - 80, gld->win_h - 200); | 1542 | evas_object_move(box1, gld->win_w / 2 - 80, gld->win_h - 200); |
1543 | evas_object_resize(box1, 70, 70); | 1543 | evas_object_resize(box1, 70, 70); |
1544 | evas_object_show(box1); | 1544 | evas_object_show(box1); |
@@ -1552,7 +1552,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
1552 | ephysics_body_sleeping_threshold_set(box_body1, 0.1, 0.1); | 1552 | ephysics_body_sleeping_threshold_set(box_body1, 0.1, 0.1); |
1553 | 1553 | ||
1554 | box2 = elm_image_add(gld->win); | 1554 | box2 = elm_image_add(gld->win); |
1555 | elm_image_file_set(box2, PACKAGE_DATA_DIR "/images/" EPHYSICS_TEST_THEME ".edj", "purple-cube"); | 1555 | elm_image_file_set(box2, PACKAGE_DATA_DIR "/media/" EPHYSICS_TEST_THEME ".edj", "purple-cube"); |
1556 | evas_object_move(box2, gld->win_w / 2 + 10, gld->win_h - 200); | 1556 | evas_object_move(box2, gld->win_w / 2 + 10, gld->win_h - 200); |
1557 | evas_object_resize(box2, 70, 70); | 1557 | evas_object_resize(box2, 70, 70); |
1558 | evas_object_show(box2); | 1558 | 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 | |||
15 | 15 | ||
16 | dir = dir .. '/src' | 16 | dir = dir .. '/src' |
17 | 17 | ||
18 | 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'}) | 18 | 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'}) |
19 | 19 | ||
20 | -- Run lemon first, flex depends on it to define the symbol values. | 20 | -- Run lemon first, flex depends on it to define the symbol values. |
21 | runCommand('lemon', dir, '../../libraries/lemon/lemon -s -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y') | 21 | runCommand('lemon', dir, '../../libraries/lemon/lemon -s -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y') |
22 | runCommand('flex', dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l') | 22 | runCommand('flex', dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l') |
23 | runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' LuaSL.edc ../../images/LuaSL.edj') | 23 | runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' LuaSL.edc ../../media/LuaSL.edj') |
24 | compileFiles('../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_utilities', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}) | 24 | compileFiles('../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_utilities', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}) |
25 | compileFiles('../LuaSL_test', dir, {'LuaSL_test', 'LuaSL_utilities'}) | 25 | 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) | |||
392 | evas_object_focus_set(ourGlobals.bg, EINA_TRUE); | 392 | evas_object_focus_set(ourGlobals.bg, EINA_TRUE); |
393 | 393 | ||
394 | ourGlobals.edje = edje_object_add(ourGlobals.canvas); | 394 | ourGlobals.edje = edje_object_add(ourGlobals.canvas); |
395 | snprintf(buf, sizeof(buf), "%s/images/%s.edj", PACKAGE_DATA_DIR, "LuaSL"); | 395 | snprintf(buf, sizeof(buf), "%s/media/%s.edj", PACKAGE_DATA_DIR, "LuaSL"); |
396 | if (!edje_object_file_set(ourGlobals.edje, buf, group)) | 396 | if (!edje_object_file_set(ourGlobals.edje, buf, group)) |
397 | { | 397 | { |
398 | int err = edje_object_load_error_get(ourGlobals.edje); | 398 | int err = edje_object_load_error_get(ourGlobals.edje); |
@@ -409,7 +409,7 @@ int main(int argc, char **argv) | |||
409 | evas_object_resize(ourGlobals.edje, WIDTH, HEIGHT); | 409 | evas_object_resize(ourGlobals.edje, WIDTH, HEIGHT); |
410 | evas_object_show(ourGlobals.edje); | 410 | evas_object_show(ourGlobals.edje); |
411 | 411 | ||
412 | snprintf(buf, sizeof(buf), "%s/images/bubble_sh.png", PACKAGE_DATA_DIR); | 412 | snprintf(buf, sizeof(buf), "%s/media/bubble_sh.png", PACKAGE_DATA_DIR); |
413 | for (i = 0; i < (sizeof(names) / sizeof(char *) / 2); i++) | 413 | for (i = 0; i < (sizeof(names) / sizeof(char *) / 2); i++) |
414 | { | 414 | { |
415 | sh = evas_object_image_filled_add(ourGlobals.canvas); | 415 | sh = evas_object_image_filled_add(ourGlobals.canvas); |
@@ -419,7 +419,7 @@ int main(int argc, char **argv) | |||
419 | evas_object_data_set(ourGlobals.bg, names[(i * 2) + 1], sh); | 419 | evas_object_data_set(ourGlobals.bg, names[(i * 2) + 1], sh); |
420 | } | 420 | } |
421 | 421 | ||
422 | snprintf(buf, sizeof(buf), "%s/images/bubble.png", PACKAGE_DATA_DIR); | 422 | snprintf(buf, sizeof(buf), "%s/media/bubble.png", PACKAGE_DATA_DIR); |
423 | for (i = 0; i < (sizeof(names) / sizeof(char *) / 2); i++) | 423 | for (i = 0; i < (sizeof(names) / sizeof(char *) / 2); i++) |
424 | { | 424 | { |
425 | bub = evas_object_image_filled_add(ourGlobals.canvas); | 425 | bub = evas_object_image_filled_add(ourGlobals.canvas); |
@@ -79,7 +79,7 @@ CFLAGS = CFLAGS .. ' ' .. CFLAGOPTS | |||
79 | LDFLAGS = '-L ' .. baseDir .. '/libraries ' .. pkgConfig('libs-only-L', 'luajit') .. ' -L /usr/lib -L /lib' | 79 | LDFLAGS = '-L ' .. baseDir .. '/libraries ' .. pkgConfig('libs-only-L', 'luajit') .. ' -L /usr/lib -L /lib' |
80 | libs = '-lLumbrJack -lRunnr ' .. pkgConfig('libs', 'elementary') .. ' ' .. pkgConfig('libs', 'luajit') .. ' -lpthread -lm -Wl,-rpath,' .. baseDir .. '/libraries' | 80 | libs = '-lLumbrJack -lRunnr ' .. pkgConfig('libs', 'elementary') .. ' ' .. pkgConfig('libs', 'luajit') .. ' -lpthread -lm -Wl,-rpath,' .. baseDir .. '/libraries' |
81 | LFLAGS = '-d' | 81 | LFLAGS = '-d' |
82 | EDJE_FLAGS = '-id ' .. baseDir .. '/images -fd ' .. baseDir .. '/fonts' | 82 | EDJE_FLAGS = '-id ' .. baseDir .. '/media -fd ' .. baseDir .. '/media' |
83 | 83 | ||
84 | 84 | ||
85 | if 'nil' == type(args) then | 85 | 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 | |||
Binary files differ | |||
diff --git a/images/bubble.png b/media/bubble.png index 8fc50f9..8fc50f9 100644 --- a/images/bubble.png +++ b/media/bubble.png | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
diff --git a/images/logo.png b/media/logo.png index 7dbae67..7dbae67 100644 --- a/images/logo.png +++ b/media/logo.png | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
diff --git a/images/pt.png b/media/pt.png index 612d117..612d117 100644 --- a/images/pt.png +++ b/media/pt.png | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
diff --git a/images/test.png b/media/test.png index fb620d7..fb620d7 100644 --- a/images/test.png +++ b/media/test.png | |||
Binary files differ | |||
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 | |||
Binary files differ | |||