Skip to content

Commit 679ee92

Browse files
committed
Fix NSIS build
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@11905 8aca7d54-2c30-db11-9de9-000461428c89
1 parent 5ef820c commit 679ee92

File tree

3 files changed

+34
-6
lines changed

3 files changed

+34
-6
lines changed

simutrans/history.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
FIX: show convoi (and line) name when permanent tooltips are enabled for convois
6767
FIX: not connection to tunnels, bridges and elevated ways when extending city streets
6868
FIX: Overcrowded stops can cause unhappy return passengers in unconnected networks
69-
FIX: Factory editor could not slect water factories from climate selection
69+
FIX: Factory editor could not select water factories from climate selection
7070

7171

7272
Release of 124.3.1 (r11671 on 5-Apr-2025):

src/Windows/nsis/paksets.nsh

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,31 @@
11
; Generated by "get_pak.sh -generate_h". DO NOT EDIT.
2+
SectionGroup /e "Pak64: main and addons" pak64group
3+
4+
Section /o "pak" pak
5+
AddSize 16532
6+
StrCpy $downloadlink "http://downloads.sourceforge.net/project/simutrans/pak64/124-4/simupak64-124-4.zip"
7+
SetOutPath $PAKDIR
8+
StrCpy $archievename "simupak64-124-4.zip"
9+
StrCpy $downloadname "pak"
10+
StrCpy $VersionString "pak64 124.4 r2222"
11+
Call DownloadInstallZip
12+
SectionEnd
13+
Section /o "pak64 Food addon"
14+
AddSize 228
15+
StrCpy $downloadlink "http://downloads.sourceforge.net/project/simutrans/pak64/121-0/simupak64-addon-food-120-4.zip"
16+
StrCpy $archievename "simupak64-addon-food-120-4.zip"
17+
StrCpy $downloadname "pak"
18+
StrCpy $VersionString ""
19+
StrCmp $multiuserinstall "1" +3
20+
; no multiuser => install in normal directory
21+
Call DownloadInstallAddonZipPortable
22+
goto +2
23+
Call DownloadInstallAddonZip
24+
SectionEnd
25+
26+
SectionGroupEnd
27+
28+
229
Section /o "pak128" pak128
330
AddSize 415892
431
StrCpy $downloadlink "http://downloads.sourceforge.net/project/simutrans/pak128/pak128%20for%20ST%20124.4up%20%282.10.1%29/simupak128-2-10-1-for124-4up.zip"
@@ -109,6 +136,10 @@ Section /o "pak48.bitlit" pak48.bitlit
109136
Call DownloadInstallZipWithoutSimutrans
110137
SectionEnd
111138

139+
140+
; OBSOLETE PAKS from here
141+
SectionGroup /e "Not currently developed" slowPakgroup
142+
112143
Section /o "pak96.comic" pak96.comic
113144
AddSize 32526
114145
StrCpy $downloadlink "http://downloads.sourceforge.net/project/simutrans/pak96.comic/pak96.comic%20for%20111-3/pak96.comic-0.4.10-plus.zip"
@@ -119,10 +150,6 @@ Section /o "pak96.comic" pak96.comic
119150
Call DownloadInstallZip
120151
SectionEnd
121152

122-
123-
; OBSOLETE PAKS from here
124-
SectionGroup /e "Not currently developed" slowPakgroup
125-
126153
Section /o "pak128.japan" pak128.japan
127154
AddSize 27780
128155
StrCpy $downloadlink "http://pak128.jpn.org/souko/pak128.japan.120.0.cab"

src/paksetinfo.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// Generated by "get_pak.sh -generate_h". DO NOT EDIT.
2-
#define PAKSET_COUNT 19
2+
#define PAKSET_COUNT 20
33
#define OBSOLETE_FROM (12)
44
paksetinfo_t pakinfo[PAKSET_COUNT] = {
5+
{ "http://downloads.sourceforge.net/project/simutrans/pak64/124-4/simupak64-124-4.zip", "pak", "pak64 124.4 r2222", 16532 },
56
{ "http://downloads.sourceforge.net/project/simutrans/pak128/pak128%20for%20ST%20124.4up%20%282.10.1%29/simupak128-2-10-1-for124-4up.zip", "pak128", "pak128 2.10.1 for 124.4 git r683 hash e8556c7c", 415892 },
67
{ "http://downloads.sourceforge.net/project/simutrans/pak192.comic/pak192.comic%20V0.7.2/pak192-comic.zip", "pak192.comic", "Pak192.Comic V0.7.2 Rev 1296", 909748 },
78
{ "http://simutrans-germany.com/pak.german/pak64.german_0-124-4-0-1_full.zip", "pak64.german", "pak64.german 0.124.4.0.1", 29232 },

0 commit comments

Comments
 (0)