diff options
author | David Walter Seikel | 2014-05-13 12:03:16 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-05-13 12:03:16 +1000 |
commit | 4a7fb771bd8a2e3d00dab031f88e15c92a6be184 (patch) | |
tree | 8787beaff5d2596e08f1f7e835dd1d49f41258d9 /src/love | |
parent | Move poor mans introspection into winFang.c, and use it in purkle. (diff) | |
download | SledjHamr-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 '')
-rwxr-xr-x | src/love/build.lua | 27 | ||||
-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 |
3 files changed, 31 insertions, 4 deletions
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 | |||
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 | |||
17 | removeFiles(dir, {'../../love', '*.o', '../../media/love.edj'}) | ||
18 | |||
19 | runCommand('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. | ||
22 | CFLAGS = CFLAGS .. ' -DPACKAGE_BIN_DIR=\\"' .. bin_d .. '\\"' | ||
23 | CFLAGS = CFLAGS .. ' -DPACKAGE_LIB_DIR=\\"' .. lib_d .. '\\"' | ||
24 | CFLAGS = CFLAGS .. ' -DPACKAGE_DATA_DIR=\\"' .. data_d .. '\\"' | ||
25 | CFLAGS = CFLAGS .. ' -DPACKAGE_LOCALE_DIR=\\"' .. locale_d .. '\\"' | ||
26 | |||
27 | compileFiles('../../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 | ||
5 | int logDom; // Our logging domain. | 5 | int 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 | |||