upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-29 19:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switched to embedded Lua.

Browse Source
This commit is contained in:
Guillaume Melquiond 2010-07-30 08:03:12 +00:00
parent 6d5839397a
commit d81f23c7ca
4 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -857,19 +857,6 @@ CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
CFLAGS="$CFLAGS $ZLIB_CFLAGS"
LIBS="$LIBS $ZLIB_LIBS"
#######################################################################
# Check for Lua #
#######################################################################
PKG_CHECK_MODULES(LUA, [lua >= 5.1], , [
AC_MSG_RESULT([no])
PKG_CHECK_MODULES(LUA, [lua5.1 >= 5.1], , [
AC_MSG_RESULT([no])
PKG_CHECK_MODULES(LUA, [lua-5.1 >= 5.1])
])])
CPPFLAGS="$CPPFLAGS $LUA_CFLAGS"
LIBS="$LIBS $LUA_LIBS"
#######################################################################
# Check for different notifications systems #
#######################################################################

7
src/Makefile.am
View File

@ -340,8 +340,8 @@ wesnoth_SOURCES = \
game.cpp \
$(wesnoth_source)
wesnoth_LDADD = $(INTERNALLIBS) $(THELIBS) $(PANGO_LIBS) $(FONTCONFIG_LIBS)
wesnoth_DEPENDENCIES=libwesnoth-core.a libwesnoth.a
wesnoth_LDADD = $(INTERNALLIBS) $(THELIBS) $(PANGO_LIBS) $(FONTCONFIG_LIBS) lua/liblua.a
wesnoth_DEPENDENCIES=libwesnoth-core.a libwesnoth.a lua/liblua.a
if ANA
wesnoth_LDADD += $(BOOST_SYSTEM_LIBS) $(BOOST_THREAD_LIBS) -lana
wesnoth_DEPENDENCIES += libana.a
@ -557,6 +557,9 @@ libana_a_SOURCES = \
CXXFLAGS += -Iana/api
endif
lua/liblua.a:
$(MAKE) -C lua/ a CC="$(CXX)"
# Until game_config.cpp is removed, this will be needed to ensure that the
# REVISION constant gets updated correctly. If and when that definition is
# moved elsewhere, this dependency must follow it.

6
src/ai/lua/core.cpp
View File

@ -18,10 +18,8 @@
*
*/
extern "C" {
#include <lualib.h>
#include <lauxlib.h>
}
#include "lua/lualib.h"
#include "lua/lauxlib.h"
#include <cassert>
#include <cstring>

6
src/scripting/lua.cpp
View File

@ -30,10 +30,8 @@
* - luaW_ functions are helpers in Lua style.
*/
extern "C" {
#include <lualib.h>
#include <lauxlib.h>
}
#include "lua/lualib.h"
#include "lua/lauxlib.h"
#include <cassert>
#include <cstring>