Cleanups for EFL.

3 files changed, 7 insertions, 22 deletions

diff --git a/LuaSL/README b/LuaSL/README
index c02b180..c019fb7 100644
--- a/LuaSL/README
+++ b/LuaSL/README
@@ -5,6 +5,10 @@ compatability first, then adding Lua extensions.  It aims to replace the
 woeful XEngine from OpenSim, and at a later stage, be the basis for a
 client side scripting engine.
 
+To compile this, you will need Enlightenment Foundation Libraries (EFL)
+installed in either /opt/e17 or /usr.  These are typical places it get's
+installed in.
+
 
 Design.
 -------
@@ -61,23 +65,3 @@ etc.
 
 Performance testing will have to be done on 5000 scripts, to see how
 that compares against XEngine.
-
-
-Parser.
--------
-
-The SL viewer code includes a flex/bison based parser that generates C++
-code that depends on various other bits of LL source code.  It's GPL 2,
-though the flex and bison source files includes no license text.
-
-Flex is BSD and written in C.  Bison is GNU (GPL 3 since 2.4.1, 2.3 is
-GPL2) and written in C.  It used to include info that stuff generated by
-bison had to be GPL.  Berkeley YACC is public domain, and written in C. 
-There is also btyacc, based on the berkeley version, but with some
-useful extras.  btyacc version 3 (the version coming from my version of
-Ubuntu) apparently no longer supports C, only C++.  It's written in C
-though.
-
-Let's see if flex and btyacc will do the trick, and output C.  Might be
-best to have the LSL to Lua converter as a seperate executable.  Think
-I'll end up writing my own parser.
diff --git a/LuaSL/build.sh b/LuaSL/build.sh
index 65c1581..7455847 100755
--- a/LuaSL/build.sh
+++ b/LuaSL/build.sh
@@ -6,6 +6,8 @@ export LOCALDIR=`pwd`
 cd src
 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
 
+
+# This assumes you have EFL installed in one of two standard places.
 if [ -d "/opt/e17" ]
 then
     export E17DIR="/opt/e17"
diff --git a/LuaSL/src/LuaSL_lexer.l b/LuaSL/src/LuaSL_lexer.l
index 2661b76..8a5e8ad 100644
--- a/LuaSL/src/LuaSL_lexer.l
+++ b/LuaSL/src/LuaSL_lexer.l
@@ -1,8 +1,7 @@
 %{
 
-#include "LuaSL.h"
 #define excludeLexer
-#include "LuaSL_LSL_tree.h"
+#include "LuaSL.h"
 
 int common(YYSTYPE *lval, char *text, LuaSL_yyparseParam *param, boolean checkIgnorable, int type);