aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-05-13 12:03:16 +1000
committerDavid Walter Seikel2014-05-13 12:03:16 +1000
commit4a7fb771bd8a2e3d00dab031f88e15c92a6be184 (patch)
tree8787beaff5d2596e08f1f7e835dd1d49f41258d9 /src
parentMove poor mans introspection into winFang.c, and use it in purkle. (diff)
downloadSledjHamr-4a7fb771bd8a2e3d00dab031f88e15c92a6be184.zip
SledjHamr-4a7fb771bd8a2e3d00dab031f88e15c92a6be184.tar.gz
SledjHamr-4a7fb771bd8a2e3d00dab031f88e15c92a6be184.tar.bz2
SledjHamr-4a7fb771bd8a2e3d00dab031f88e15c92a6be184.tar.xz
Add some love, er I mean, add the love world server, coz love makes the world go around.
Actually, it's just the old LuaSL_test harness, but half of that is the love server anyway, the other half is just test harness.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/LuaSL/build.lua5
-rwxr-xr-xsrc/LuaSL/test.sh4
-rwxr-xr-xsrc/love/build.lua27
-rw-r--r--src/love/love.c (renamed from src/LuaSL/LuaSL_test.c)8
-rw-r--r--src/love/love.edc (renamed from src/LuaSL/LuaSL.edc)0
5 files changed, 34 insertions, 10 deletions
diff --git a/src/LuaSL/build.lua b/src/LuaSL/build.lua
index 4bf0c09..0efcca3 100755
--- a/src/LuaSL/build.lua
+++ b/src/LuaSL/build.lua
@@ -14,19 +14,16 @@ if 'nil' == type(dir) then
14end 14end
15 15
16 16
17removeFiles(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'}) 17removeFiles(dir, {'../../LuaSL', '*.o', '*.output', '*.backup', 'LuaSL_lexer.h', 'LuaSL_lexer.c', 'LuaSL_lemon_yaccer.h', 'LuaSL_lemon_yaccer.c', 'LuaSL_lemon_yaccer.out'})
18 18
19-- Run lemon first, flex depends on it to define the symbol values. 19-- Run lemon first, flex depends on it to define the symbol values.
20runCommand('lemon', dir, '../../libraries/lemon/lemon -s -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y') 20runCommand('lemon', dir, '../../libraries/lemon/lemon -s -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y')
21runCommand('flex', dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l') 21runCommand('flex', dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l')
22runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' LuaSL.edc ../../media/LuaSL.edj')
23 22
24-- While SledHamr.c does this, we can't use that here, coz LuaSL is not an Elm app. 23-- While SledHamr.c does this, we can't use that here, coz LuaSL is not an Elm app.
25-- Neither is LuaSL_test actually.
26CFLAGS = CFLAGS .. ' -DPACKAGE_BIN_DIR=\\"' .. bin_d .. '\\"' 24CFLAGS = CFLAGS .. ' -DPACKAGE_BIN_DIR=\\"' .. bin_d .. '\\"'
27CFLAGS = CFLAGS .. ' -DPACKAGE_LIB_DIR=\\"' .. lib_d .. '\\"' 25CFLAGS = CFLAGS .. ' -DPACKAGE_LIB_DIR=\\"' .. lib_d .. '\\"'
28CFLAGS = CFLAGS .. ' -DPACKAGE_DATA_DIR=\\"' .. data_d .. '\\"' 26CFLAGS = CFLAGS .. ' -DPACKAGE_DATA_DIR=\\"' .. data_d .. '\\"'
29CFLAGS = CFLAGS .. ' -DPACKAGE_LOCALE_DIR=\\"' .. locale_d .. '\\"' 27CFLAGS = CFLAGS .. ' -DPACKAGE_LOCALE_DIR=\\"' .. locale_d .. '\\"'
30 28
31compileFiles('../../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_utilities', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}, '') 29compileFiles('../../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_utilities', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}, '')
32compileFiles('LuaSL_test', dir, {'LuaSL_test', 'LuaSL_utilities'}, '')
diff --git a/src/LuaSL/test.sh b/src/LuaSL/test.sh
index 435c5e2..e8471c8 100755
--- a/src/LuaSL/test.sh
+++ b/src/LuaSL/test.sh
@@ -20,8 +20,8 @@ case $@ in
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 love _______________"
24 ./LuaSL_test 24 ../../love
25 ;; 25 ;;
26 26
27esac 27esac
diff --git a/src/love/build.lua b/src/love/build.lua
new file mode 100755
index 0000000..c1a52e2
--- /dev/null
+++ b/src/love/build.lua
@@ -0,0 +1,27 @@
1#!/usr/bin/env lua
2
3local dir = ...
4
5if '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
14end
15
16
17removeFiles(dir, {'../../love', '*.o', '../../media/love.edj'})
18
19runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' love.edc ../../media/love.edj')
20
21-- While SledHamr.c does this, we can't use that here, coz love is not an Elm app.
22CFLAGS = CFLAGS .. ' -DPACKAGE_BIN_DIR=\\"' .. bin_d .. '\\"'
23CFLAGS = CFLAGS .. ' -DPACKAGE_LIB_DIR=\\"' .. lib_d .. '\\"'
24CFLAGS = CFLAGS .. ' -DPACKAGE_DATA_DIR=\\"' .. data_d .. '\\"'
25CFLAGS = CFLAGS .. ' -DPACKAGE_LOCALE_DIR=\\"' .. locale_d .. '\\"'
26
27compileFiles('../../love', dir, {'love', '../LuaSL/LuaSL_utilities'}, '')
diff --git a/src/LuaSL/LuaSL_test.c b/src/love/love.c
index 8fc86c0..e30c8ac 100644
--- a/src/LuaSL/LuaSL_test.c
+++ b/src/love/love.c
@@ -1,5 +1,5 @@
1 1
2#include "LuaSL.h" 2#include "../LuaSL/LuaSL.h"
3 3
4 4
5int logDom; // Our logging domain. 5int logDom; // Our logging domain.
@@ -314,7 +314,7 @@ int main(int argc, char **argv)
314 314
315 if (eina_init()) 315 if (eina_init())
316 { 316 {
317 logDom = loggingStartup("LuaSL_test", logDom); 317 logDom = loggingStartup("love", logDom);
318 ourGlobals.scripts = eina_hash_string_superfast_new(NULL); 318 ourGlobals.scripts = eina_hash_string_superfast_new(NULL);
319 319
320 if (ecore_con_init()) 320 if (ecore_con_init())
@@ -380,7 +380,7 @@ int main(int argc, char **argv)
380 return -1; 380 return -1;
381 } 381 }
382 ourGlobals.canvas = ecore_evas_get(ourGlobals.ee); 382 ourGlobals.canvas = ecore_evas_get(ourGlobals.ee);
383 ecore_evas_title_set(ourGlobals.ee, "LuaSL test harness"); 383 ecore_evas_title_set(ourGlobals.ee, "love test harness (snickers)");
384 ecore_evas_show(ourGlobals.ee); 384 ecore_evas_show(ourGlobals.ee);
385 385
386 ourGlobals.bg = evas_object_rectangle_add(ourGlobals.canvas); 386 ourGlobals.bg = evas_object_rectangle_add(ourGlobals.canvas);
@@ -393,7 +393,7 @@ int main(int argc, char **argv)
393 evas_object_focus_set(ourGlobals.bg, EINA_TRUE); 393 evas_object_focus_set(ourGlobals.bg, EINA_TRUE);
394 394
395 ourGlobals.edje = edje_object_add(ourGlobals.canvas); 395 ourGlobals.edje = edje_object_add(ourGlobals.canvas);
396 snprintf(buf, sizeof(buf), "%s/%s.edj", PACKAGE_DATA_DIR, "LuaSL"); 396 snprintf(buf, sizeof(buf), "%s/%s.edj", PACKAGE_DATA_DIR, "love");
397 if (!edje_object_file_set(ourGlobals.edje, buf, group)) 397 if (!edje_object_file_set(ourGlobals.edje, buf, group))
398 { 398 {
399 int err = edje_object_load_error_get(ourGlobals.edje); 399 int err = edje_object_load_error_get(ourGlobals.edje);
diff --git a/src/LuaSL/LuaSL.edc b/src/love/love.edc
index 844fc8e..844fc8e 100644
--- a/src/LuaSL/LuaSL.edc
+++ b/src/love/love.edc