dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r24890) -Fix: Distribute GS compat_<version>.nut with OpenTTD

Browse Source
This commit is contained in:
zuu
2013-01-06 16:44:15 +00:00
parent 65ff2c1ce6
commit 2e4f470f1a
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.bundle.in
View File

@@ -26,11 +26,13 @@ endif
# An OSX application bundle needs the data files, lang files and openttd executable in a different location. # An OSX application bundle needs the data files, lang files and openttd executable in a different location.
ifdef OSXAPP ifdef OSXAPP
AI_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/ai AI_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/ai
GAME_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/game
BASESET_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/baseset BASESET_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/baseset
LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
TTD_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS TTD_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
else else
AI_DIR = $(BUNDLE_DIR)/ai AI_DIR = $(BUNDLE_DIR)/ai
GAME_DIR = $(BUNDLE_DIR)/game
BASESET_DIR = $(BUNDLE_DIR)/baseset BASESET_DIR = $(BUNDLE_DIR)/baseset
LANG_DIR = $(BUNDLE_DIR)/lang LANG_DIR = $(BUNDLE_DIR)/lang
TTD_DIR = $(BUNDLE_DIR) TTD_DIR = $(BUNDLE_DIR)
@@ -59,6 +61,7 @@ ifeq ($(OS),UNIX)
endif endif
$(Q)cp "$(BIN_DIR)/$(TTD)" "$(TTD_DIR)/" $(Q)cp "$(BIN_DIR)/$(TTD)" "$(TTD_DIR)/"
$(Q)cp "$(BIN_DIR)/ai/"compat_*.nut "$(AI_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/"*.grf "$(BASESET_DIR)/"
$(Q)cp "$(BIN_DIR)/baseset/"*.obg "$(BASESET_DIR)/" $(Q)cp "$(BIN_DIR)/baseset/"*.obg "$(BASESET_DIR)/"
$(Q)cp "$(BIN_DIR)/baseset/"*.obs "$(BASESET_DIR)/" $(Q)cp "$(BIN_DIR)/baseset/"*.obs "$(BASESET_DIR)/"

2
os/rpm/openttd.spec
View File

@@ -227,11 +227,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%dir %{_datadir}/%{name}/baseset %dir %{_datadir}/%{name}/baseset
%dir %{_datadir}/%{name}/scripts %dir %{_datadir}/%{name}/scripts
%dir %{_datadir}/%{name}/ai %dir %{_datadir}/%{name}/ai
%dir %{_datadir}/%{name}/game
%{_datadir}/doc/%{name}/* %{_datadir}/doc/%{name}/*
%{_datadir}/%{name}/lang/* %{_datadir}/%{name}/lang/*
%{_datadir}/%{name}/baseset/* %{_datadir}/%{name}/baseset/*
%{_datadir}/%{name}/scripts/* %{_datadir}/%{name}/scripts/*
%{_datadir}/%{name}/ai/* %{_datadir}/%{name}/ai/*
%{_datadir}/%{name}/game/*
%doc %{_mandir}/man6/%{name}.6.* %doc %{_mandir}/man6/%{name}.6.*
%files gui %files gui

8
os/windows/installer/install.nsi
View File

@@ -124,6 +124,10 @@ Section "!OpenTTD" Section1
SetOutPath "$INSTDIR\ai\" SetOutPath "$INSTDIR\ai\"
File ${PATH_ROOT}bin\ai\compat_*.nut File ${PATH_ROOT}bin\ai\compat_*.nut
; Copy Game Script files
SetOutPath "$INSTDIR\game\"
File ${PATH_ROOT}bin\game\compat_*.nut
; Copy data files ; Copy data files
SetOutPath "$INSTDIR\baseset\" SetOutPath "$INSTDIR\baseset\"
File ${PATH_ROOT}bin\baseset\*.grf File ${PATH_ROOT}bin\baseset\*.grf
@@ -398,6 +402,9 @@ Section "Uninstall"
; AI files ; AI files
Delete "$INSTDIR\ai\compat_*.nut" Delete "$INSTDIR\ai\compat_*.nut"
; Game Script files
Delete "$INSTDIR\game\compat_*.nut"
; Baseset files ; Baseset files
Delete "$INSTDIR\baseset\opntitle.dat" Delete "$INSTDIR\baseset\opntitle.dat"
Delete "$INSTDIR\baseset\openttd.grf" Delete "$INSTDIR\baseset\openttd.grf"
@@ -469,6 +476,7 @@ Section "Uninstall"
RMDir "$SMPROGRAMS\$SHORTCUTS\Docs\" RMDir "$SMPROGRAMS\$SHORTCUTS\Docs\"
RMDir "$SMPROGRAMS\$SHORTCUTS" RMDir "$SMPROGRAMS\$SHORTCUTS"
RMDir "$INSTDIR\ai" RMDir "$INSTDIR\ai"
RMDir "$INSTDIR\game"
RMDir "$INSTDIR\data" RMDir "$INSTDIR\data"
RMDir "$INSTDIR\baseset" RMDir "$INSTDIR\baseset"
RMDir "$INSTDIR\gm" RMDir "$INSTDIR\gm"