diff --git a/Makefile b/Makefile index 60685d8690..6c89414392 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ INSTALL_PROGRAM = $(INSTALL) -m755 INSTALL_DATA = $(INSTALL) -m644 # program targets -CORE = fileformats rcg rgl rsdl rnull game utility geoip irc +CORE = fileformats rcg rgl rsdl rnull game utility geoip irc lua TOOLS = editor tsbuild ralint VERSION = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`) @@ -105,6 +105,14 @@ irc_LIBS = $(COMMON_LIBS) $(irc_DEPS) PROGRAMS += irc irc: $(irc_TARGET) +lua_SRCS := $(shell find LuaInterface/ -name '*.cs') +lua_TARGET = LuaInterface.dll +lua_KIND = library +lua_DEPS = $(fileformats_TARGET) +lua_LIBS = $(COMMON_LIBS) $(lua_DEPS) +PROGRAMS += lua +lua: $(lua_TARGET) + # Renderer dlls rsdl_SRCS := $(shell find OpenRA.Renderer.SdlCommon/ -iname '*.cs') rsdl_TARGET = OpenRA.Renderer.SdlCommon.dll @@ -149,8 +157,8 @@ STD_MOD_DEPS = $(STD_MOD_LIBS) $(ralint_TARGET) mod_ra_SRCS := $(shell find OpenRA.Mods.RA/ -iname '*.cs') mod_ra_TARGET = mods/ra/OpenRA.Mods.RA.dll mod_ra_KIND = library -mod_ra_DEPS = $(STD_MOD_DEPS) $(utility_TARGET) $(geoip_TARGET) $(irc_TARGET) -mod_ra_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(utility_TARGET) $(geoip_TARGET) $(irc_TARGET) +mod_ra_DEPS = $(STD_MOD_DEPS) $(utility_TARGET) $(geoip_TARGET) $(irc_TARGET) $(lua_TARGET) +mod_ra_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(utility_TARGET) $(geoip_TARGET) $(irc_TARGET) $(lua_TARGET) PROGRAMS += mod_ra mod_ra: $(mod_ra_TARGET) @@ -293,6 +301,8 @@ distclean: clean dependencies: @ $(CP_R) thirdparty/*.dl* . + @ $(CP_R) thirdparty/*.dylib . + @ $(CP_R) thirdparty/*.so . @ $(CP_R) thirdparty/Tao/* . version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml @@ -336,6 +346,10 @@ install-core: default @$(INSTALL_PROGRAM) thirdparty/SharpFont.dll "$(DATA_INSTALL_DIR)" @$(CP) thirdparty/SharpFont.dll.config "$(DATA_INSTALL_DIR)" @$(INSTALL_PROGRAM) thirdparty/Mono.Nat.dll "$(DATA_INSTALL_DIR)" + @$(CP) thirdparty/LuaInterface.dll.config "$(DATA_INSTALL_DIR)" + @$(INSTALL_PROGRAM) thirdparty/liblua-linux32.so "$(DATA_INSTALL_DIR)" + @$(INSTALL_PROGRAM) thirdparty/liblua-linux64.so "$(DATA_INSTALL_DIR)" + @$(INSTALL_PROGRAM) thirdparty/liblua-osx.dylib "$(DATA_INSTALL_DIR)" @echo "#!/bin/sh" > openra @echo 'BINDIR=$$(dirname $$(readlink -f $$0))' >> openra diff --git a/packaging/package-all.sh b/packaging/package-all.sh index cd6df0f1fe..2f4e802596 100755 --- a/packaging/package-all.sh +++ b/packaging/package-all.sh @@ -34,7 +34,7 @@ FILES=('OpenRA.Game.exe' 'OpenRA.Editor.exe' 'OpenRA.Utility.exe' \ 'cg' 'glsl' 'mods/ra' 'mods/cnc' 'mods/d2k' \ 'AUTHORS' 'CHANGELOG' 'COPYING' \ 'README.html' 'CONTRIBUTING.html' 'DOCUMENTATION.html' \ -'global mix database.dat' 'GeoIP.dll' 'GeoIP.dat') +'global mix database.dat' 'GeoIP.dll' 'GeoIP.dat' 'LuaInterface.dll') echo "Copying files..." for i in "${FILES[@]}"; do diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi index b87371864f..2c5d64629a 100644 --- a/packaging/windows/OpenRA.nsi +++ b/packaging/windows/OpenRA.nsi @@ -83,6 +83,8 @@ Section "Game" GAME File "${SRCDIR}\global mix database.dat" File "${SRCDIR}\GeoIP.dll" File "${SRCDIR}\GeoIP.dat" + File "${SRCDIR}\LuaInterface.dll" + File lua51.dll File OpenAL32.dll File SDL.dll File freetype6.dll @@ -201,6 +203,8 @@ Function ${UN}Clean Delete "$INSTDIR\global mix database.dat" Delete $INSTDIR\GeoIP.dat Delete $INSTDIR\GeoIP.dll + Delete $INSTDIR\LuaInterface.dll + Delete $INSTDIR\lua51.dll Delete $INSTDIR\OpenAL32.dll Delete $INSTDIR\SDL.dll Delete $INSTDIR\freetype6.dll