make paths modifiable, fix broken install-rules, fix INSTALL

This commit is contained in:
hasufell
2012-04-01 01:46:21 +02:00
committed by Chris Forbes
parent fdef80c53a
commit 1010276cd5
2 changed files with 19 additions and 18 deletions

20
INSTALL
View File

@@ -41,23 +41,19 @@ UBUNTU (substitute comparable packages for other linux distros):
OpenRA does not work with some older versions of Compiz. On affected systems, disable desktop effects before playing. This is fixed in Ubuntu Natty and later. OpenRA does not work with some older versions of Compiz. On affected systems, disable desktop effects before playing. This is fixed in Ubuntu Natty and later.
You will additionally need to copy the third party dependencies (.dll and .config) from the The following dlls can also be installed into your system GAC. This is not
thirdparty and thirdparty/Tao directories into the game root:
cp -v thirdparty/*.dll thirdparty/Tao/* .
Alternatively, the dlls can be installed into your system GAC. This is not
recommended because we ship a custom Tao.FreeType that can conflict with recommended because we ship a custom Tao.FreeType that can conflict with
other applications that use Tao: other applications that use Tao:
gacutil -i thirdparty/Tao/Tao.Cg.dll gacutil -i Tao.Cg.dll
gacutil -i thirdparty/Tao/Tao.OpenGl.dll gacutil -i Tao.OpenGl.dll
gacutil -i thirdparty/Tao/Tao.OpenAl.dll gacutil -i Tao.OpenAl.dll
gacutil -i thirdparty/Tao/Tao.Sdl.dll gacutil -i Tao.Sdl.dll
gacutil -i thirdparty/Tao/Tao.FreeType.dll gacutil -i Tao.FreeType.dll
gacutil -i thirdparty/ICSharpCode.SharpZipLib.dll gacutil -i ICSharpCode.SharpZipLib.dll
To compile OpenRA, run `make' from the command line. To compile OpenRA, run `make' from the command line.
To install run 'make install'.
Run the game with `mono OpenRA.Game.exe Game.Mods=ra` for Red Alert Run the game with `mono OpenRA.Game.exe Game.Mods=ra` for Red Alert
or `mono OpenRA.Game.exe Game.Mods=cnc` for Command & Conquer or `mono OpenRA.Game.exe Game.Mods=cnc` for Command & Conquer

View File

@@ -180,10 +180,10 @@ $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
# #
# Install / Uninstall for *nix # Install / Uninstall for *nix
# #
prefix = /usr/local prefix ?= /usr/local
datarootdir = $(prefix)/share datarootdir ?= $(prefix)/share
datadir = $(datarootdir) datadir ?= $(datarootdir)
bindir = $(prefix)/bin bindir ?= $(prefix)/bin
BIN_INSTALL_DIR = $(DESTDIR)$(bindir) BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
INSTALL_DIR = $(DESTDIR)$(datadir)/openra INSTALL_DIR = $(DESTDIR)$(datadir)/openra
INSTALL = install INSTALL = install
@@ -219,15 +219,20 @@ install: all
@cp -r glsl $(INSTALL_DIR) @cp -r glsl $(INSTALL_DIR)
@cp -r cg $(INSTALL_DIR) @cp -r cg $(INSTALL_DIR)
@cp *.ttf $(INSTALL_DIR) @cp *.ttf $(INSTALL_DIR)
@cp --parents -r thirdparty/Tao $(INSTALL_DIR) @cp thirdparty/Tao/* $(INSTALL_DIR)
@$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll $(INSTALL_DIR) @$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll $(INSTALL_DIR)
@echo "#!/bin/sh" > openra @echo "#!/bin/sh" > openra
@echo "cd "$(datadir)"/openra" >> openra @echo "cd "$(datadir)"/openra" >> openra
@echo "mono "$(datadir)"/openra/OpenRA.Game.exe \"$$""@\"" >> openra @echo "exec mono "$(datadir)"/openra/OpenRA.Game.exe \"$$""@\"" >> openra
@echo "#!/bin/sh" > openra-editor
@echo "cd "$(datadir)"/openra" >> openra-editor
@echo "exec mono "$(datadir)"/openra/OpenRA.Editor.exe \"$$""@\"" >> openra-editor
@$(INSTALL_PROGRAM) -d $(BIN_INSTALL_DIR) @$(INSTALL_PROGRAM) -d $(BIN_INSTALL_DIR)
@$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR) @$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR)
@$(INSTALL_PROGRAM) -m +rx openra-editor $(BIN_INSTALL_DIR)
uninstall: uninstall:
@-rm -r $(INSTALL_DIR) @-rm -r $(INSTALL_DIR)