[Freeciv-Dev] Re: (PR#12706) Events framework: lua+tolua

["Per I. Mathisen" <per@xxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=12706 >

Pong. I unflattened it again because I reused my earlier patch instead of
using Vasco's version. I think it is better left as close as possible to
its original state.

Other than that, well, it works ;)

  - Per

lua_deps2.tar.gz
Description: application/gunzip

Index: configure.ac
===================================================================
RCS file: /home/freeciv/CVS/freeciv/configure.ac,v
retrieving revision 1.99
diff -u -r1.99 configure.ac
--- configure.ac        25 Mar 2005 21:13:48 -0000      1.99
+++ configure.ac        26 Apr 2005 20:54:29 -0000
@@ -664,6 +664,11 @@
          data/history/Makefile 
          utility/Makefile
          utility/ftwl/Makefile
+         dependencies/Makefile
+         dependencies/lua/Makefile
+         dependencies/tolua/Makefile
+         dependencies/lua/src/Makefile
+         dependencies/lua/src/lib/Makefile
          common/Makefile 
          common/aicore/Makefile 
          ai/Makefile 
Index: manual/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/manual/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- manual/Makefile.am  12 Sep 2004 21:19:36 -0000      1.4
+++ manual/Makefile.am  26 Apr 2005 20:54:31 -0000
@@ -14,6 +14,7 @@
       ../ai/libcivai.a ../utility/libcivutility.a ../server/libcivserver.a \
       ../utility/libcivutility.a ../common/aicore/libaicore.a \
       ../server/userdb/libuserdb.a ../client/helpdata.o \
+      ../dependencies/lua/src/liblua.a ../dependencies/lua/src/lib/liblualib.a 
\
       ../server/generator/libgenerator.a
 civmanual_LDADD        = ../utility/libcivutility.a ../common/libcivcommon.a \
       ../ai/libcivai.a ../utility/libcivutility.a ../server/libcivserver.a \
@@ -22,6 +23,7 @@
       ../utility/libcivutility.a ../server/libcivserver.a \
       ../server/userdb/libuserdb.a \
       ../utility/libcivutility.a \
+      ../dependencies/lua/src/liblua.a ../dependencies/lua/src/lib/liblualib.a 
\
       ../common/aicore/libaicore.a \
       ../server/generator/libgenerator.a \
       $(SERVER_LIBS)
Index: server/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/Makefile.am,v
retrieving revision 1.40
diff -u -r1.40 Makefile.am
--- server/Makefile.am  31 Oct 2004 22:32:33 -0000      1.40
+++ server/Makefile.am  26 Apr 2005 20:54:31 -0000
@@ -4,8 +4,10 @@
 
 bin_PROGRAMS = civserver
 noinst_LIBRARIES = libcivserver.a
-AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(srcdir)/../common -I$(srcdir)/../ai 
-I../intl -I$(top_srcdir)/common/aicore -I$(srcdir)/userdb -I$(srcdir)/generator
-
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/utility -I$(srcdir)/../common -I$(srcdir)/../ai \
+       -I../intl -I$(top_srcdir)/common/aicore -I$(srcdir)/userdb \
+       -I$(srcdir)/generator -I$(top_srcdir)/dependencies/lua/include
 
 ## Above, note -I../intl instead of -I$(top_srdir/intl) is deliberate.
 
@@ -80,11 +82,15 @@
 civserver_DEPENDENCIES = ../utility/libcivutility.a ../common/libcivcommon.a \
       ../ai/libcivai.a ../utility/libcivutility.a ./libcivserver.a \
       ../utility/libcivutility.a ../common/aicore/libaicore.a \
+      ../dependencies/lua/src/liblua.a ../dependencies/lua/src/lib/liblualib.a 
\
       ./generator/libgenerator.a $(USER_DB_DEP)
 civserver_LDADD        = ../utility/libcivutility.a ../common/libcivcommon.a \
       ../ai/libcivai.a ../utility/libcivutility.a ./libcivserver.a @INTLLIBS@ \
       ../utility/libcivutility.a ../common/libcivcommon.a ../ai/libcivai.a \
       ../utility/libcivutility.a ./libcivserver.a ../utility/libcivutility.a \
       ../common/aicore/libaicore.a ./generator/libgenerator.a \
+      ../dependencies/lua/src/liblua.a ../dependencies/lua/src/lib/liblualib.a 
\
       $(USER_DB_LIB) $(SERVER_LIBS)
 
+
+