diff --git a/Makefile b/Makefile index 82f83944c0..13a17bfb4d 100644 --- a/Makefile +++ b/Makefile @@ -321,6 +321,7 @@ install-core: default @$(INSTALL_PROGRAM) $(mod_ra_TARGET) "$(DATA_INSTALL_DIR)/mods/ra" @$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/" @$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k" + @$(CP_R) mods/modchooser "$(DATA_INSTALL_DIR)/mods/" @$(INSTALL_DATA) "global mix database.dat" "$(DATA_INSTALL_DIR)/global mix database.dat" @$(INSTALL_DATA) "GeoIP.dat" "$(DATA_INSTALL_DIR)/GeoIP.dat" diff --git a/packaging/package-all.sh b/packaging/package-all.sh index dd932da084..37461a526d 100755 --- a/packaging/package-all.sh +++ b/packaging/package-all.sh @@ -29,7 +29,7 @@ markdown DOCUMENTATION.md > DOCUMENTATION.html FILES=('OpenRA.Game.exe' 'OpenRA.Editor.exe' 'OpenRA.Utility.exe' \ 'OpenRA.FileFormats.dll' 'OpenRA.Renderer.SdlCommon.dll' 'OpenRA.Renderer.Sdl2.dll' 'OpenRA.Renderer.Cg.dll' 'OpenRA.Renderer.Gl.dll' 'OpenRA.Renderer.Null.dll' 'OpenRA.Irc.dll' \ 'FreeSans.ttf' 'FreeSansBold.ttf' \ -'cg' 'glsl' 'mods/common' 'mods/ra' 'mods/cnc' 'mods/d2k' \ +'cg' 'glsl' 'mods/common' 'mods/ra' 'mods/cnc' 'mods/d2k' 'mods/modchooser' \ 'AUTHORS' 'CHANGELOG' 'COPYING' \ 'README.html' 'CONTRIBUTING.html' 'DOCUMENTATION.html' \ 'global mix database.dat' 'GeoIP.dll' 'GeoIP.dat') diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi index 5b712ac215..225b556ddf 100644 --- a/packaging/windows/OpenRA.nsi +++ b/packaging/windows/OpenRA.nsi @@ -1,16 +1,16 @@ -; Copyright 2007-2013 OpenRA developers (see AUTHORS) +; Copyright 2007-2014 OpenRA developers (see AUTHORS) ; This file is part of OpenRA. -; +; ; OpenRA is free software: you can redistribute it and/or modify ; it under the terms of the GNU General Public License as published by ; the Free Software Foundation, either version 3 of the License, or ; (at your option) any later version. -; +; ; OpenRA is distributed in the hope that it will be useful, ; but WITHOUT ANY WARRANTY; without even the implied warranty of ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ; GNU General Public License for more details. -; +; ; You should have received a copy of the GNU General Public License ; along with OpenRA. If not, see . @@ -62,6 +62,7 @@ Section "Game" GAME File /r "${SRCDIR}\mods\cnc" File /r "${SRCDIR}\mods\d2k" File /r "${SRCDIR}\mods\ra" + File /r "${SRCDIR}\mods\modchooser" SetOutPath "$INSTDIR" File "${SRCDIR}\OpenRA.Game.exe" File "${SRCDIR}\OpenRA.Utility.exe"