Permalink
Browse files

Fixed installers: only include the vcredist for the right architecture,

search in bld*64 for 64 bit installer, fixed VERSION_BUILD to be empty,
changed name of installers to include XXbit.
  • Loading branch information...
hiker committed Nov 17, 2017
1 parent a959f3c commit 3a5f398b3e4d7b87a8b2bcde3465c99b8238be2f
Showing with 11 additions and 12 deletions.
  1. +8 −9 tools/windows_installer/supertuxkart-64bit.nsi
  2. +3 −3 tools/windows_installer/supertuxkart.nsi
@@ -43,7 +43,7 @@
!define DESCRIPTION "3D open-source arcade racer with a variety characters, tracks, and modes to play"
Name "${APPNAMEANDVERSION}"
OutFile "${APPNAMEANDVERSION} installer.exe"
OutFile "${APPNAMEANDVERSION} installer-64bit.exe"
# These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
# It is possible to use "mailto:" links in here to open the email client
@@ -174,12 +174,12 @@ Section "Install" SecMain
; Try to find the binary directory in a list of 'typical' names:
; The first found directory is used
${!setIfUndefinedAndExists} EXEC_PATH ..\..\bld\bin\RelWithDebInfo\*.*
${!setIfUndefinedAndExists} EXEC_PATH ..\..\bld\bin\Release\*.*
${!setIfUndefinedAndExists} EXEC_PATH ..\..\build\bin\RelWithDebInfo\*.*
${!setIfUndefinedAndExists} EXEC_PATH ..\..\build\bin\Release\*.*
${!setIfUndefinedAndExists} EXEC_PATH ..\..\cmake_build\bin\RelWithDebInfo\*.*
${!setIfUndefinedAndExists} EXEC_PATH ..\..\cmake_build\bin\Release\*.*
${!setIfUndefinedAndExists} EXEC_PATH ..\..\bld-64\bin\RelWithDebInfo\*.*
${!setIfUndefinedAndExists} EXEC_PATH ..\..\bld-64\bin\Release\*.*
${!setIfUndefinedAndExists} EXEC_PATH ..\..\build-64\bin\RelWithDebInfo\*.*
${!setIfUndefinedAndExists} EXEC_PATH ..\..\build-64\bin\Release\*.*
${!setIfUndefinedAndExists} EXEC_PATH ..\..\cmake_build-64\bin\RelWithDebInfo\*.*
${!setIfUndefinedAndExists} EXEC_PATH ..\..\cmake_build-64\bin\Release\*.*
File /x *.ilk ${EXEC_PATH}
@@ -206,7 +206,7 @@ Section "Install" SecMain
File *.ico
; prereqs
SetOutPath "$INSTDIR\prerequisites"
File /r prerequisites\*.*
File /r prerequisites\vcredist_x64.exe
; data + assets
SetOutPath "$INSTDIR\data\"
@@ -281,7 +281,6 @@ Section "Uninstall" redist
DELETE /REBOOTOK "$INSTDIR\icon.ico"
DELETE /REBOOTOK "$INSTDIR\libcurl-4.dll"
DELETE /REBOOTOK "$INSTDIR\libeay32.dll"
DELETE /REBOOTOK "$INSTDIR\libidn-11.dll"
DELETE /REBOOTOK "$INSTDIR\License.txt"
DELETE /REBOOTOK "$INSTDIR\libfreetype.dll"
DELETE /REBOOTOK "$INSTDIR\libfribidi-0.dll"
@@ -35,15 +35,15 @@
!define VERSION_MINOR 9
!define VERSION_REVISION 3
; Empty means stable, could be -git, -rc1
!define VERSION_BUILD "-rc1"
!define VERSION_BUILD ""
;Name and file
!define APPNAME "SuperTuxKart"
!define APPNAMEANDVERSION "${APPNAME} ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_BUILD}"
!define DESCRIPTION "3D open-source arcade racer with a variety characters, tracks, and modes to play"
Name "${APPNAMEANDVERSION}"
OutFile "${APPNAMEANDVERSION} installer.exe"
OutFile "${APPNAMEANDVERSION} installer-32bit.exe"
# These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
# It is possible to use "mailto:" links in here to open the email client
@@ -206,7 +206,7 @@ Section "Install" SecMain
File *.ico
; prereqs
SetOutPath "$INSTDIR\prerequisites"
File /r prerequisites\*.*
File /r prerequisites\vcredist_x86.exe
; data + assets
SetOutPath "$INSTDIR\data\"

0 comments on commit 3a5f398

Please sign in to comment.