Browse Source

include the architecture in the windows installer

Ashish Kulkarni 11 years ago
parent
commit
257169a812
2 changed files with 2 additions and 2 deletions
  1. 1 1
      build_msvc.cmd
  2. 1 1
      wkhtmltox.nsi

+ 1 - 1
build_msvc.cmd

@@ -153,7 +153,7 @@ exit /b 0
 :build_installer
 echo ================ building installer
 cd /d %BUILD_DIR%
-"%ProgramFiles%\NSIS\makensis.exe" /DVERSION=%WK_VERSION% /DWK_HASH=%WK_HASH% ..\wkhtmltox.nsi
+"%ProgramFiles%\NSIS\makensis.exe" /DVERSION=%WK_VERSION% /DWK_HASH=%WK_HASH% /DARCH=win32 ..\wkhtmltox.nsi
 cd /d %~dp0
 exit /b 0
 

+ 1 - 1
wkhtmltox.nsi

@@ -2,7 +2,7 @@
 !include "x64.nsh"
 
 Name             "wkhtmltox ${VERSION} (${WK_HASH})"
-OutFile          "static-build\wkhtmltox-${VERSION}_${WK_HASH}.exe"
+OutFile          "static-build\wkhtmltox-${ARCH}_${VERSION}-${WK_HASH}.exe"
 InstallDir       "$PROGRAMFILES\wkhtmltopdf"
 InstallDirRegKey HKLM "Software\wkhtmltopdf" "InstallPath"
 VIProductVersion "${VERSION}.0"