diff --git a/Makefile b/Makefile index a0b35e9b39..1118dba9cb 100644 --- a/Makefile +++ b/Makefile @@ -144,7 +144,7 @@ renderers: $(rcg_TARGET) $(rgl_TARGET) $(rsdl2_TARGET) $(rnull_TARGET) $(rsdl_TA ##### Official Mods ##### -STD_MOD_LIBS = $(fileformats_TARGET) $(game_TARGET) +STD_MOD_LIBS = $(fileformats_TARGET) $(game_TARGET) thirdparty/KopiLua.dll thirdparty/NLua.dll STD_MOD_DEPS = $(STD_MOD_LIBS) $(ralint_TARGET) # Red Alert @@ -338,6 +338,8 @@ 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)" + @$(INSTALL_PROGRAM) thirdparty/KopiLua.dll "$(DATA_INSTALL_DIR)" + @$(INSTALL_PROGRAM) thirdparty/NLua.dll "$(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 987f5141bc..d64c6e6c98 100755 --- a/packaging/package-all.sh +++ b/packaging/package-all.sh @@ -57,6 +57,10 @@ cp thirdparty/SDL2\#* packaging/built # Mono.NAT for UPnP support cp thirdparty/Mono.Nat.dll packaging/built +# Lua +cp thirdparty/KopiLua.dll packaging/built +cp thirdparty/NLua.dll packaging/built + # Copy game icon for windows package cp OpenRA.Game/OpenRA.ico packaging/built diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi index b87371864f..d9d90cc04c 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}\KopiLua.dll" + File "${SRCDIR}\NLua.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\KopiLua.dll + Delete $INSTDIR\NLua.dll Delete $INSTDIR\OpenAL32.dll Delete $INSTDIR\SDL.dll Delete $INSTDIR\freetype6.dll diff --git a/thirdparty/KopiLua.dll b/thirdparty/KopiLua.dll new file mode 100644 index 0000000000..18497eb8ff Binary files /dev/null and b/thirdparty/KopiLua.dll differ diff --git a/thirdparty/NLua.dll b/thirdparty/NLua.dll new file mode 100644 index 0000000000..165ead6625 Binary files /dev/null and b/thirdparty/NLua.dll differ