diff options
author | David Walter Seikel | 2014-04-22 15:13:38 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-04-22 15:13:38 +1000 |
commit | dd009ccdfd62f9153dbc72f5f5de5d5f72979690 (patch) | |
tree | 50d62438c6d47dccf82f440986919b1ed3edbbd9 /src | |
parent | Move most of the README's and other docs into the new docs directory. (diff) | |
download | SledjHamr-dd009ccdfd62f9153dbc72f5f5de5d5f72979690.zip SledjHamr-dd009ccdfd62f9153dbc72f5f5de5d5f72979690.tar.gz SledjHamr-dd009ccdfd62f9153dbc72f5f5de5d5f72979690.tar.bz2 SledjHamr-dd009ccdfd62f9153dbc72f5f5de5d5f72979690.tar.xz |
Move all source into the new src directory, and shuffle a few other things around.
Diffstat (limited to '')
-rw-r--r-- | src/GuiLua/GuiLua.c (renamed from ClientHamr/GuiLua/GuiLua.c) | 0 | ||||
-rw-r--r-- | src/GuiLua/GuiLua.h (renamed from ClientHamr/GuiLua/GuiLua.h) | 0 | ||||
-rwxr-xr-x | src/GuiLua/build.lua (renamed from ClientHamr/GuiLua/build.lua) | 0 | ||||
-rw-r--r-- | src/GuiLua/skang.c (renamed from ClientHamr/GuiLua/skang.c) | 0 | ||||
-rw-r--r-- | src/GuiLua/skang.lua (renamed from ClientHamr/GuiLua/skang.lua) | 0 | ||||
-rw-r--r-- | src/GuiLua/test.lua (renamed from ClientHamr/GuiLua/test.lua) | 0 | ||||
-rw-r--r-- | src/GuiLua/test.properties (renamed from ClientHamr/GuiLua/test.properties) | 0 | ||||
-rwxr-xr-x | src/GuiLua/test.sh (renamed from ClientHamr/GuiLua/test.sh) | 0 | ||||
-rw-r--r-- | src/GuiLua/test.skang (renamed from ClientHamr/GuiLua/test.skang) | 0 | ||||
-rw-r--r-- | src/GuiLua/test_c.c (renamed from ClientHamr/GuiLua/test_c.c) | 0 | ||||
-rw-r--r-- | src/LuaSL/LuaSL.edc (renamed from LuaSL/LuaSL.edc) | 0 | ||||
-rw-r--r-- | src/LuaSL/LuaSL.h (renamed from LuaSL/LuaSL.h) | 0 | ||||
-rw-r--r-- | src/LuaSL/LuaSL_LSL_tree.h (renamed from LuaSL/LuaSL_LSL_tree.h) | 0 | ||||
-rw-r--r-- | src/LuaSL/LuaSL_compile.c (renamed from LuaSL/LuaSL_compile.c) | 4 | ||||
-rw-r--r-- | src/LuaSL/LuaSL_lemon_yaccer.y (renamed from LuaSL/LuaSL_lemon_yaccer.y) | 0 | ||||
-rw-r--r-- | src/LuaSL/LuaSL_lexer.l (renamed from LuaSL/LuaSL_lexer.l) | 0 | ||||
-rw-r--r-- | src/LuaSL/LuaSL_main.c (renamed from LuaSL/LuaSL_main.c) | 0 | ||||
-rw-r--r-- | src/LuaSL/LuaSL_test.c (renamed from LuaSL/LuaSL_test.c) | 0 | ||||
-rw-r--r-- | src/LuaSL/LuaSL_threads.c (renamed from LuaSL/LuaSL_threads.c) | 0 | ||||
-rw-r--r-- | src/LuaSL/LuaSL_threads.h (renamed from LuaSL/LuaSL_threads.h) | 0 | ||||
-rw-r--r-- | src/LuaSL/LuaSL_utilities.c (renamed from LuaSL/LuaSL_utilities.c) | 0 | ||||
-rwxr-xr-x | src/LuaSL/build.lua | 23 | ||||
-rwxr-xr-x | src/LuaSL/test.sh (renamed from LuaSL/test.sh) | 8 | ||||
-rw-r--r-- | src/extantz/CDemo.cpp (renamed from ClientHamr/extantz/CDemo.cpp) | 0 | ||||
-rw-r--r-- | src/extantz/CDemo.h (renamed from ClientHamr/extantz/CDemo.h) | 0 | ||||
-rwxr-xr-x | src/extantz/build.lua (renamed from ClientHamr/extantz/build.lua) | 0 | ||||
-rw-r--r-- | src/extantz/crappisspuke.cpp (renamed from ClientHamr/extantz/crappisspuke.cpp) | 0 | ||||
-rw-r--r-- | src/extantz/extantz.c (renamed from ClientHamr/extantz/extantz.c) | 0 | ||||
-rw-r--r-- | src/extantz/extantz.edc (renamed from ClientHamr/extantz/extantz.edc) | 0 | ||||
-rw-r--r-- | src/extantz/extantz.h (renamed from ClientHamr/extantz/extantz.h) | 0 | ||||
-rw-r--r-- | src/extantz/extantzCamera.cpp (renamed from ClientHamr/extantz/extantzCamera.cpp) | 0 | ||||
-rw-r--r-- | src/extantz/extantzCamera.h (renamed from ClientHamr/extantz/extantzCamera.h) | 0 |
32 files changed, 29 insertions, 6 deletions
diff --git a/ClientHamr/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c index c7a368c..c7a368c 100644 --- a/ClientHamr/GuiLua/GuiLua.c +++ b/src/GuiLua/GuiLua.c | |||
diff --git a/ClientHamr/GuiLua/GuiLua.h b/src/GuiLua/GuiLua.h index 156fa1a..156fa1a 100644 --- a/ClientHamr/GuiLua/GuiLua.h +++ b/src/GuiLua/GuiLua.h | |||
diff --git a/ClientHamr/GuiLua/build.lua b/src/GuiLua/build.lua index 7e1da15..7e1da15 100755 --- a/ClientHamr/GuiLua/build.lua +++ b/src/GuiLua/build.lua | |||
diff --git a/ClientHamr/GuiLua/skang.c b/src/GuiLua/skang.c index facc239..facc239 100644 --- a/ClientHamr/GuiLua/skang.c +++ b/src/GuiLua/skang.c | |||
diff --git a/ClientHamr/GuiLua/skang.lua b/src/GuiLua/skang.lua index 23549c3..23549c3 100644 --- a/ClientHamr/GuiLua/skang.lua +++ b/src/GuiLua/skang.lua | |||
diff --git a/ClientHamr/GuiLua/test.lua b/src/GuiLua/test.lua index 705f7ad..705f7ad 100644 --- a/ClientHamr/GuiLua/test.lua +++ b/src/GuiLua/test.lua | |||
diff --git a/ClientHamr/GuiLua/test.properties b/src/GuiLua/test.properties index 71a371d..71a371d 100644 --- a/ClientHamr/GuiLua/test.properties +++ b/src/GuiLua/test.properties | |||
diff --git a/ClientHamr/GuiLua/test.sh b/src/GuiLua/test.sh index 1effdb3..1effdb3 100755 --- a/ClientHamr/GuiLua/test.sh +++ b/src/GuiLua/test.sh | |||
diff --git a/ClientHamr/GuiLua/test.skang b/src/GuiLua/test.skang index 10382b5..10382b5 100644 --- a/ClientHamr/GuiLua/test.skang +++ b/src/GuiLua/test.skang | |||
diff --git a/ClientHamr/GuiLua/test_c.c b/src/GuiLua/test_c.c index 5328bda..5328bda 100644 --- a/ClientHamr/GuiLua/test_c.c +++ b/src/GuiLua/test_c.c | |||
diff --git a/LuaSL/LuaSL.edc b/src/LuaSL/LuaSL.edc index 844fc8e..844fc8e 100644 --- a/LuaSL/LuaSL.edc +++ b/src/LuaSL/LuaSL.edc | |||
diff --git a/LuaSL/LuaSL.h b/src/LuaSL/LuaSL.h index d1f448e..d1f448e 100644 --- a/LuaSL/LuaSL.h +++ b/src/LuaSL/LuaSL.h | |||
diff --git a/LuaSL/LuaSL_LSL_tree.h b/src/LuaSL/LuaSL_LSL_tree.h index 5415228..5415228 100644 --- a/LuaSL/LuaSL_LSL_tree.h +++ b/src/LuaSL/LuaSL_LSL_tree.h | |||
diff --git a/LuaSL/LuaSL_compile.c b/src/LuaSL/LuaSL_compile.c index 4a0a42f..771888e 100644 --- a/LuaSL/LuaSL_compile.c +++ b/src/LuaSL/LuaSL_compile.c | |||
@@ -2119,9 +2119,9 @@ boolean compilerSetup(gameGlobals *ourGlobals) | |||
2119 | } | 2119 | } |
2120 | 2120 | ||
2121 | // Compile the constants. | 2121 | // Compile the constants. |
2122 | snprintf(buf, sizeof(buf), "lua -e 'require(\"LSL\").gimmeLSL()' > %s/LuaSL/constants.lsl", PACKAGE_DATA_DIR); | 2122 | snprintf(buf, sizeof(buf), "lua -e 'require(\"LSL\").gimmeLSL()' > %s/libraries/constants.lsl", PACKAGE_DATA_DIR); |
2123 | system(buf); | 2123 | system(buf); |
2124 | snprintf(buf, sizeof(buf), "%s/LuaSL/constants.lsl", PACKAGE_DATA_DIR); | 2124 | snprintf(buf, sizeof(buf), "%s/libraries/constants.lsl", PACKAGE_DATA_DIR); |
2125 | compileLSL(ourGlobals, NULL, "FAKE_SID", buf, TRUE); | 2125 | compileLSL(ourGlobals, NULL, "FAKE_SID", buf, TRUE); |
2126 | 2126 | ||
2127 | return TRUE; | 2127 | return TRUE; |
diff --git a/LuaSL/LuaSL_lemon_yaccer.y b/src/LuaSL/LuaSL_lemon_yaccer.y index 182789f..182789f 100644 --- a/LuaSL/LuaSL_lemon_yaccer.y +++ b/src/LuaSL/LuaSL_lemon_yaccer.y | |||
diff --git a/LuaSL/LuaSL_lexer.l b/src/LuaSL/LuaSL_lexer.l index 85b2821..85b2821 100644 --- a/LuaSL/LuaSL_lexer.l +++ b/src/LuaSL/LuaSL_lexer.l | |||
diff --git a/LuaSL/LuaSL_main.c b/src/LuaSL/LuaSL_main.c index 0a40712..0a40712 100644 --- a/LuaSL/LuaSL_main.c +++ b/src/LuaSL/LuaSL_main.c | |||
diff --git a/LuaSL/LuaSL_test.c b/src/LuaSL/LuaSL_test.c index 58d6225..58d6225 100644 --- a/LuaSL/LuaSL_test.c +++ b/src/LuaSL/LuaSL_test.c | |||
diff --git a/LuaSL/LuaSL_threads.c b/src/LuaSL/LuaSL_threads.c index 234a7c5..234a7c5 100644 --- a/LuaSL/LuaSL_threads.c +++ b/src/LuaSL/LuaSL_threads.c | |||
diff --git a/LuaSL/LuaSL_threads.h b/src/LuaSL/LuaSL_threads.h index 9a11b5c..9a11b5c 100644 --- a/LuaSL/LuaSL_threads.h +++ b/src/LuaSL/LuaSL_threads.h | |||
diff --git a/LuaSL/LuaSL_utilities.c b/src/LuaSL/LuaSL_utilities.c index 40263df..40263df 100644 --- a/LuaSL/LuaSL_utilities.c +++ b/src/LuaSL/LuaSL_utilities.c | |||
diff --git a/src/LuaSL/build.lua b/src/LuaSL/build.lua new file mode 100755 index 0000000..f86715c --- /dev/null +++ b/src/LuaSL/build.lua | |||
@@ -0,0 +1,23 @@ | |||
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(2) | ||
10 | else | ||
11 | print("ERROR - " .. err) | ||
12 | end | ||
13 | dir = workingDir | ||
14 | end | ||
15 | |||
16 | removeFiles(dir, {'../../LuaSL', '*.o', '*.output', '*.backup', '../../media/LuaSL.edj', 'LuaSL_lexer.h', 'LuaSL_lexer.c', 'LuaSL_lemon_yaccer.h', 'LuaSL_lemon_yaccer.c', 'LuaSL_lemon_yaccer.out'}) | ||
17 | |||
18 | -- Run lemon first, flex depends on it to define the symbol values. | ||
19 | runCommand('lemon', dir, '../../libraries/lemon/lemon -s -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y') | ||
20 | runCommand('flex', dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l') | ||
21 | runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' LuaSL.edc ../../media/LuaSL.edj') | ||
22 | compileFiles('../../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_utilities', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}) | ||
23 | compileFiles('LuaSL_test', dir, {'LuaSL_test', 'LuaSL_utilities'}) | ||
diff --git a/LuaSL/test.sh b/src/LuaSL/test.sh index 91ee412..1c26ade 100755 --- a/LuaSL/test.sh +++ b/src/LuaSL/test.sh | |||
@@ -4,21 +4,21 @@ wd=$(pwd) | |||
4 | 4 | ||
5 | # Kill any left overs. | 5 | # Kill any left overs. |
6 | killall -KILL LuaSL | 6 | killall -KILL LuaSL |
7 | export LUA_PATH="$wd/?.lua" | 7 | export LUA_PATH="$wd/../../libraries/?.lua" |
8 | 8 | ||
9 | case $@ in | 9 | case $@ in |
10 | 10 | ||
11 | ddd) | 11 | ddd) |
12 | ddd ./LuaSL | 12 | ddd ../../LuaSL |
13 | ;; | 13 | ;; |
14 | 14 | ||
15 | gdb) | 15 | gdb) |
16 | gdb ./LuaSL | 16 | gdb ../../LuaSL |
17 | ;; | 17 | ;; |
18 | 18 | ||
19 | *) | 19 | *) |
20 | echo "_______________ STARTING LuaSL _______________" | 20 | echo "_______________ STARTING LuaSL _______________" |
21 | ./LuaSL & | 21 | ../../LuaSL & |
22 | sleep 1 | 22 | sleep 1 |
23 | echo "_______________ STARTING LuaSL_test _______________" | 23 | echo "_______________ STARTING LuaSL_test _______________" |
24 | ./LuaSL_test | 24 | ./LuaSL_test |
diff --git a/ClientHamr/extantz/CDemo.cpp b/src/extantz/CDemo.cpp index 0ca40f1..0ca40f1 100644 --- a/ClientHamr/extantz/CDemo.cpp +++ b/src/extantz/CDemo.cpp | |||
diff --git a/ClientHamr/extantz/CDemo.h b/src/extantz/CDemo.h index 035c01f..035c01f 100644 --- a/ClientHamr/extantz/CDemo.h +++ b/src/extantz/CDemo.h | |||
diff --git a/ClientHamr/extantz/build.lua b/src/extantz/build.lua index 0bb2a0b..0bb2a0b 100755 --- a/ClientHamr/extantz/build.lua +++ b/src/extantz/build.lua | |||
diff --git a/ClientHamr/extantz/crappisspuke.cpp b/src/extantz/crappisspuke.cpp index 2af9dde..2af9dde 100644 --- a/ClientHamr/extantz/crappisspuke.cpp +++ b/src/extantz/crappisspuke.cpp | |||
diff --git a/ClientHamr/extantz/extantz.c b/src/extantz/extantz.c index 09b5196..09b5196 100644 --- a/ClientHamr/extantz/extantz.c +++ b/src/extantz/extantz.c | |||
diff --git a/ClientHamr/extantz/extantz.edc b/src/extantz/extantz.edc index b4ed0b3..b4ed0b3 100644 --- a/ClientHamr/extantz/extantz.edc +++ b/src/extantz/extantz.edc | |||
diff --git a/ClientHamr/extantz/extantz.h b/src/extantz/extantz.h index afb94af..afb94af 100644 --- a/ClientHamr/extantz/extantz.h +++ b/src/extantz/extantz.h | |||
diff --git a/ClientHamr/extantz/extantzCamera.cpp b/src/extantz/extantzCamera.cpp index 6a7d36a..6a7d36a 100644 --- a/ClientHamr/extantz/extantzCamera.cpp +++ b/src/extantz/extantzCamera.cpp | |||
diff --git a/ClientHamr/extantz/extantzCamera.h b/src/extantz/extantzCamera.h index 9d74236..9d74236 100644 --- a/ClientHamr/extantz/extantzCamera.h +++ b/src/extantz/extantzCamera.h | |||