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 18 files changed, 4 insertions(+), 4 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 (limited to 'ClientHamr/extantz') 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 -- cgit v1.1