From 863d2c3aa4eb1dba67eb53b5ef5ea21996f00fd8 Mon Sep 17 00:00:00 2001 From: beaglejoe Date: Wed, 8 Apr 2015 17:48:30 +0000 Subject: [PATCH] Added dandroid_gp36 & commented out kilo2008 git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5957 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 3fb33c139fd406d3dde304195d2008377e3247c1 Former-commit-id: b592dc4c97381a18f44453e8a3848dec1b3e77bf --- packaging/windows/speed-dreams-base.nsi | 3 +++ .../windows/speed-dreams-hq-cars-and-tracks.nsi | 17 +++++++++++++---- .../speed-dreams-more-hq-cars-and-tracks.nsi | 4 ++-- packaging/windows/speed-dreams-unmaintained.nsi | 8 ++++---- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/packaging/windows/speed-dreams-base.nsi b/packaging/windows/speed-dreams-base.nsi index 53d9a1fa4..9542af635 100644 --- a/packaging/windows/speed-dreams-base.nsi +++ b/packaging/windows/speed-dreams-base.nsi @@ -204,6 +204,9 @@ Section /o "Basic mod Tools" SEC02 SetOutPath "$INSTDIR\lib\drivers\usr" File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\usr\*.*" + SetOutPath "$INSTDIR\lib\drivers\dandroid" + File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\dandroid\*.*" + ; Customizable robot data files (car and track setups) SetOutPath "$INSTDIR\data\drivers\simplix" File /r "${BUILD_INST_DIR}\data\drivers\simplix\*.*" diff --git a/packaging/windows/speed-dreams-hq-cars-and-tracks.nsi b/packaging/windows/speed-dreams-hq-cars-and-tracks.nsi index 493420088..0e183dcd2 100644 --- a/packaging/windows/speed-dreams-hq-cars-and-tracks.nsi +++ b/packaging/windows/speed-dreams-hq-cars-and-tracks.nsi @@ -83,6 +83,9 @@ Section -Drivers SetOutPath "$INSTDIR\lib\drivers\usr" File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\usr\*.*" + SetOutPath "$INSTDIR\lib\drivers\dandroid" + File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\dandroid\*.*" + ; Customizable robot data files (car and track setups) (needed for the Career mode) SetOutPath "$INSTDIR\data\drivers\simplix" File /r "${BUILD_INST_DIR}\data\drivers\simplix\*.*" @@ -97,11 +100,14 @@ Section -Drivers SetOutPath "$INSTDIR\lib\drivers\usr_ls1" File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\usr_ls1\*.*" + SetOutPath "$INSTDIR\lib\drivers\dandroid_36GP" + File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\dandroid_36GP\*.*" + SetOutPath "$INSTDIR\lib\drivers\usr_36GP" File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\usr_36GP\*.*" - SetOutPath "$INSTDIR\lib\drivers\kilo2008" - File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\kilo2008\*.*" + ; SetOutPath "$INSTDIR\lib\drivers\kilo2008" + ; File /r /x *.lib "${BUILD_INST_DIR}\lib\drivers\kilo2008\*.*" ; Robots data files (car and track setups) SetOutPath "$INSTDIR\data\drivers\simplix_ls1" @@ -113,11 +119,14 @@ Section -Drivers SetOutPath "$INSTDIR\data\drivers\usr_ls1" File /r "${BUILD_INST_DIR}\data\drivers\usr_ls1\*.*" + SetOutPath "$INSTDIR\data\drivers\dandroid_36GP" + File /r "${BUILD_INST_DIR}\data\drivers\dandroid_36GP\*.*" + SetOutPath "$INSTDIR\data\drivers\usr_36GP" File /r "${BUILD_INST_DIR}\data\drivers\usr_36GP\*.*" - SetOutPath "$INSTDIR\data\drivers\kilo2008" - File /r "${BUILD_INST_DIR}\data\drivers\kilo2008\*.*" + ; SetOutPath "$INSTDIR\data\drivers\kilo2008" + ; File /r "${BUILD_INST_DIR}\data\drivers\kilo2008\*.*" SectionEnd 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 d21a581c8..22ab91ab3 100644 --- a/packaging/windows/speed-dreams-more-hq-cars-and-tracks.nsi +++ b/packaging/windows/speed-dreams-more-hq-cars-and-tracks.nsi @@ -103,8 +103,8 @@ Section -Drivers 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" - File /r "${BUILD_INST_DIR}\data\drivers\kilo2008\*.*" + ; SetOutPath "$INSTDIR\data\drivers\kilo2008" + ; File /r "${BUILD_INST_DIR}\data\drivers\kilo2008\*.*" SectionEnd diff --git a/packaging/windows/speed-dreams-unmaintained.nsi b/packaging/windows/speed-dreams-unmaintained.nsi index d31b1dd76..31d0675c3 100644 --- a/packaging/windows/speed-dreams-unmaintained.nsi +++ b/packaging/windows/speed-dreams-unmaintained.nsi @@ -76,12 +76,12 @@ 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\*.*" + ; 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\*.*" + ; SetOutPath "$INSTDIR\data\drivers\kilo2008" + ; File /r "${BUILD_INST_DIR}\data\drivers\kilo2008\*.*" SectionEnd