aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/LuaSL
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-04-22 13:59:32 +1000
committerDavid Walter Seikel2014-04-22 13:59:32 +1000
commit5b6db32b857c6c55ab455af82a9043e157e08fe8 (patch)
tree7ad87e1a5488b739648d60d477d6d3f0e4b05b80 /LuaSL
parentWe don't need the testlua directory any more. (diff)
downloadSledjHamr-5b6db32b857c6c55ab455af82a9043e157e08fe8.zip
SledjHamr-5b6db32b857c6c55ab455af82a9043e157e08fe8.tar.gz
SledjHamr-5b6db32b857c6c55ab455af82a9043e157e08fe8.tar.bz2
SledjHamr-5b6db32b857c6c55ab455af82a9043e157e08fe8.tar.xz
Moved images to media, much better idea.
Diffstat (limited to 'LuaSL')
-rwxr-xr-xLuaSL/build.lua4
-rw-r--r--LuaSL/src/LuaSL_test.c6
2 files changed, 5 insertions, 5 deletions
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
16dir = dir .. '/src' 16dir = dir .. '/src'
17 17
18removeFiles(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'}) 18removeFiles(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.
21runCommand('lemon', dir, '../../libraries/lemon/lemon -s -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y') 21runCommand('lemon', dir, '../../libraries/lemon/lemon -s -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y')
22runCommand('flex', dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l') 22runCommand('flex', dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l')
23runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' LuaSL.edc ../../images/LuaSL.edj') 23runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' LuaSL.edc ../../media/LuaSL.edj')
24compileFiles('../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_utilities', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}) 24compileFiles('../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_utilities', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'})
25compileFiles('../LuaSL_test', dir, {'LuaSL_test', 'LuaSL_utilities'}) 25compileFiles('../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);