diff options
Diffstat (limited to '')
-rw-r--r-- | lib/LSL.lua (renamed from libraries/LSL.lua) | 0 | ||||
-rw-r--r-- | lib/skang.lua (renamed from libraries/skang.lua) | 2 | ||||
-rwxr-xr-x | libraries/build.lua | 24 | ||||
-rw-r--r-- | src/libraries/LumbrJack.c (renamed from libraries/LumbrJack.c) | 0 | ||||
-rw-r--r-- | src/libraries/LumbrJack.h (renamed from libraries/LumbrJack.h) | 0 | ||||
-rw-r--r-- | src/libraries/Runnr.c (renamed from libraries/Runnr.c) | 0 | ||||
-rw-r--r-- | src/libraries/Runnr.h (renamed from libraries/Runnr.h) | 0 |
7 files changed, 1 insertions, 25 deletions
diff --git a/libraries/LSL.lua b/lib/LSL.lua index 662c880..662c880 100644 --- a/libraries/LSL.lua +++ b/lib/LSL.lua | |||
diff --git a/libraries/skang.lua b/lib/skang.lua index 23549c3..633a574 100644 --- a/libraries/skang.lua +++ b/lib/skang.lua | |||
@@ -1010,7 +1010,7 @@ end | |||
1010 | 1010 | ||
1011 | -- Get our C functions installed into skang. | 1011 | -- Get our C functions installed into skang. |
1012 | -- This has to be after thingasm is defined. | 1012 | -- This has to be after thingasm is defined. |
1013 | package.cpath = package.cpath .. ';../../libraries/lib?.so' | 1013 | package.cpath = package.cpath .. ';../../lib/lib?.so' |
1014 | local GuiLua = require 'GuiLua' | 1014 | local GuiLua = require 'GuiLua' |
1015 | 1015 | ||
1016 | 1016 | ||
diff --git a/libraries/build.lua b/libraries/build.lua deleted file mode 100755 index 8b48b70..0000000 --- a/libraries/build.lua +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | #!/usr/bin/env lua | ||
2 | |||
3 | local dir = ... | ||
4 | |||
5 | if 'nil' == type(dir) then | ||
6 | local build, err = loadfile('../build.lua') | ||
7 | if build then | ||
8 | setfenv(build, getfenv(2)) | ||
9 | build('') | ||
10 | else | ||
11 | print("ERROR - " .. err) | ||
12 | end | ||
13 | dir = workingDir | ||
14 | end | ||
15 | |||
16 | LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS | ||
17 | |||
18 | removeFiles(dir, {'LumbrJack.o', 'libLumbrJack.so', 'Runnr.o', 'libRunnr.so'}) | ||
19 | |||
20 | runCommand('C libraries', dir, 'gcc ' .. CFLAGS .. ' -fPIC -c LumbrJack.c') | ||
21 | runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libLumbrJack.so -o libLumbrJack.so LumbrJack.o') | ||
22 | |||
23 | runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -fPIC -c Runnr.c') | ||
24 | runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libRunnr.so -o libRunnr.so Runnr.o') | ||
diff --git a/libraries/LumbrJack.c b/src/libraries/LumbrJack.c index 084d916..084d916 100644 --- a/libraries/LumbrJack.c +++ b/src/libraries/LumbrJack.c | |||
diff --git a/libraries/LumbrJack.h b/src/libraries/LumbrJack.h index 4a3290c..4a3290c 100644 --- a/libraries/LumbrJack.h +++ b/src/libraries/LumbrJack.h | |||
diff --git a/libraries/Runnr.c b/src/libraries/Runnr.c index a24e7f5..a24e7f5 100644 --- a/libraries/Runnr.c +++ b/src/libraries/Runnr.c | |||
diff --git a/libraries/Runnr.h b/src/libraries/Runnr.h index dc720ff..dc720ff 100644 --- a/libraries/Runnr.h +++ b/src/libraries/Runnr.h | |||