aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/lib
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-05-05 20:04:08 +1000
committerDavid Walter Seikel2014-05-05 20:04:08 +1000
commit969f1968f2f74f8f09c4788bc7f7b1c9655ad354 (patch)
tree90d1d572f57c03b65c105cdcc47e9b79640a617d /lib
parentGuiLuaDo() now returns astructure, and has that structure in Lua's C registry... (diff)
downloadSledjHamr-969f1968f2f74f8f09c4788bc7f7b1c9655ad354.zip
SledjHamr-969f1968f2f74f8f09c4788bc7f7b1c9655ad354.tar.gz
SledjHamr-969f1968f2f74f8f09c4788bc7f7b1c9655ad354.tar.bz2
SledjHamr-969f1968f2f74f8f09c4788bc7f7b1c9655ad354.tar.xz
Call skang modules from extantz. Needs some clean up.
Diffstat (limited to 'lib')
-rw-r--r--lib/skang.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/skang.lua b/lib/skang.lua
index 880af17..33ae895 100644
--- a/lib/skang.lua
+++ b/lib/skang.lua
@@ -135,7 +135,9 @@ moduleBegin = function (name, author, copyright, version, timestamp, skin, isLua
135 end 135 end
136 _M.VERSION = version .. versionName .. timestamp 136 _M.VERSION = version .. versionName .. timestamp
137 _M.VERSION_DESC = versionDesc 137 _M.VERSION_DESC = versionDesc
138
138 -- If there is a .skang file, read that in and override the passed in skin. 139 -- If there is a .skang file, read that in and override the passed in skin.
140 -- TODO - At this point it would be nice if we knew where the module came from, so we can search for the skin file in THAT directory.
139 local f = io.open(name .. '.skang') 141 local f = io.open(name .. '.skang')
140 if f then 142 if f then
141 skin = f:read('*l') 143 skin = f:read('*l')
@@ -1010,7 +1012,7 @@ end
1010 1012
1011-- Get our C functions installed into skang. 1013-- Get our C functions installed into skang.
1012-- This has to be after thingasm is defined. 1014-- This has to be after thingasm is defined.
1013package.cpath = package.cpath .. ';../../lib/lib?.so' 1015package.cpath = package.cpath .. ';./lib/lib?.so;../lib/lib?.so;../../lib/lib?.so'
1014local GuiLua = require 'GuiLua' 1016local GuiLua = require 'GuiLua'
1015 1017
1016 1018