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

Merge pull request #2904 from Mailaender/packaging-fixes

Browse Source 
Packaging fixes
This commit is contained in:
Matthias Mailänder
2013-03-30 02:56:22 -07:00
parent 855d65d9af 85c0f7fcbf
commit 65d80cfa08
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -7,12 +7,15 @@ PHONY = core tools package all mods clean distclean
.SUFFIXES: .SUFFIXES:
core: game renderers mods utility tsbuild core: game renderers mods utility tsbuild
tools: editor ralint tsbuild tools: editor ralint tsbuild
package: core editor docs package: dependencies core editor docs
mods: mod_ra mod_cnc mod_d2k mods: mod_ra mod_cnc mod_d2k
all: core tools all: dependencies core tools
clean: clean:
@-rm -f *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources @-rm -f *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
distclean: clean distclean: clean
dependencies:
@ cp -r thirdparty/*.dll .
@ cp -r thirdparty/Tao/* .
# #
# Core binaries # Core binaries
@@ -132,7 +135,6 @@ ralint_TARGET = RALint.exe
ralint_KIND = exe ralint_KIND = exe
ralint_DEPS = $(fileformats_TARGET) $(game_TARGET) ralint_DEPS = $(fileformats_TARGET) $(game_TARGET)
ralint_LIBS = $(COMMON_LIBS) $(ralint_DEPS) ralint_LIBS = $(COMMON_LIBS) $(ralint_DEPS)
ralint_EXTRA_CMDS = cp thirdparty/FuzzyLogicLibrary.dll .
PROGRAMS += ralint PROGRAMS += ralint
ralint: $(ralint_TARGET) ralint: $(ralint_TARGET)
@@ -169,7 +171,7 @@ utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/ICSharpCode.Shar
PROGRAMS += utility PROGRAMS += utility
utility: $(utility_TARGET) utility: $(utility_TARGET)
.PHONY: $(PHONY) $(PROGRAMS) .PHONY: $(PHONY) $(PROGRAMS) dependencies
# #
# Generate build rules for each target defined above in PROGRAMS # Generate build rules for each target defined above in PROGRAMS

2
packaging/package-all.sh
View File

@@ -28,7 +28,7 @@ markdown DOCUMENTATION.md > DOCUMENTATION.html
# List of files that are packaged on all platforms # List of files that are packaged on all platforms
# Note that the Tao dlls are shipped on all platforms except osx and that # Note that the Tao dlls are shipped on all platforms except osx and that
# they are now installed to the game directory instead of placed in the gac # they are now installed to the game directory instead of placed in the gac
FILES="OpenRA.Game.exe OpenRA.Editor.exe OpenRA.TilesetBuilder.exe OpenRA.Utility.exe OpenRA.FileFormats.dll \ FILES="OpenRA.Game.exe OpenRA.Editor.exe OpenRA.Utility.exe OpenRA.FileFormats.dll \
OpenRA.Renderer.SdlCommon.dll OpenRA.Renderer.Cg.dll OpenRA.Renderer.Gl.dll OpenRA.Renderer.Null.dll \ OpenRA.Renderer.SdlCommon.dll OpenRA.Renderer.Cg.dll OpenRA.Renderer.Gl.dll OpenRA.Renderer.Null.dll \
FreeSans.ttf FreeSansBold.ttf titles.ttf cg glsl mods/ra mods/cnc mods/d2k \ FreeSans.ttf FreeSansBold.ttf titles.ttf cg glsl mods/ra mods/cnc mods/d2k \
README.html CONTRIBUTING.html DOCUMENTATION.html COPYING HACKING INSTALL CHANGELOG" README.html CONTRIBUTING.html DOCUMENTATION.html COPYING HACKING INSTALL CHANGELOG"