diff options
author | David Walter Seikel | 2014-04-27 16:48:07 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-04-27 16:48:07 +1000 |
commit | 568c8829db2f886921c7592cadbadbf4241127b6 (patch) | |
tree | 0af400526db683fa4ff5fb18a7eb2f685795fd04 /src/GuiLua | |
parent | Added stuff cut and pasted from the new Evas_3d examples, but they are broken... (diff) | |
download | SledjHamr-568c8829db2f886921c7592cadbadbf4241127b6.zip SledjHamr-568c8829db2f886921c7592cadbadbf4241127b6.tar.gz SledjHamr-568c8829db2f886921c7592cadbadbf4241127b6.tar.bz2 SledjHamr-568c8829db2f886921c7592cadbadbf4241127b6.tar.xz |
Centralise the PACKAGE_* stuff, move our libraries to lib, and shuffle stuff to suit.
Diffstat (limited to 'src/GuiLua')
-rw-r--r-- | src/GuiLua/GuiLua.h | 23 | ||||
-rwxr-xr-x | src/GuiLua/build.lua | 4 | ||||
-rw-r--r-- | src/GuiLua/skang.c | 6 | ||||
-rwxr-xr-x | src/GuiLua/test.sh | 2 |
4 files changed, 6 insertions, 29 deletions
diff --git a/src/GuiLua/GuiLua.h b/src/GuiLua/GuiLua.h index 95353fb..2dd77ba 100644 --- a/src/GuiLua/GuiLua.h +++ b/src/GuiLua/GuiLua.h | |||
@@ -1,27 +1,8 @@ | |||
1 | 1 | #include "SledjHamr.h" | |
2 | #define EFL_API_OVERRIDE 1 | ||
3 | /* Enable access to unstable EFL API that are still in beta */ | ||
4 | #define EFL_BETA_API_SUPPORT 1 | ||
5 | /* Enable access to unstable EFL EO API. */ | ||
6 | #define EFL_EO_API_SUPPORT 1 | ||
7 | |||
8 | #include <stdio.h> | ||
9 | #include <ctype.h> | ||
10 | |||
11 | #include <Elementary.h> | ||
12 | |||
13 | // This got left out. | ||
14 | //EAPI Evas_3D_Scene *evas_3d_scene_add(Evas *e); | ||
15 | |||
16 | |||
17 | #include <lua.h> | ||
18 | #include <luajit.h> | ||
19 | #include <lualib.h> | ||
20 | #include <lauxlib.h> | ||
21 | |||
22 | #include "LumbrJack.h" | 2 | #include "LumbrJack.h" |
23 | #include "Runnr.h" | 3 | #include "Runnr.h" |
24 | 4 | ||
5 | |||
25 | typedef struct _globals globals; | 6 | typedef struct _globals globals; |
26 | 7 | ||
27 | 8 | ||
diff --git a/src/GuiLua/build.lua b/src/GuiLua/build.lua index 16f4153..169e198 100755 --- a/src/GuiLua/build.lua +++ b/src/GuiLua/build.lua | |||
@@ -15,9 +15,9 @@ end | |||
15 | 15 | ||
16 | LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS | 16 | LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS |
17 | 17 | ||
18 | removeFiles(dir, {'test_c.so', 'GuiLua.o', '../../libraries/libGuiLua.so', '../../skang'}) | 18 | removeFiles(dir, {'test_c.so', 'GuiLua.o', lib_d .. '/libGuiLua.so', '../../skang'}) |
19 | 19 | ||
20 | runCommand('C modules', dir, 'gcc ' .. CFLAGS .. ' -fPIC -shared -o test_c.so test_c.c') | 20 | runCommand('C modules', dir, 'gcc ' .. CFLAGS .. ' -fPIC -shared -o test_c.so test_c.c') |
21 | runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -fPIC -c GuiLua.c') | 21 | runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -fPIC -c GuiLua.c') |
22 | runCommand('C libraries', dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libGuiLua.so -o ../../libraries/libGuiLua.so GuiLua.o') | 22 | runCommand('C libraries', dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libGuiLua.so -o ' .. lib_d .. '/libGuiLua.so GuiLua.o') |
23 | runCommand('C apps', dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o ../../skang skang.c ' .. LDFLAGS .. ' -lGuiLua ' .. libs) | 23 | runCommand('C apps', dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o ../../skang skang.c ' .. LDFLAGS .. ' -lGuiLua ' .. libs) |
diff --git a/src/GuiLua/skang.c b/src/GuiLua/skang.c index facc239..f78c1c5 100644 --- a/src/GuiLua/skang.c +++ b/src/GuiLua/skang.c | |||
@@ -3,11 +3,7 @@ | |||
3 | 3 | ||
4 | EAPI_MAIN int elm_main(int argc, char **argv) | 4 | EAPI_MAIN int elm_main(int argc, char **argv) |
5 | { | 5 | { |
6 | elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR); | 6 | HamrTime(elm_main, "GuiLua"); |
7 | elm_app_compile_data_dir_set(PACKAGE_DATA_DIR); | ||
8 | elm_app_compile_lib_dir_set(PACKAGE_LIB_DIR); | ||
9 | elm_app_info_set(elm_main, "GuiLua", "skang.lua"); | ||
10 | |||
11 | GuiLuaDo(argc, argv); | 7 | GuiLuaDo(argc, argv); |
12 | 8 | ||
13 | return 0; | 9 | return 0; |
diff --git a/src/GuiLua/test.sh b/src/GuiLua/test.sh index bea2fc3..0cf39d9 100755 --- a/src/GuiLua/test.sh +++ b/src/GuiLua/test.sh | |||
@@ -2,5 +2,5 @@ | |||
2 | 2 | ||
3 | wd=$(pwd) | 3 | wd=$(pwd) |
4 | 4 | ||
5 | export LUA_PATH="$wd/../../libraries/?.lua;./?.lua" | 5 | export LUA_PATH="$wd/../../lib/?.lua;./?.lua" |
6 | ../../skang -l test -foo "argy bargy" | 6 | ../../skang -l test -foo "argy bargy" |