ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Oops. We need to delete the new copy of turbojpeg.dll in the binary directory. Also add quotes to InstDir to allow installing under "c:\Program Files\", and remove unnecessary quotes in the Delete directives.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@1028 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2013-09-20 01:11:40 +00:00
parent 87d6e984ff
commit 54fffed01a
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
release/libjpeg-turbo.nsi.in
View File

@@ -1,7 +1,7 @@
!include x64.nsh !include x64.nsh
Name "@CMAKE_PROJECT_NAME@ SDK for @INST_PLATFORM@" Name "@CMAKE_PROJECT_NAME@ SDK for @INST_PLATFORM@"
OutFile "@CMAKE_BINARY_DIR@\${BUILDDIR}@INST_NAME@.exe" OutFile "@CMAKE_BINARY_DIR@\${BUILDDIR}@INST_NAME@.exe"
InstallDir @INST_DIR@ InstallDir "@INST_DIR@"
SetCompressor bzip2 SetCompressor bzip2
@@ -111,13 +111,15 @@ Section "Uninstall"
!ifdef GCC !ifdef GCC
Delete $INSTDIR\bin\libjpeg-@DLL_VERSION@.dll Delete $INSTDIR\bin\libjpeg-@DLL_VERSION@.dll
Delete $SYSDIR\libturbojpeg.dll Delete $SYSDIR\libturbojpeg.dll
Delete $INSTDIR\lib\libturbojpeg.dll.a" Delete $INSTDIR\bin\libturbojpeg.dll
Delete $INSTDIR\lib\libturbojpeg.a" Delete $INSTDIR\lib\libturbojpeg.dll.a
Delete $INSTDIR\lib\libjpeg.dll.a" Delete $INSTDIR\lib\libturbojpeg.a
Delete $INSTDIR\lib\libjpeg.a" Delete $INSTDIR\lib\libjpeg.dll.a
Delete $INSTDIR\lib\libjpeg.a
!else !else
Delete $INSTDIR\bin\jpeg@DLL_VERSION@.dll Delete $INSTDIR\bin\jpeg@DLL_VERSION@.dll
Delete $SYSDIR\turbojpeg.dll Delete $SYSDIR\turbojpeg.dll
Delete $INSTDIR\bin\turbojpeg.dll
Delete $INSTDIR\lib\jpeg.lib Delete $INSTDIR\lib\jpeg.lib
Delete $INSTDIR\lib\jpeg-static.lib Delete $INSTDIR\lib\jpeg-static.lib
Delete $INSTDIR\lib\turbojpeg.lib Delete $INSTDIR\lib\turbojpeg.lib
@@ -132,11 +134,11 @@ Section "Uninstall"
Delete $INSTDIR\bin\tjbench.exe Delete $INSTDIR\bin\tjbench.exe
Delete $INSTDIR\bin\rdjpgcom.exe Delete $INSTDIR\bin\rdjpgcom.exe
Delete $INSTDIR\bin\wrjpgcom.exe Delete $INSTDIR\bin\wrjpgcom.exe
Delete $INSTDIR\include\jconfig.h" Delete $INSTDIR\include\jconfig.h
Delete $INSTDIR\include\jerror.h" Delete $INSTDIR\include\jerror.h
Delete $INSTDIR\include\jmorecfg.h" Delete $INSTDIR\include\jmorecfg.h
Delete $INSTDIR\include\jpeglib.h" Delete $INSTDIR\include\jpeglib.h
Delete $INSTDIR\include\turbojpeg.h" Delete $INSTDIR\include\turbojpeg.h
Delete $INSTDIR\uninstall_@VERSION@.exe Delete $INSTDIR\uninstall_@VERSION@.exe
Delete $INSTDIR\doc\README Delete $INSTDIR\doc\README
Delete $INSTDIR\doc\README-turbo.txt Delete $INSTDIR\doc\README-turbo.txt