epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update build, package and installer scripts for LuaInterface

Browse Source
This commit is contained in:
ScottNZ
2013-11-15 22:01:18 +13:00
parent e730580030
commit d01ee2a75e
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@@ -63,7 +63,7 @@ INSTALL_PROGRAM = $(INSTALL) -m755
INSTALL_DATA = $(INSTALL) -m644 INSTALL_DATA = $(INSTALL) -m644
# program targets # 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 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`) 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 PROGRAMS += irc
irc: $(irc_TARGET) 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 # Renderer dlls
rsdl_SRCS := $(shell find OpenRA.Renderer.SdlCommon/ -iname '*.cs') rsdl_SRCS := $(shell find OpenRA.Renderer.SdlCommon/ -iname '*.cs')
rsdl_TARGET = OpenRA.Renderer.SdlCommon.dll 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_SRCS := $(shell find OpenRA.Mods.RA/ -iname '*.cs')
mod_ra_TARGET = mods/ra/OpenRA.Mods.RA.dll mod_ra_TARGET = mods/ra/OpenRA.Mods.RA.dll
mod_ra_KIND = library mod_ra_KIND = library
mod_ra_DEPS = $(STD_MOD_DEPS) $(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) mod_ra_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(utility_TARGET) $(geoip_TARGET) $(irc_TARGET) $(lua_TARGET)
PROGRAMS += mod_ra PROGRAMS += mod_ra
mod_ra: $(mod_ra_TARGET) mod_ra: $(mod_ra_TARGET)
@@ -293,6 +301,8 @@ distclean: clean
dependencies: dependencies:
@ $(CP_R) thirdparty/*.dl* . @ $(CP_R) thirdparty/*.dl* .
@ $(CP_R) thirdparty/*.dylib .
@ $(CP_R) thirdparty/*.so .
@ $(CP_R) thirdparty/Tao/* . @ $(CP_R) thirdparty/Tao/* .
version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml 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)" @$(INSTALL_PROGRAM) thirdparty/SharpFont.dll "$(DATA_INSTALL_DIR)"
@$(CP) thirdparty/SharpFont.dll.config "$(DATA_INSTALL_DIR)" @$(CP) thirdparty/SharpFont.dll.config "$(DATA_INSTALL_DIR)"
@$(INSTALL_PROGRAM) thirdparty/Mono.Nat.dll "$(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 "#!/bin/sh" > openra
@echo 'BINDIR=$$(dirname $$(readlink -f $$0))' >> openra @echo 'BINDIR=$$(dirname $$(readlink -f $$0))' >> openra

2
packaging/package-all.sh
View File

@@ -34,7 +34,7 @@ FILES=('OpenRA.Game.exe' 'OpenRA.Editor.exe' 'OpenRA.Utility.exe' \
'cg' 'glsl' 'mods/ra' 'mods/cnc' 'mods/d2k' \ 'cg' 'glsl' 'mods/ra' 'mods/cnc' 'mods/d2k' \
'AUTHORS' 'CHANGELOG' 'COPYING' \ 'AUTHORS' 'CHANGELOG' 'COPYING' \
'README.html' 'CONTRIBUTING.html' 'DOCUMENTATION.html' \ '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..." echo "Copying files..."
for i in "${FILES[@]}"; do for i in "${FILES[@]}"; do

4
packaging/windows/OpenRA.nsi
View File

@@ -83,6 +83,8 @@ Section "Game" GAME
File "${SRCDIR}\global mix database.dat" File "${SRCDIR}\global mix database.dat"
File "${SRCDIR}\GeoIP.dll" File "${SRCDIR}\GeoIP.dll"
File "${SRCDIR}\GeoIP.dat" File "${SRCDIR}\GeoIP.dat"
File "${SRCDIR}\LuaInterface.dll"
File lua51.dll
File OpenAL32.dll File OpenAL32.dll
File SDL.dll File SDL.dll
File freetype6.dll File freetype6.dll
@@ -201,6 +203,8 @@ Function ${UN}Clean
Delete "$INSTDIR\global mix database.dat" Delete "$INSTDIR\global mix database.dat"
Delete $INSTDIR\GeoIP.dat Delete $INSTDIR\GeoIP.dat
Delete $INSTDIR\GeoIP.dll Delete $INSTDIR\GeoIP.dll
Delete $INSTDIR\LuaInterface.dll
Delete $INSTDIR\lua51.dll
Delete $INSTDIR\OpenAL32.dll Delete $INSTDIR\OpenAL32.dll
Delete $INSTDIR\SDL.dll Delete $INSTDIR\SDL.dll
Delete $INSTDIR\freetype6.dll Delete $INSTDIR\freetype6.dll