Fixed a regression bug in the NSIS script that caused the Windows installer

build to fail when using the Visual Studio IDE.


git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.1.x@554 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2011-04-01 11:24:31 +00:00
parent e44f8c0112
commit 9e50fa7fbe
2 changed files with 9 additions and 6 deletions

View File

@@ -16,6 +16,9 @@ underscore when building with MinGW64. This means that, when building
libjpeg-turbo with older versions of MinGW64, you will now have to add
-fno-leading-underscore to the CFLAGS.
[4] Fixed a regression bug in the NSIS script that caused the Windows installer
build to fail when using the Visual Studio IDE.
1.1.0
=====

View File

@@ -45,12 +45,12 @@ Section "@CMAKE_PROJECT_NAME@ SDK for @INST_PLATFORM@ (required)"
!else
File "@CMAKE_BINARY_DIR@\sharedlib\${BUILDDIR}jpeg@DLL_VERSION@.dll"
!endif
File "@CMAKE_BINARY_DIR@\sharedlib\cjpeg.exe"
File "@CMAKE_BINARY_DIR@\sharedlib\djpeg.exe"
File "@CMAKE_BINARY_DIR@\sharedlib\jpegtran.exe"
File "@CMAKE_BINARY_DIR@\jpgtest.exe"
File "@CMAKE_BINARY_DIR@\rdjpgcom.exe"
File "@CMAKE_BINARY_DIR@\wrjpgcom.exe"
File "@CMAKE_BINARY_DIR@\sharedlib\${BUILDDIR}cjpeg.exe"
File "@CMAKE_BINARY_DIR@\sharedlib\${BUILDDIR}djpeg.exe"
File "@CMAKE_BINARY_DIR@\sharedlib\${BUILDDIR}jpegtran.exe"
File "@CMAKE_BINARY_DIR@\${BUILDDIR}jpgtest.exe"
File "@CMAKE_BINARY_DIR@\${BUILDDIR}rdjpgcom.exe"
File "@CMAKE_BINARY_DIR@\${BUILDDIR}wrjpgcom.exe"
SetOutPath $INSTDIR\lib
!ifdef GCC
File "@CMAKE_BINARY_DIR@\libturbojpeg.dll.a"