diff options
| author | zuu <zuu@openttd.org> | 2013-01-06 16:44:15 +0000 |
|---|---|---|
| committer | zuu <zuu@openttd.org> | 2013-01-06 16:44:15 +0000 |
| commit | 2e4f470f1a7fb4b0e6b969c8c58caca05efb9607 (patch) | |
| tree | d8a797153721bf115d71ec9675ca0c8c508fbbcc | |
| parent | 65ff2c1ce645191f8d49a851d04f14ab133b665a (diff) | |
| download | openttd-2e4f470f1a7fb4b0e6b969c8c58caca05efb9607.tar.xz | |
(svn r24890) -Fix: Distribute GS compat_<version>.nut with OpenTTD
| -rw-r--r-- | Makefile.bundle.in | 3 | ||||
| -rw-r--r-- | os/rpm/openttd.spec | 2 | ||||
| -rw-r--r-- | os/windows/installer/install.nsi | 8 |
3 files changed, 13 insertions, 0 deletions
diff --git a/Makefile.bundle.in b/Makefile.bundle.in index 64fb11ab7..4bba01c78 100644 --- a/Makefile.bundle.in +++ b/Makefile.bundle.in @@ -26,11 +26,13 @@ endif # An OSX application bundle needs the data files, lang files and openttd executable in a different location. ifdef OSXAPP AI_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/ai +GAME_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/game BASESET_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/baseset LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang TTD_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS else AI_DIR = $(BUNDLE_DIR)/ai +GAME_DIR = $(BUNDLE_DIR)/game BASESET_DIR = $(BUNDLE_DIR)/baseset LANG_DIR = $(BUNDLE_DIR)/lang TTD_DIR = $(BUNDLE_DIR) @@ -59,6 +61,7 @@ ifeq ($(OS),UNIX) endif $(Q)cp "$(BIN_DIR)/$(TTD)" "$(TTD_DIR)/" $(Q)cp "$(BIN_DIR)/ai/"compat_*.nut "$(AI_DIR)/" + $(Q)cp "$(BIN_DIR)/game/"compat_*.nut "$(GAME_DIR)/" $(Q)cp "$(BIN_DIR)/baseset/"*.grf "$(BASESET_DIR)/" $(Q)cp "$(BIN_DIR)/baseset/"*.obg "$(BASESET_DIR)/" $(Q)cp "$(BIN_DIR)/baseset/"*.obs "$(BASESET_DIR)/" diff --git a/os/rpm/openttd.spec b/os/rpm/openttd.spec index d35501110..7eaf553a7 100644 --- a/os/rpm/openttd.spec +++ b/os/rpm/openttd.spec @@ -227,11 +227,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %dir %{_datadir}/%{name}/baseset %dir %{_datadir}/%{name}/scripts %dir %{_datadir}/%{name}/ai +%dir %{_datadir}/%{name}/game %{_datadir}/doc/%{name}/* %{_datadir}/%{name}/lang/* %{_datadir}/%{name}/baseset/* %{_datadir}/%{name}/scripts/* %{_datadir}/%{name}/ai/* +%{_datadir}/%{name}/game/* %doc %{_mandir}/man6/%{name}.6.* %files gui diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi index 6fef11d2e..28fa0852d 100644 --- a/os/windows/installer/install.nsi +++ b/os/windows/installer/install.nsi @@ -124,6 +124,10 @@ Section "!OpenTTD" Section1 SetOutPath "$INSTDIR\ai\" File ${PATH_ROOT}bin\ai\compat_*.nut + ; Copy Game Script files + SetOutPath "$INSTDIR\game\" + File ${PATH_ROOT}bin\game\compat_*.nut + ; Copy data files SetOutPath "$INSTDIR\baseset\" File ${PATH_ROOT}bin\baseset\*.grf @@ -398,6 +402,9 @@ Section "Uninstall" ; AI files Delete "$INSTDIR\ai\compat_*.nut" + ; Game Script files + Delete "$INSTDIR\game\compat_*.nut" + ; Baseset files Delete "$INSTDIR\baseset\opntitle.dat" Delete "$INSTDIR\baseset\openttd.grf" @@ -469,6 +476,7 @@ Section "Uninstall" RMDir "$SMPROGRAMS\$SHORTCUTS\Docs\" RMDir "$SMPROGRAMS\$SHORTCUTS" RMDir "$INSTDIR\ai" + RMDir "$INSTDIR\game" RMDir "$INSTDIR\data" RMDir "$INSTDIR\baseset" RMDir "$INSTDIR\gm" |