Update Windows installer script to include libbz2 (#19)

Libzip apparently grew a new dependency. Also fix a few old sonames in the uninstaller section. Signed-off-by: Scott Talbert <[email protected]>
jaymzh · Mar 2, 2019 · dc892f4 · dc892f4
1 parent 994ede4
commit dc892f4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/concordance/win/concordance.nsi b/concordance/win/concordance.nsi
@@ -46,6 +46,7 @@ Section "Concordance"
   File "../../libconcord/.libs/libconcord-4.dll"
   File "../.libs/concordance.exe"
   File "$%MINGW_SYSROOT_DEVLIB%/libwinpthread-1.dll"
+  File "$%MINGW_SYSROOT_BIN%/libbz2-1.dll"
 
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Concordance" "DisplayName" "Concordance"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Concordance" "UninstallString" "$\"$INSTDIR\Uninstall Concordance.exe$\""
@@ -71,13 +72,14 @@ Section "Uninstall"
   RMDir "$SMPROGRAMS\Concordance"
 
   Delete /rebootok "$INSTDIR\zlib1.dll"
-  Delete /rebootok "$INSTDIR\libzip-2.dll"
+  Delete /rebootok "$INSTDIR\libzip-5.dll"
   Delete /rebootok "$INSTDIR\libstdc++-6.dll"
   Delete /rebootok "$INSTDIR\libgcc_s_sjlj-1.dll"
   Delete /rebootok "$INSTDIR\concordance.exe"
-  Delete /rebootok "$INSTDIR\libconcord-3.dll"
+  Delete /rebootok "$INSTDIR\libconcord-4.dll"
   Delete /rebootok "$INSTDIR\libhidapi-0.dll"
   Delete /rebootok "$INSTDIR\libwinpthread-1.dll"
+  Delete /rebootok "$INSTDIR\libbz2-1.dll"
   Delete /rebootok "$INSTDIR\Uninstall Concordance.exe"
   RMDir "$INSTDIR"