From 568c8829db2f886921c7592cadbadbf4241127b6 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 27 Apr 2014 16:48:07 +1000
Subject: Centralise the PACKAGE_* stuff, move our libraries to lib, and
 shuffle stuff to suit.

---
 src/GuiLua/GuiLua.h  | 23 ++---------------------
 src/GuiLua/build.lua |  4 ++--
 src/GuiLua/skang.c   |  6 +-----
 src/GuiLua/test.sh   |  2 +-
 4 files changed, 6 insertions(+), 29 deletions(-)

(limited to 'src/GuiLua')

diff --git a/src/GuiLua/GuiLua.h b/src/GuiLua/GuiLua.h
index 95353fb..2dd77ba 100644
--- a/src/GuiLua/GuiLua.h
+++ b/src/GuiLua/GuiLua.h
@@ -1,27 +1,8 @@
-
-#define EFL_API_OVERRIDE 1
-/* Enable access to unstable EFL API that are still in beta */
-#define EFL_BETA_API_SUPPORT 1
-/* Enable access to unstable EFL EO API. */
-#define EFL_EO_API_SUPPORT 1
-
-#include <stdio.h>
-#include <ctype.h>
-
-#include <Elementary.h>
-
-// This got left out.
-//EAPI Evas_3D_Scene *evas_3d_scene_add(Evas *e);
-
-
-#include <lua.h>
-#include <luajit.h>
-#include <lualib.h>
-#include <lauxlib.h>
-
+#include "SledjHamr.h"
 #include "LumbrJack.h"
 #include "Runnr.h"
 
+
 typedef struct _globals globals;
 
 
diff --git a/src/GuiLua/build.lua b/src/GuiLua/build.lua
index 16f4153..169e198 100755
--- a/src/GuiLua/build.lua
+++ b/src/GuiLua/build.lua
@@ -15,9 +15,9 @@ end
 
 LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS
 
-removeFiles(dir, {'test_c.so', 'GuiLua.o', '../../libraries/libGuiLua.so', '../../skang'})
+removeFiles(dir, {'test_c.so', 'GuiLua.o', lib_d .. '/libGuiLua.so', '../../skang'})
 
 runCommand('C modules',		dir, 'gcc ' .. CFLAGS .. ' -fPIC -shared -o test_c.so test_c.c')
 runCommand(nil,			dir, 'gcc ' .. CFLAGS .. ' -fPIC -c GuiLua.c')
-runCommand('C libraries',	dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libGuiLua.so -o ../../libraries/libGuiLua.so GuiLua.o')
+runCommand('C libraries',	dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libGuiLua.so -o ' .. lib_d .. '/libGuiLua.so GuiLua.o')
 runCommand('C apps',		dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o ../../skang skang.c ' .. LDFLAGS .. ' -lGuiLua ' .. libs)
diff --git a/src/GuiLua/skang.c b/src/GuiLua/skang.c
index facc239..f78c1c5 100644
--- a/src/GuiLua/skang.c
+++ b/src/GuiLua/skang.c
@@ -3,11 +3,7 @@
 
 EAPI_MAIN int elm_main(int argc, char **argv)
 {
-  elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR);
-  elm_app_compile_data_dir_set(PACKAGE_DATA_DIR);
-  elm_app_compile_lib_dir_set(PACKAGE_LIB_DIR);
-  elm_app_info_set(elm_main, "GuiLua", "skang.lua");
-
+  HamrTime(elm_main, "GuiLua");
   GuiLuaDo(argc, argv);
 
   return 0;
diff --git a/src/GuiLua/test.sh b/src/GuiLua/test.sh
index bea2fc3..0cf39d9 100755
--- a/src/GuiLua/test.sh
+++ b/src/GuiLua/test.sh
@@ -2,5 +2,5 @@
 
 wd=$(pwd)
 
-export LUA_PATH="$wd/../../libraries/?.lua;./?.lua"
+export LUA_PATH="$wd/../../lib/?.lua;./?.lua"
 ../../skang -l test -foo "argy bargy"
-- 
cgit v1.1