A rough version of resource implementation in lua

I added a new class, LResourceManager, which should handle loading and saving of resources like
the old ResourceManager, only it does that with the help of lua. I moved the common features of
the two managers (interface + a few functions) to a common base class ResourceManager_base. I
augmented the Resource_base class with two new functions (setFromLua and pushToLua) which are
used by the lua RM instead of getString and setFromString.

Parts of the new RM are written in lua. To avoid loading scripts from a file at runtime I decided
to link compiled lua code straight into the executable. For this purpose I created a small script
which converts a binary file into a declaration of a C array of bytes.

1 files changed, 9 insertions, 1 deletions

diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index 1f93e98..5146810 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -2,6 +2,7 @@ noinst_LIBRARIES = libFbTk.a
 
 AM_CPPFLAGS=@CPPFLAGS@
 INCLUDES = -I$(top_srcdir)/libs/lua/src
+CLEANFILES = LResourceHelper-lua.cc LResourceHelper.luac
 
 if XFT
 xft_SOURCE= XftFontImp.hh XftFontImp.cc
@@ -65,8 +66,15 @@ libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \
         CachedPixmap.hh CachedPixmap.cc \
         Slot.hh Signal.hh MemFun.hh SelectArg.hh \
         Util.hh \
-        Luamm.cc Luamm.hh \
+        Luamm.cc Luamm.hh LResource.cc LResource.hh LResourceHelper-lua.cc \
         ${xpm_SOURCE} \
         ${xft_SOURCE} \
         ${xmb_SOURCE} \
         $(imlib2_SOURCE)
+
+%.luac: %.lua Makefile
+        $(top_builddir)/libs/lua/src/luac -o $@ $<
+
+
+%-lua.cc: %.luac $(top_srcdir)/luatoc.sh Makefile
+        $(top_srcdir)/luatoc.sh $< $@ $(<:.luac=)