From aae73e4dfa340f3ca0239dce92f1b564518ad834 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 21 Apr 2014 20:41:26 +1000
Subject: Shift libGuiLua.so to the libraries directory.

---
 ClientHamr/GuiLua/GuiLua.c  | 2 +-
 ClientHamr/GuiLua/build.lua | 4 ++--
 ClientHamr/GuiLua/skang.lua | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'ClientHamr')

diff --git a/ClientHamr/GuiLua/GuiLua.c b/ClientHamr/GuiLua/GuiLua.c
index 1e6d3fa..c7a368c 100644
--- a/ClientHamr/GuiLua/GuiLua.c
+++ b/ClientHamr/GuiLua/GuiLua.c
@@ -359,7 +359,7 @@ be 'libGuiLua'.
 Normally luaL_register() creates a table of functions, that is the table
 returned, but we want to do something different with skang.
 */
-int luaopen_libGuiLua(lua_State *L)
+int luaopen_GuiLua(lua_State *L)
 {
   int skang;
 
diff --git a/ClientHamr/GuiLua/build.lua b/ClientHamr/GuiLua/build.lua
index 46a4cc5..7e1da15 100755
--- a/ClientHamr/GuiLua/build.lua
+++ b/ClientHamr/GuiLua/build.lua
@@ -15,9 +15,9 @@ end
 
 LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS
 
-removeFiles(dir, {'test_c.so', 'GuiLua.o', 'libGuiLua.so', 'skang'})
+removeFiles(dir, {'test_c.so', 'GuiLua.o', '../../libraries/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 libGuiLua.so GuiLua.o')
+runCommand('C libraries',	dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libGuiLua.so -o ../../libraries/libGuiLua.so GuiLua.o')
 runCommand('C apps',		dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o skang skang.c ' .. LDFLAGS .. ' -lGuiLua ' .. libs)
diff --git a/ClientHamr/GuiLua/skang.lua b/ClientHamr/GuiLua/skang.lua
index 6e22b3d..23549c3 100644
--- a/ClientHamr/GuiLua/skang.lua
+++ b/ClientHamr/GuiLua/skang.lua
@@ -1010,7 +1010,8 @@ end
 
 -- Get our C functions installed into skang.
 -- This has to be after thingasm is defined.
-local GuiLua = require 'libGuiLua'
+package.cpath = package.cpath .. ';../../libraries/lib?.so'
+local GuiLua = require 'GuiLua'
 
 
 thingasm('module,l',	'Load a module.',				module, 'file')
-- 
cgit v1.1