5 files changed, 34 insertions, 10 deletions

diff --git a/src/LuaSL/build.lua b/src/LuaSL/build.lua
index 4bf0c09..0efcca3 100755
--- a/src/LuaSL/build.lua
+++ b/src/LuaSL/build.lua
@@ -14,19 +14,16 @@ if 'nil' == type(dir) then
 end
 
 
-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'})
+removeFiles(dir, {'../../LuaSL', '*.o', '*.output', '*.backup', '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 ../../media/LuaSL.edj')
 
 -- While SledHamr.c does this, we can't use that here, coz LuaSL is not an Elm app.
--- Neither is LuaSL_test actually.
 CFLAGS = CFLAGS .. ' -DPACKAGE_BIN_DIR=\\"'    .. bin_d    .. '\\"'
 CFLAGS = CFLAGS .. ' -DPACKAGE_LIB_DIR=\\"'    .. lib_d    .. '\\"'
 CFLAGS = CFLAGS .. ' -DPACKAGE_DATA_DIR=\\"'   .. data_d   .. '\\"'
 CFLAGS = CFLAGS .. ' -DPACKAGE_LOCALE_DIR=\\"' .. locale_d .. '\\"'
 
 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/src/LuaSL/test.sh b/src/LuaSL/test.sh
index 435c5e2..e8471c8 100755
--- a/src/LuaSL/test.sh
+++ b/src/LuaSL/test.sh
@@ -20,8 +20,8 @@ case $@ in
         echo "_______________ STARTING LuaSL _______________"
         ../../LuaSL &
         sleep 1
-        echo "_______________ STARTING LuaSL_test _______________"
-        ./LuaSL_test
+        echo "_______________ STARTING love _______________"
+        ../../love
         ;;
 
 esac
diff --git a/src/love/build.lua b/src/love/build.lua
new file mode 100755
index 0000000..c1a52e2
--- /dev/null
+++ b/src/love/build.lua
@@ -0,0 +1,27 @@
+#!/usr/bin/env lua
+
+local dir = ...
+
+if 'nil' == type(dir) then
+  local build, err = loadfile('../../build.lua')
+  if build then
+    setfenv(build, getfenv(2))
+    build(2)
+  else
+    print("ERROR - " .. err)
+  end
+  dir = workingDir
+end
+
+
+removeFiles(dir, {'../../love', '*.o', '../../media/love.edj'})
+
+runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' love.edc ../../media/love.edj')
+
+-- While SledHamr.c does this, we can't use that here, coz love is not an Elm app.
+CFLAGS = CFLAGS .. ' -DPACKAGE_BIN_DIR=\\"'    .. bin_d    .. '\\"'
+CFLAGS = CFLAGS .. ' -DPACKAGE_LIB_DIR=\\"'    .. lib_d    .. '\\"'
+CFLAGS = CFLAGS .. ' -DPACKAGE_DATA_DIR=\\"'   .. data_d   .. '\\"'
+CFLAGS = CFLAGS .. ' -DPACKAGE_LOCALE_DIR=\\"' .. locale_d .. '\\"'
+
+compileFiles('../../love', dir, {'love', '../LuaSL/LuaSL_utilities'}, '')
diff --git a/src/LuaSL/LuaSL_test.c b/src/love/love.c
index 8fc86c0..e30c8ac 100644
--- a/src/LuaSL/LuaSL_test.c
+++ b/src/love/love.c
@@ -1,5 +1,5 @@
 
-#include "LuaSL.h"
+#include "../LuaSL/LuaSL.h"
 
 
 int logDom;     // Our logging domain.
@@ -314,7 +314,7 @@ int main(int argc, char **argv)
 
     if (eina_init())
     {
-        logDom = loggingStartup("LuaSL_test", logDom);
+        logDom = loggingStartup("love", logDom);
         ourGlobals.scripts = eina_hash_string_superfast_new(NULL);
 
         if (ecore_con_init())
@@ -380,7 +380,7 @@ int main(int argc, char **argv)
                                     return -1;
                                 }
                                 ourGlobals.canvas = ecore_evas_get(ourGlobals.ee);
-                                ecore_evas_title_set(ourGlobals.ee, "LuaSL test harness");
+                                ecore_evas_title_set(ourGlobals.ee, "love test harness (snickers)");
                                 ecore_evas_show(ourGlobals.ee);
 
                                 ourGlobals.bg = evas_object_rectangle_add(ourGlobals.canvas);
@@ -393,7 +393,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/%s.edj", PACKAGE_DATA_DIR, "love");
                                 if (!edje_object_file_set(ourGlobals.edje, buf, group))
                                 {
                                     int err = edje_object_load_error_get(ourGlobals.edje);
diff --git a/src/LuaSL/LuaSL.edc b/src/love/love.edc
index 844fc8e..844fc8e 100644
--- a/src/LuaSL/LuaSL.edc
+++ b/src/love/love.edc