update preview

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5711 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 0075c5d06b6e7ffe97fe16f14fa083b393848e4c
Former-commit-id: 9cc09c6760a2f251762e26808f64f7f83e28061d

packaging/windows/speed-dreams-base.nsi

@@ -87,12 +87,13 @@ Section "!Base System" SEC01
   ; Executable and DLLs ... but no mod tool (see later)
   SetOutPath "$INSTDIR\bin"
   File /x sd-*.* /x *.lib "${BUILD_INST_DIR}\bin\*.*"
+  File /x libzlib.dll /x zlib1.dll "${BUILD_INST_DIR}\bin\*.*"
 
   ; Core loadable modules (physics and graphics engines, track loader, ...)
   SetOutPath "$INSTDIR\lib\modules\graphic"
   File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\graphic\*.*"
   SetOutPath "$INSTDIR\lib\modules\simu"
-  File "${BUILD_INST_DIR}\lib\modules\simu\simuv2.1.dll"
+  File "${BUILD_INST_DIR}\lib\modules\simu\simuv4.dll"
   SetOutPath "$INSTDIR\lib\modules\telemetry"
   File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\telemetry\*.*"
   SetOutPath "$INSTDIR\lib\modules\track"
@@ -103,6 +104,8 @@ Section "!Base System" SEC01
   File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\sound\*.*"
   SetOutPath "$INSTDIR\lib\modules\racing"
   File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\racing\*.*"
+  ;SetOutPath "$INSTDIR\lib\modules\networking"
+  ;File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\networking\*.*"
 
   ; Core data files (sound, textures, menus, car categories, ...)
   SetOutPath "$INSTDIR\data"
@@ -122,6 +125,7 @@ Section "!Base System" SEC01
   File "${BUILD_INST_DIR}\data\config\raceman\quickrace.xml"
   File "${BUILD_INST_DIR}\data\config\raceman\singleevent-challenge.xml"
   File "${BUILD_INST_DIR}\data\config\raceman\singleevent-endurance.xml"
+  File "${BUILD_INST_DIR}\data\config\raceman\networkrace.xml"
 
   SetOutPath "$INSTDIR\data\data"
   File /r "${BUILD_INST_DIR}\data\data\*.*"
@@ -137,8 +141,8 @@ Section "!Base System" SEC01
   SetOutPath "$INSTDIR\lib\drivers\human"
   File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\human\*.*"
 
-  ;SetOutPath "$INSTDIR\lib\drivers\networkhuman"
+  SetOutPath "$INSTDIR\lib\drivers\networkhuman"
-  ;File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\networkhuman\*.*"
+  File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\networkhuman\*.*"
 
   SetOutPath "$INSTDIR\lib\drivers\simplix_sc"
   File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\simplix_sc\*.*"
@@ -150,8 +154,8 @@ Section "!Base System" SEC01
   SetOutPath "$INSTDIR\data\drivers\human"
   File /r /x *.lib "${BUILD_INST_DIR}\data\drivers\human\*.*"
 
-  ;SetOutPath "$INSTDIR\data\drivers\networkhuman"
+  SetOutPath "$INSTDIR\data\drivers\networkhuman"
-  ;File /r /x *.lib "${BUILD_INST_DIR}\data\drivers\networkhuman\*.*"
+  File /r /x *.lib "${BUILD_INST_DIR}\data\drivers\networkhuman\*.*"
 
   SetOutPath "$INSTDIR\data\drivers\simplix_sc"
   File /r /x *.lib "${BUILD_INST_DIR}\data\drivers\simplix_sc\*.*"
@@ -202,6 +206,7 @@ Section /o "Basic mod Tools" SEC02
   ; Tools executables
   SetOutPath "$INSTDIR\bin"
   File "${BUILD_INST_DIR}\bin\sd2-*.*"
+  File "${BUILD_INST_DIR}\bin\zlib1.dll"
   File "${BUILD_INST_DIR}\bin\*.lib"
 
   ; Cmake macros for robot developers

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-mpa1.xml"
 
 SectionEnd
 
@@ -76,20 +77,30 @@ 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\*.*"
-
+  
-  ; Warning: Must be here because kilo2008 also drivers the TRB1 cars.
+  SetOutPath "$INSTDIR\lib\drivers\usr_mpa1"
-  SetOutPath "$INSTDIR\lib\drivers\kilo2008"
+  File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\usr_mpa1\*.*"
-  File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\kilo2008\*.*"
 
   ; 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\*.*"
 
   ; Warning: Must be here because kilo2008 also drivers the TRB1 cars.
   SetOutPath "$INSTDIR\data\drivers\kilo2008"
@@ -125,6 +136,22 @@ 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\*.*"
+
+  SetOutPath "$INSTDIR\data\cars\models\mpa1-furia"
+  File /r "${BUILD_INST_DIR}\data\cars\models\mpa1-furia\*.*"
+
+  SetOutPath "$INSTDIR\data\cars\models\mpa1-hartbill-2002"
+  File /r "${BUILD_INST_DIR}\data\cars\models\mpa1-hartbill-2002\*.*"
+
+  SetOutPath "$INSTDIR\data\cars\models\mpa1-murasama"
+  File /r "${BUILD_INST_DIR}\data\cars\models\mpa1-murasama\*.*"
+
+  SetOutPath "$INSTDIR\data\cars\models\mpa1-team-lynx"
+  File /r "${BUILD_INST_DIR}\data\cars\models\mpa1-team-lynx\*.*"
 
 SectionEnd
 
@@ -152,23 +179,35 @@ Section -Tracks
 
   SetOutPath "$INSTDIR\data\tracks\road\lombaro"
   File /r "${BUILD_INST_DIR}\data\tracks\road\lombaro\*.*"
+    
+  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\*.*"
 
   SetOutPath "$INSTDIR\data\tracks\road\pinabashi"
   File /r "${BUILD_INST_DIR}\data\tracks\road\pinabashi\*.*"
 
-  SetOutPath "$INSTDIR\data\tracks\road\ole-road-1"
-  File /r "${BUILD_INST_DIR}\data\tracks\road\ole-road-1\*.*"
-
   SetOutPath "$INSTDIR\data\tracks\road\prenzlau"
   File /r "${BUILD_INST_DIR}\data\tracks\road\prenzlau\*.*"
 
   SetOutPath "$INSTDIR\data\tracks\road\salty"
   File /r "${BUILD_INST_DIR}\data\tracks\road\salty\*.*"
 
-  ; HQ (2) speedways 
+  ; HQ (2) speedways
+  SetOutPath "$INSTDIR\data\tracks\speedway\longpond"
+  File /r "${BUILD_INST_DIR}\data\tracks\speedway\longpond\*.*"
+  
+  SetOutPath "$INSTDIR\data\tracks\speedway\mile"
+  File /r "${BUILD_INST_DIR}\data\tracks\speedway\mile\*.*"
+
+   SetOutPath "$INSTDIR\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.

packaging/windows/speed-dreams-unmaintained.nsi

@@ -61,8 +61,7 @@ Section -CoreBinaries
 
   ; Obsolete physics engines.
   SetOutPath "$INSTDIR\lib\modules\simu"
-  File "${BUILD_INST_DIR}\lib\modules\simu\simuv2.dll"
+  File "${BUILD_INST_DIR}\lib\modules\simu\simuv2.1.dll"
-  File "${BUILD_INST_DIR}\lib\modules\simu\simuv3.dll"
 
 SectionEnd
 
@@ -76,6 +75,14 @@ Section -Drivers
 
   SetOverwrite on
 
+  ; Warning: Must be here because kilo2008 also drivers the TRB1 cars.
+  SetOutPath "$INSTDIR\lib\drivers\kilo2008"
+  File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\kilo2008\*.*"
+  
+  ; Warning: Must be here because kilo2008 also drivers the TRB1 cars.
+  SetOutPath "$INSTDIR\data\drivers\kilo2008"
+  File /r "${BUILD_INST_DIR}\data\drivers\kilo2008\*.*"
+
 SectionEnd
 
 Section -Cars

packaging/windows/speed-dreams.nsh

@@ -13,8 +13,8 @@
 !define VER_MINOR 1
 !define VER_PATCH 0
 !define VER_EXTRA ""
-!define VER_REVISION "r????"
+!define VER_REVISION "beta"
-!define VER_RELDATE 20130408 ; Initial guess ;-)
+!define VER_RELDATE 20131102 ; Initial guess ;-)
 
 !define GAME_SHORT_NAME "Speed Dreams"
 !define GAME_NAME "${GAME_SHORT_NAME} 2"