diff options
| author | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2010-02-25 05:52:44 +0000 |
|---|---|---|
| committer | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2010-02-25 05:52:44 +0000 |
| commit | 0d09ca4e928672d387a80a3d1b70dc91c24f6f10 (patch) | |
| tree | 04ac07e2dd249d5712d55dc969612fb8dc73dcbc /trunk/release | |
| parent | 816fa8e62f605bc74a23434f9059ded59f0882cd (diff) | |
Install jpeg62.dll in SDK directory, not Windows system directory. Also, check whether SDK is already installed prior to re-installing
git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@153 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'trunk/release')
| -rw-r--r-- | trunk/release/libjpeg-turbo.nsi | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/trunk/release/libjpeg-turbo.nsi b/trunk/release/libjpeg-turbo.nsi index 6142d66..28c6d56 100644 --- a/trunk/release/libjpeg-turbo.nsi +++ b/trunk/release/libjpeg-turbo.nsi @@ -12,12 +12,31 @@ UninstPage instfiles Section "libjpeg-turbo SDK for ${PLATFORM} (required)" SectionIn RO +!ifdef GCC + IfFileExists $SYSDIR/libturbojpeg.dll exists 0 +!else + IfFileExists $SYSDIR/turbojpeg.dll exists 0 +!endif + goto notexists + exists: +!ifdef GCC + MessageBox MB_OK "An existing version of the libjpeg-turbo SDK for ${PLATFORM} is already installed. Please uninstall it first." +!else + MessageBox MB_OK "An existing version of the libjpeg-turbo SDK for ${PLATFORM} or the TurboJPEG SDK is already installed. Please uninstall it first." +!endif + quit + + notexists: SetOutPath $SYSDIR !ifdef GCC File "${WLIBDIR}\libturbojpeg.dll" - File "${WLIBDIR}\libjpeg-62.dll" !else File "${WLIBDIR}\turbojpeg.dll" +!endif + SetOutPath $INSTDIR\bin +!ifdef GCC + File "${WLIBDIR}\libjpeg-62.dll" +!else File "${WLIBDIR}\jpeg62.dll" !endif SetOutPath $INSTDIR\lib @@ -62,14 +81,14 @@ Section "Uninstall" DeleteRegKey HKLM "SOFTWARE\${APPNAME} ${VERSION}" !ifdef GCC - Delete $SYSDIR\libjpeg-62.dll + Delete $INSTDIR\bin\libjpeg-62.dll Delete $SYSDIR\libturbojpeg.dll Delete $INSTDIR\lib\libturbojpeg.dll.a" Delete $INSTDIR\lib\libturbojpeg.a" Delete $INSTDIR\lib\libjpeg.dll.a" Delete $INSTDIR\lib\libjpeg.a" !else - Delete $SYSDIR\jpeg62.dll + Delete $INSTDIR\bin\jpeg62.dll Delete $SYSDIR\turbojpeg.dll Delete $INSTDIR\lib\jpeg.lib Delete $INSTDIR\lib\jpeg-static.lib @@ -90,6 +109,7 @@ Section "Uninstall" RMDir "$INSTDIR\include" RMDir "$INSTDIR\lib" + RMDir "$INSTDIR\bin" RMDir "$INSTDIR" SectionEnd |