Move skang to libraries and base directory.

4 files changed, 7 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index 0fa1ef9..221dde6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 /docs/XMRE.txt
 extantz
 LuaSL
-/src/GuiLua/skang
+skang
 /libraries/irrlicht-1.8.1/bin/Linux/01.HelloWorld
 /libraries/irrlicht-1.8.1/lib/Linux/libIrrlicht.a
 /libraries/irrlicht-1.8.1/source/Irrlicht/C3DSMeshFileLoader.d
diff --git a/src/GuiLua/skang.lua b/libraries/skang.lua
index 23549c3..23549c3 100644
--- a/src/GuiLua/skang.lua
+++ b/libraries/skang.lua
diff --git a/src/GuiLua/build.lua b/src/GuiLua/build.lua
index 7e1da15..16f4153 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', '../../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 ../../libraries/libGuiLua.so GuiLua.o')
-runCommand('C apps',            dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o skang skang.c ' .. LDFLAGS .. ' -lGuiLua ' .. libs)
+runCommand('C apps',            dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o ../../skang skang.c ' .. LDFLAGS .. ' -lGuiLua ' .. libs)
diff --git a/src/GuiLua/test.sh b/src/GuiLua/test.sh
index 1effdb3..bea2fc3 100755
--- a/src/GuiLua/test.sh
+++ b/src/GuiLua/test.sh
@@ -1,3 +1,6 @@
 #! /bin/bash
 
-./skang -l test -foo "argy bargy"
+wd=$(pwd)
+
+export LUA_PATH="$wd/../../libraries/?.lua;./?.lua"
+../../skang -l test -foo "argy bargy"