From c616d02cb6193e41ea6d0d1bbc98bc3b6c1b8614 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 28 Mar 2016 23:43:36 +1000
Subject: Move executables to the bin directory.

---
 src/love/build.lua | 6 +++---
 src/love/love.c    | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/love')

diff --git a/src/love/build.lua b/src/love/build.lua
index ff5bf7d..b5200b4 100755
--- a/src/love/build.lua
+++ b/src/love/build.lua
@@ -14,7 +14,7 @@ if 'nil' == type(dir) then
 end
 
 
-removeFiles(dir, {'../../media/love.edj'})
+removeFiles(dir, {data_d .. '/love.edj'})
 
-runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' love.edc ../../media/love.edj')
-compileFiles('../../love', dir, {'love'}, '')
+runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' love.edc ' .. data_d .. '/love.edj')
+compileFiles(bin_d .. '/love', dir, {'love'}, '')
diff --git a/src/love/love.c b/src/love/love.c
index 698726f..0c1a63d 100644
--- a/src/love/love.c
+++ b/src/love/love.c
@@ -666,7 +666,8 @@ int main(int argc, char **argv)
 
 //			    PD("About to try connecting to a LuaSL server.");
 			    // Try to connect to a local LuaSL server.
-			    reachOut("LuaSL", "./LuaSL", "127.0.0.1", ourGlobals.port, &ourGlobals, (Ecore_Event_Handler_Cb) _addLuaSL, /*(Ecore_Event_Handler_Cb) _dataLuaSL*/ NULL, (Ecore_Event_Handler_Cb) _delLuaSL, LuaSLParser, NULL);
+			    snprintf(buf, sizeof(buf), "%s/LuaSL", prefix_bin_get());
+			    reachOut("LuaSL", buf, "127.0.0.1", ourGlobals.port, &ourGlobals, (Ecore_Event_Handler_Cb) _addLuaSL, /*(Ecore_Event_Handler_Cb) _dataLuaSL*/ NULL, (Ecore_Event_Handler_Cb) _delLuaSL, LuaSLParser, NULL);
 
 //			    PD("Love is about to try creating a love server.");
 			    if (openArms("love", ourGlobals.address, ourGlobals.port + 1, &ourGlobals, (Ecore_Event_Handler_Cb) _addClient, NULL, (Ecore_Event_Handler_Cb) _delClient, clientParser, NULL))
-- 
cgit v1.1