summaryrefslogtreecommitdiff
path: root/os/win32
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2007-02-27 17:04:22 +0000
committerDarkvater <darkvater@openttd.org>2007-02-27 17:04:22 +0000
commit61a4f434d76a4c6425040da5cfee1caca2777410 (patch)
tree136f5fce82e169973457513e09d5d9d557883159 /os/win32
parent285c068aae98e4a9b0fc346ed57232da13161f3e (diff)
downloadopenttd-61a4f434d76a4c6425040da5cfee1caca2777410.tar.xz
(svn r8927) -Codechange: [win32] Update the installer to use the new paths after the makefilerewrite and add roadstops.grf to the uninstaller.
Diffstat (limited to 'os/win32')
-rw-r--r--os/win32/installer/install.nsi19
1 files changed, 10 insertions, 9 deletions
diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi
index b65e2d978..40bf4f44d 100644
--- a/os/win32/installer/install.nsi
+++ b/os/win32/installer/install.nsi
@@ -6,8 +6,8 @@
!define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"
!define APPVERSIONINTERNAL "${APPVERSION}.0" ; Needs to be of the format X.X.X.X
-!define MUI_ICON "..\..\..\openttd.ico"
-!define MUI_UNICON "..\..\..\openttd.ico"
+!define MUI_ICON "..\..\..\media\openttd.ico"
+!define MUI_UNICON "..\..\..\media\openttd.ico"
!define MUI_WELCOMEFINISHPAGE_BITMAP "welcome.bmp"
!define MUI_HEADERIMAGE
!define MUI_HEADERIMAGE_BITMAP "top.bmp"
@@ -103,16 +103,16 @@ Section "!OpenTTD" Section1
; Copy language files
SetOutPath "$INSTDIR\lang\"
- File ${PATH_ROOT}lang\*.lng
- File ${PATH_ROOT}lang\english.txt
+ File ${PATH_ROOT}bin\lang\*.lng
+ File ${PATH_ROOT}src\lang\english.txt
; Copy data files
SetOutPath "$INSTDIR\data\"
- File ${PATH_ROOT}data\*.grf
- File ${PATH_ROOT}data\opntitle.dat
+ File ${PATH_ROOT}bin\data\*.grf
+ File ${PATH_ROOT}bin\data\opntitle.dat
; Copy scenario files (don't choke if they don't exist)
SetOutPath "$INSTDIR\scenario\"
- File /nonfatal ${PATH_ROOT}scenario\*.scn
+ File /nonfatal ${PATH_ROOT}bin\scenario\*.scn
; Copy the rest of the stuff
SetOutPath "$INSTDIR\"
@@ -124,8 +124,8 @@ Section "!OpenTTD" Section1
File ${PATH_ROOT}known-bugs.txt
; Copy executable
- File /oname=openttd.exe ${PATH_ROOT}Release\openttd.exe
- File ${PATH_ROOT}strgen\Debug\strgen.exe
+ File /oname=openttd.exe ${PATH_ROOT}objs\Win32\Release\openttd.exe
+ File ${PATH_ROOT}objs\strgen\strgen.exe
; Delete old files from the main dir. they are now placed in data/ and lang/
@@ -260,6 +260,7 @@ Section "Uninstall"
Delete "$INSTDIR\data\elrailsw.grf"
Delete "$INSTDIR\data\nsignalsw.grf"
Delete "$INSTDIR\data\openttd.grf"
+ Delete "$INSTDIR\data\roadstops.grf"
Delete "$INSTDIR\data\trkfoundw.grf"
Delete "$INSTDIR\data\sample.cat"