diff --git a/packaging/windows/speed-dreams-base.nsi b/packaging/windows/speed-dreams-base.nsi index 92e59141..2c6b74e9 100644 --- a/packaging/windows/speed-dreams-base.nsi +++ b/packaging/windows/speed-dreams-base.nsi @@ -175,9 +175,18 @@ Section "!Base System" SEC01 SetOutPath "$INSTDIR\data\cars\models\sc-cavallo-360" File /r /x *.lib "${BUILD_INST_DIR}\data\cars\models\sc-cavallo-360\*.*" + SetOutPath "$INSTDIR\data\cars\models\sc-deckard-conejo" + File /r /x *.lib "${BUILD_INST_DIR}\data\cars\models\sc-deckard-conejo\*.*" + SetOutPath "$INSTDIR\data\cars\models\sc-fmc-gt4" File /r /x *.lib "${BUILD_INST_DIR}\data\cars\models\sc-fmc-gt4\*.*" + SetOutPath "$INSTDIR\data\cars\models\sc-kanagawa-z35gts" + File /r /x *.lib "${BUILD_INST_DIR}\data\cars\models\sc-kanagawa-z35gts\*.*" + + SetOutPath "$INSTDIR\data\cars\models\sc-kongei-kk8s" + File /r /x *.lib "${BUILD_INST_DIR}\data\cars\models\sc-kongei-kk8s\*.*" + SetOutPath "$INSTDIR\data\cars\models\sc-lynx-220" File /r /x *.lib "${BUILD_INST_DIR}\data\cars\models\sc-lynx-220\*.*" @@ -193,7 +202,7 @@ Section "!Base System" SEC01 ; Write the install dir to the registry so that optional installs can find it. WriteRegStr ${GAME_ROOT_REGKEY} "${GAME_DIR_REGKEY}" "" "$INSTDIR" - + SectionEnd Section /o "Basic mod Tools" SEC02 @@ -229,7 +238,7 @@ Section /o "Basic mod Tools" SEC02 ; Includes for robot developers SetOutPath "$INSTDIR\include" File /r "${BUILD_INST_DIR}\include\*.*" - + SectionEnd Section /o "HQ cars and tracks (1)" SEC03 @@ -292,8 +301,8 @@ Section -Shortcuts WriteRegDWORD HKCU "Console\${GAME_VERSIONNED_NAME}" "ScreenBufferSize" 0x270f0078 WriteRegDWORD HKCU "Console\${GAME_VERSIONNED_NAME}" "WindowSize" 0x280078 WriteRegDWORD HKCU "Console\${GAME_VERSIONNED_NAME}" "QuickEdit" 0x1 - - + + SectionEnd Section -Post @@ -303,7 +312,7 @@ Section -Post ; Standard Windows-conformant (?) registry keys WriteRegStr ${GAME_ROOT_REGKEY} "${GAME_INST_REGKEY}" "" "$INSTDIR\bin\${GAME_FS_NAME}.exe" WriteRegStr ${GAME_ROOT_REGKEY} "${GAME_INST_REGKEY}" "Path" "$INSTDIR\bin" - + WriteRegStr ${GAME_ROOT_REGKEY} "${GAME_UNINST_REGKEY}" "DisplayName" "$(^Name)" WriteRegStr ${GAME_ROOT_REGKEY} "${GAME_UNINST_REGKEY}" "DisplayVersion" "${GAME_VERSION}" WriteRegStr ${GAME_ROOT_REGKEY} "${GAME_UNINST_REGKEY}" "UninstallString" "$INSTDIR\uninst.exe" @@ -339,7 +348,7 @@ Section Uninstall SetShellVarContext all ;SetAutoClose true - ; Start menu entries. + ; Start menu entries. RMDir /r "$SMPROGRAMS\${GAME_VERSIONNED_NAME}" ; Desktop shortcut. @@ -351,7 +360,7 @@ Section Uninstall DeleteRegKey ${GAME_ROOT_REGKEY} "${GAME_UNINST_REGKEY}" ; The whole installation folder - ; (Need to be do that way - inside first, outside last - + ; (Need to be do that way - inside first, outside last - ; because when the uninstaller is called by LeaveReinstallPage, ; $INSTDIR\uninst.exe is in the way, and RMDir /r "$INSTDIR" fails). RMDir /r "$INSTDIR\bin" diff --git a/packaging/windows/speed-dreams-hq-cars-and-tracks.nsi b/packaging/windows/speed-dreams-hq-cars-and-tracks.nsi index 2462d395..cd097dd3 100644 --- a/packaging/windows/speed-dreams-hq-cars-and-tracks.nsi +++ b/packaging/windows/speed-dreams-hq-cars-and-tracks.nsi @@ -150,8 +150,8 @@ Section -Cars SetOutPath "$INSTDIR\data\cars\models\ls1-archer-r9" File /r "${BUILD_INST_DIR}\data\cars\models\ls1-archer-r9\*.*" - ;SetOutPath "$INSTDIR\data\cars\models\ls1-cavallo-570s1" - ;File /r "${BUILD_INST_DIR}\data\cars\models\ls1-cavallo-570s1\*.*" + SetOutPath "$INSTDIR\data\cars\models\ls1-cavallo-570s1" + File /r "${BUILD_INST_DIR}\data\cars\models\ls1-cavallo-570s1\*.*" SetOutPath "$INSTDIR\data\cars\models\ls1-newcastle-fury" File /r "${BUILD_INST_DIR}\data\cars\models\ls1-newcastle-fury\*.*" @@ -199,7 +199,7 @@ Section -Tracks SetOverwrite on - ; HQ (1) circuits + ; HQ (1) circuits SetOutPath "$INSTDIR\data\tracks\circuit\brondehach" File /r "${BUILD_INST_DIR}\data\tracks\circuit\brondehach\*.*" @@ -218,7 +218,7 @@ Section -Tracks SetOutPath "$INSTDIR\data\tracks\circuit\hidden-valley" File /r "${BUILD_INST_DIR}\data\tracks\circuit\hidden-valley\*.*" - ; HQ (1) road tracks + ; HQ (1) road tracks SetOutPath "$INSTDIR\data\tracks\road\allondaz" File /r "${BUILD_INST_DIR}\data\tracks\road\allondaz\*.*" @@ -231,7 +231,7 @@ Section -Tracks SetOutPath "$INSTDIR\data\tracks\road\charmey" File /r "${BUILD_INST_DIR}\data\tracks\road\charmey\*.*" - ; HQ (1) speed ways + ; HQ (1) speed ways SetOutPath "$INSTDIR\data\tracks\speedway\arizona" File /r "${BUILD_INST_DIR}\data\tracks\speedway\arizona\*.*" diff --git a/packaging/windows/speed-dreams-more-hq-cars-and-tracks.nsi b/packaging/windows/speed-dreams-more-hq-cars-and-tracks.nsi index 248f8bdc..daaaf412 100644 --- a/packaging/windows/speed-dreams-more-hq-cars-and-tracks.nsi +++ b/packaging/windows/speed-dreams-more-hq-cars-and-tracks.nsi @@ -66,6 +66,7 @@ Section -CoreData File "${BUILD_INST_DIR}\data\config\raceman\championship.xml" File "${BUILD_INST_DIR}\data\config\raceman\championship-supercars.xml" File "${BUILD_INST_DIR}\data\config\raceman\championship-trb1.xml" + File "${BUILD_INST_DIR}\data\config\raceman\championship-mp1.xml" File "${BUILD_INST_DIR}\data\config\raceman\championship-mpa1.xml" File "${BUILD_INST_DIR}\data\config\raceman\championship-mpa11.xml" @@ -78,31 +79,34 @@ Section -Drivers ; Robots binaries SetOutPath "$INSTDIR\lib\drivers\simplix_trb1" File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\simplix_trb1\*.*" - + ; Robots binaries SetOutPath "$INSTDIR\lib\drivers\simplix_mpa1" File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\simplix_mpa1\*.*" SetOutPath "$INSTDIR\lib\drivers\usr_trb1" File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\usr_trb1\*.*" - + ;SetOutPath "$INSTDIR\lib\drivers\usr_mpa1" ;File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\usr_mpa1\*.*" ;SetOutPath "$INSTDIR\lib\drivers\shadow_mpa1" ;File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\shadow_mpa1\*.*" + SetOutPath "$INSTDIR\lib\drivers\shadow_mp1" + File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\shadow_mp1\*.*" + ; Robots data files (car and track setups) SetOutPath "$INSTDIR\data\drivers\simplix_trb1" File /r "${BUILD_INST_DIR}\data\drivers\simplix_trb1\*.*" - + ; Robots data files (car and track setups) SetOutPath "$INSTDIR\data\drivers\simplix_mpa1" File /r "${BUILD_INST_DIR}\data\drivers\simplix_mpa1\*.*" SetOutPath "$INSTDIR\data\drivers\usr_trb1" File /r "${BUILD_INST_DIR}\data\drivers\usr_trb1\*.*" - + ;SetOutPath "$INSTDIR\data\drivers\usr_mpa1" ;File /r "${BUILD_INST_DIR}\data\drivers\usr_mpa1\*.*" @@ -143,7 +147,7 @@ Section -Cars SetOutPath "$INSTDIR\data\cars\models\trb1-zaxxon-rb" File /r "${BUILD_INST_DIR}\data\cars\models\trb1-zaxxon-rb\*.*" - + ; HQ / AI driven MPA1 car models SetOutPath "$INSTDIR\data\cars\models\mpa1-ffr" File /r "${BUILD_INST_DIR}\data\cars\models\mpa1-ffr\*.*" @@ -178,6 +182,9 @@ Section -Cars SetOutPath "$INSTDIR\data\cars\models\mp1-glass-fw27" File /r "${BUILD_INST_DIR}\data\cars\models\mp1-glass-fw27\*.*" + SetOutPath "$INSTDIR\data\cars\models\mp1-kuala-c24" + File /r "${BUILD_INST_DIR}\data\cars\models\mp1-kuala-c24\*.*" + SetOutPath "$INSTDIR\data\cars\models\mp1-midland-ps05" File /r "${BUILD_INST_DIR}\data\cars\models\mp1-midland-ps05\*.*" @@ -187,8 +194,8 @@ Section -Cars SetOutPath "$INSTDIR\data\cars\models\mp1-murasama-007" File /r "${BUILD_INST_DIR}\data\cars\models\mp1-murasama-007\*.*" - SetOutPath "$INSTDIR\data\cars\models\mp1-vicente" - File /r "${BUILD_INST_DIR}\data\cars\models\mp1-vicente\*.*" + ; SetOutPath "$INSTDIR\data\cars\models\mp1-vicente" + ; File /r "${BUILD_INST_DIR}\data\cars\models\mp1-vicente\*.*" SectionEnd @@ -196,7 +203,7 @@ Section -Tracks SetOverwrite on - ; HQ (2) circuits + ; HQ (2) circuits SetOutPath "$INSTDIR\data\tracks\circuit\aalborg" File /r "${BUILD_INST_DIR}\data\tracks\circuit\aalborg\*.*" @@ -209,11 +216,11 @@ Section -Tracks SetOutPath "$INSTDIR\data\tracks\circuit\sao-paulo" File /r "${BUILD_INST_DIR}\data\tracks\circuit\sao-paulo\*.*" - ; HQ (2) dirt tracks + ; HQ (2) dirt tracks SetOutPath "$INSTDIR\data\tracks\dirt\garguree" File /r "${BUILD_INST_DIR}\data\tracks\dirt\garguree\*.*" - ; HQ (2) road tracks + ; HQ (2) road tracks SetOutPath "$INSTDIR\data\tracks\road\inuksuk" File /r "${BUILD_INST_DIR}\data\tracks\road\inuksuk\*.*" @@ -222,10 +229,10 @@ Section -Tracks SetOutPath "$INSTDIR\data\tracks\road\longday" File /r "${BUILD_INST_DIR}\data\tracks\road\longday\*.*" - + SetOutPath "$INSTDIR\data\tracks\road\ole-road-1" File /r "${BUILD_INST_DIR}\data\tracks\road\ole-road-1\*.*" - + SetOutPath "$INSTDIR\data\tracks\road\peters" File /r "${BUILD_INST_DIR}\data\tracks\road\peters\*.*" @@ -241,16 +248,16 @@ Section -Tracks ; HQ (2) speedways SetOutPath "$INSTDIR\data\tracks\speedway\longpond" File /r "${BUILD_INST_DIR}\data\tracks\speedway\longpond\*.*" - + SetOutPath "$INSTDIR\data\tracks\speedway\alamo" File /r "${BUILD_INST_DIR}\data\tracks\speedway\alamo\*.*" SetOutPath "$INSTDIR\data\tracks\speedway\milky-five" - File /r "${BUILD_INST_DIR}\data\tracks\speedway\milky-five\*.*" - + File /r "${BUILD_INST_DIR}\data\tracks\speedway\milky-five\*.*" + SetOutPath "$INSTDIR\data\tracks\speedway\newton" File /r "${BUILD_INST_DIR}\data\tracks\speedway\newton\*.*" - + SectionEnd ; This function is called at installer startup.