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/extantz/build.lua | 10 +++++-----
 src/extantz/extantz.c |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/extantz')

diff --git a/src/extantz/build.lua b/src/extantz/build.lua
index abb449e..d094f74 100755
--- a/src/extantz/build.lua
+++ b/src/extantz/build.lua
@@ -19,13 +19,13 @@ end
 CFLAGS  = CFLAGS  .. ' -I/usr/X11R6/include -I../GuiLua'
 libs    = libs    .. ' -lephysics -lGuiLua'
 
---removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', '../../media/extantz.edj'})
-removeFiles(dir, {'../../media/extantz.edj'})
+--removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', data_d .. '/extantz.edj'})
+removeFiles(dir, {data_d .. '/extantz.edj'})
 
-runCommand('edje_cc',		dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../media/extantz.edj')
+runCommand('edje_cc',		dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ' .. data_d .. '/extantz.edj')
 --runCommand('Irrlicht files',	dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS)
 --runCommand(nil,			dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS)
 --runCommand(nil,			dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c extantzCamera.cpp -o extantzCamera.o ' .. LDFLAGS)
 CFLAGS = CFLAGS .. ' -Wl,-export-dynamic'
---compileFiles('../../extantz',	dir, {'gears', 'ephysics_demo', 'camera', 'files', 'scenri', 'woMan', 'extantz'}, 'crappisspuke.o CDemo.o extantzCamera.o')
-compileFiles('../../extantz',	dir, {'gears', 'ephysics_demo', 'camera', 'files', 'scenri', 'woMan', 'extantz'}, '')
+--compileFiles(bin_d .. '/extantz',	dir, {'gears', 'ephysics_demo', 'camera', 'files', 'scenri', 'woMan', 'extantz'}, 'crappisspuke.o CDemo.o extantzCamera.o')
+compileFiles(bin_d .. '/extantz',	dir, {'gears', 'ephysics_demo', 'camera', 'files', 'scenri', 'woMan', 'extantz'}, '')
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index 159fcaf..1708a6c 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -538,6 +538,7 @@ int skangStep = 0;
 static Eina_Bool _makeSkang(void *data)
 {
   globals *ourGlobals = data;
+  char buf[PATH_MAX];
 
   switch (skangStep++)
   {
@@ -567,7 +568,8 @@ static Eina_Bool _makeSkang(void *data)
 #if USE_LOVE
     case 5 :
 //      PD("About to try connecting to a love server.");
-      reachOut("love", "./love", "127.0.0.1", 8211 + 1, ourGlobals, (Ecore_Event_Handler_Cb) _add, /*(Ecore_Event_Handler_Cb) _data*/ NULL, (Ecore_Event_Handler_Cb) _del, clientParser, NULL);
+      snprintf(buf, sizeof(buf), "%s/love", prefix_bin_get());
+      reachOut("love", buf, "127.0.0.1", 8211 + 1, ourGlobals, (Ecore_Event_Handler_Cb) _add, /*(Ecore_Event_Handler_Cb) _data*/ NULL, (Ecore_Event_Handler_Cb) _del, clientParser, NULL);
       break;
 #endif
 
-- 
cgit v1.1