diff options
author | David Walter Seikel | 2012-01-24 16:33:31 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-24 16:33:31 +1000 |
commit | be303cb62fab0bd3bfc0f67705b91d1279bf9818 (patch) | |
tree | c1e17649293f736903f04b102e5e69f69407906a | |
parent | Make the script engine testing UI a command option. (diff) | |
download | SledjHamr-be303cb62fab0bd3bfc0f67705b91d1279bf9818.zip SledjHamr-be303cb62fab0bd3bfc0f67705b91d1279bf9818.tar.gz SledjHamr-be303cb62fab0bd3bfc0f67705b91d1279bf9818.tar.bz2 SledjHamr-be303cb62fab0bd3bfc0f67705b91d1279bf9818.tar.xz |
Clean up the LuaSL build, and link to LuaJIT.
Diffstat (limited to '')
-rwxr-xr-x | LuaSL/build.sh | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/LuaSL/build.sh b/LuaSL/build.sh index 4f80cb4..15e1d52 100755 --- a/LuaSL/build.sh +++ b/LuaSL/build.sh | |||
@@ -4,7 +4,7 @@ | |||
4 | export LOCALDIR=`pwd` | 4 | export LOCALDIR=`pwd` |
5 | 5 | ||
6 | cd src | 6 | cd src |
7 | rm -f ../LuaSL ../LuaSL_parser ../*.o *.output *.backup ../*.edj LuaSL_lexer.h LuaSL_lexer.c LuaSL_lemon_yaccer.h LuaSL_lemon_yaccer.c LuaSL_lemon_yaccer.out | 7 | rm -f ../LuaSL *.o *.output *.backup ../luac.out ../*.edj LuaSL_lexer.h LuaSL_lexer.c LuaSL_lemon_yaccer.h LuaSL_lemon_yaccer.c LuaSL_lemon_yaccer.out |
8 | 8 | ||
9 | 9 | ||
10 | # This assumes you have EFL installed in one of two standard places. | 10 | # This assumes you have EFL installed in one of two standard places. |
@@ -21,29 +21,20 @@ CFLAGS="-g -Wall -I include -I $LOCALDIR/src" | |||
21 | CFLAGS="$CFLAGS -I $E17DIR/include/eina-1" | 21 | CFLAGS="$CFLAGS -I $E17DIR/include/eina-1" |
22 | CFLAGS="$CFLAGS -I $E17DIR/include/eina-1/eina" | 22 | CFLAGS="$CFLAGS -I $E17DIR/include/eina-1/eina" |
23 | CFLAGS="$CFLAGS -I $E17DIR/include/eet-1" | 23 | CFLAGS="$CFLAGS -I $E17DIR/include/eet-1" |
24 | CFLAGS="$CFLAGS -I $E17DIR/include/embryo-1" | ||
24 | CFLAGS="$CFLAGS -I $E17DIR/include/edje-1" | 25 | CFLAGS="$CFLAGS -I $E17DIR/include/edje-1" |
25 | CFLAGS="$CFLAGS -I $E17DIR/include/evas-1" | 26 | CFLAGS="$CFLAGS -I $E17DIR/include/evas-1" |
26 | CFLAGS="$CFLAGS -I $E17DIR/include/ecore-1" | 27 | CFLAGS="$CFLAGS -I $E17DIR/include/ecore-1" |
27 | CFLAGS="$CFLAGS -I $E17DIR/include" | 28 | CFLAGS="$CFLAGS -I $E17DIR/include" |
28 | CFLAGS="$CFLAGS -DPACKAGE_DATA_DIR=\"$LOCALDIR\" $CFLAGOPTS" | 29 | CFLAGS="$CFLAGS -DPACKAGE_DATA_DIR=\"$LOCALDIR\" $CFLAGOPTS" |
29 | 30 | ||
30 | LDFLAGS="-L lib -L /usr/lib -L /lib -L $E17DIR/lib" | 31 | LDFLAGS="-L lib -L /usr/lib -L /lib -L $E17DIR/lib -L ../../libraries/luajit-2.0/src" |
31 | libs="-lecore -levas -ledje -leet -leina" | 32 | libs="-lecore -levas -ledje -lembryo -leet -leina -lluajit -lpthread" |
32 | # These need to be added to libs if linking staticaly, though some part of EFL don't like that. | 33 | # These need to be added to libs if linking staticaly, though some parts of EFL don't like that. |
33 | #-lecore_evas \ | 34 | #-lecore_evas \ |
34 | #-lecore_fb \ | ||
35 | #-lecore_file \ | 35 | #-lecore_file \ |
36 | #-lecore \ | ||
37 | #-ledje \ | ||
38 | #-levas \ | ||
39 | #-lembryo \ | ||
40 | #-leet \ | ||
41 | #-leina \ | ||
42 | #-llua \ | ||
43 | #-lm \ | 36 | #-lm \ |
44 | #-ldl \ | 37 | #-ldl \ |
45 | #-lglib-2.0 \ | ||
46 | #-lpthread \ | ||
47 | #-lfontconfig \ | 38 | #-lfontconfig \ |
48 | #-lfreetype \ | 39 | #-lfreetype \ |
49 | #-lexpat \ | 40 | #-lexpat \ |
@@ -71,10 +62,10 @@ names="LuaSL_main LuaSL_compile LuaSL_utilities LuaSL_lexer LuaSL_lemon_yaccer" | |||
71 | objects="" | 62 | objects="" |
72 | for i in $names | 63 | for i in $names |
73 | do | 64 | do |
74 | command="gcc $CFLAGS -c -o ../$i.o $i.c" | 65 | command="gcc $CFLAGS -c -o $i.o $i.c" |
75 | echo $command | 66 | echo $command |
76 | $command | 67 | $command |
77 | objects="$objects ../$i.o" | 68 | objects="$objects $i.o" |
78 | done | 69 | done |
79 | command="gcc $CFLAGS -o ../LuaSL $objects $LDFLAGS $libs" | 70 | command="gcc $CFLAGS -o ../LuaSL $objects $LDFLAGS $libs" |
80 | echo $command | 71 | echo $command |