aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-04-22 15:28:00 +1000
committerDavid Walter Seikel2014-04-22 15:28:00 +1000
commit04aad7d4781335c6abbc94a6fe677208b87dee82 (patch)
treed2a06507f345b6be52df52ded2670c5bec9d0150 /src
parentMove all source into the new src directory, and shuffle a few other things ar... (diff)
downloadSledjHamr-04aad7d4781335c6abbc94a6fe677208b87dee82.zip
SledjHamr-04aad7d4781335c6abbc94a6fe677208b87dee82.tar.gz
SledjHamr-04aad7d4781335c6abbc94a6fe677208b87dee82.tar.bz2
SledjHamr-04aad7d4781335c6abbc94a6fe677208b87dee82.tar.xz
Move skang to libraries and base directory.
Diffstat (limited to '')
-rw-r--r--libraries/skang.lua (renamed from src/GuiLua/skang.lua)0
-rwxr-xr-xsrc/GuiLua/build.lua4
-rwxr-xr-xsrc/GuiLua/test.sh5
3 files changed, 6 insertions, 3 deletions
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
15 15
16LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS 16LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS
17 17
18removeFiles(dir, {'test_c.so', 'GuiLua.o', '../../libraries/libGuiLua.so', 'skang'}) 18removeFiles(dir, {'test_c.so', 'GuiLua.o', '../../libraries/libGuiLua.so', '../../skang'})
19 19
20runCommand('C modules', dir, 'gcc ' .. CFLAGS .. ' -fPIC -shared -o test_c.so test_c.c') 20runCommand('C modules', dir, 'gcc ' .. CFLAGS .. ' -fPIC -shared -o test_c.so test_c.c')
21runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -fPIC -c GuiLua.c') 21runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -fPIC -c GuiLua.c')
22runCommand('C libraries', dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libGuiLua.so -o ../../libraries/libGuiLua.so GuiLua.o') 22runCommand('C libraries', dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libGuiLua.so -o ../../libraries/libGuiLua.so GuiLua.o')
23runCommand('C apps', dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o skang skang.c ' .. LDFLAGS .. ' -lGuiLua ' .. libs) 23runCommand('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 @@
1#! /bin/bash 1#! /bin/bash
2 2
3./skang -l test -foo "argy bargy" 3wd=$(pwd)
4
5export LUA_PATH="$wd/../../libraries/?.lua;./?.lua"
6../../skang -l test -foo "argy bargy"