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.

---
 LuaSL/src/LuaSL.h              |   2 +-
 LuaSL/src/LuaSL_compile.c      |   4 ++--
 LuaSL/src/LuaSL_test.c         |   4 ++--
 LuaSL/src/images/bubble.png    | Bin 4737 -> 0 bytes
 LuaSL/src/images/bubble_sh.png | Bin 1600 -> 0 bytes
 LuaSL/src/images/test.png      | Bin 22869 -> 0 bytes
 6 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 LuaSL/src/images/bubble.png
 delete mode 100644 LuaSL/src/images/bubble_sh.png
 delete mode 100644 LuaSL/src/images/test.png

(limited to 'LuaSL/src')

diff --git a/LuaSL/src/LuaSL.h b/LuaSL/src/LuaSL.h
index 5dfa0eb..9055ca8 100644
--- a/LuaSL/src/LuaSL.h
+++ b/LuaSL/src/LuaSL.h
@@ -1,7 +1,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #else
-#define PACKAGE_EXAMPLES_DIR "."
+//#define PACKAGE_EXAMPLES_DIR "."
 #define __UNUSED__
 #endif
 
diff --git a/LuaSL/src/LuaSL_compile.c b/LuaSL/src/LuaSL_compile.c
index afff67f..4a0a42f 100644
--- a/LuaSL/src/LuaSL_compile.c
+++ b/LuaSL/src/LuaSL_compile.c
@@ -2119,9 +2119,9 @@ boolean compilerSetup(gameGlobals *ourGlobals)
 	}
 
 	// Compile the constants.
-	snprintf(buf, sizeof(buf), "lua -e 'require(\"LSL\").gimmeLSL()' > %s/constants.lsl", PACKAGE_DATA_DIR);
+	snprintf(buf, sizeof(buf), "lua -e 'require(\"LSL\").gimmeLSL()' > %s/LuaSL/constants.lsl", PACKAGE_DATA_DIR);
 	system(buf);
-	snprintf(buf, sizeof(buf), "%s/constants.lsl", PACKAGE_DATA_DIR);
+	snprintf(buf, sizeof(buf), "%s/LuaSL/constants.lsl", PACKAGE_DATA_DIR);
 	compileLSL(ourGlobals, NULL, "FAKE_SID", buf, TRUE);
 
 	return TRUE;
diff --git a/LuaSL/src/LuaSL_test.c b/LuaSL/src/LuaSL_test.c
index 51fd902..74236cf 100644
--- a/LuaSL/src/LuaSL_test.c
+++ b/LuaSL/src/LuaSL_test.c
@@ -147,7 +147,7 @@ static Eina_Bool _add(void *data, int type __UNUSED__, Ecore_Con_Event_Server_Ad
 
     ourGlobals->server = ev->server;
     gettimeofday(&startTime, NULL);
-    snprintf(buf, sizeof(buf), "%s/Test sim/objects", PACKAGE_DATA_DIR);
+    snprintf(buf, sizeof(buf), "%s/LuaSL/Test sim/objects", PACKAGE_DATA_DIR);
     eina_file_dir_list(buf, EINA_TRUE, dirList_compile, ourGlobals);
     // Wait awhile, then start sending events for testing.
     ecore_timer_add(0.5, _timer_cb, ourGlobals);
@@ -391,7 +391,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/%s.edj", PACKAGE_DATA_DIR, "LuaSL");
+				snprintf(buf, sizeof(buf), "%s/LuaSL/%s.edj", PACKAGE_DATA_DIR, "LuaSL");
 				if (!edje_object_file_set(ourGlobals.edje, buf, group))
 				{
 				    int err = edje_object_load_error_get(ourGlobals.edje);
diff --git a/LuaSL/src/images/bubble.png b/LuaSL/src/images/bubble.png
deleted file mode 100644
index 8fc50f9..0000000
Binary files a/LuaSL/src/images/bubble.png and /dev/null differ
diff --git a/LuaSL/src/images/bubble_sh.png b/LuaSL/src/images/bubble_sh.png
deleted file mode 100644
index b66c1e6..0000000
Binary files a/LuaSL/src/images/bubble_sh.png and /dev/null differ
diff --git a/LuaSL/src/images/test.png b/LuaSL/src/images/test.png
deleted file mode 100644
index fb620d7..0000000
Binary files a/LuaSL/src/images/test.png and /dev/null differ
-- 
cgit v1.1