In the Windows installer packages, place a duplicate copy of turbojpeg.dll in c:...

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@1026 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 72b236cc2fc8fc2eec896f55f70a249a1cfd6982..68552bfda6335afac544bd574ba1dd9614626093 100644 (file)
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,13 @@ and into /opt/libjpeg-turbo/lib64 by default on any 64-bit system, not just
 x86-64.  You can override this by overriding either the 'prefix' or 'libdir'
 configure variables.
 
+[2] The Windows installer now places a copy of the TurboJPEG DLLs in the same
+directory as the rest of the libjpeg-turbo binaries.  This was mainly done
+to support TurboVNC 1.3, which bundles the DLLs in its Windows installation.
+When using a 32-bit version of CMake on 64-bit Windows, it is impossible to
+access the c:\WINDOWS\system32 directory, which made it impossible for the
+TurboVNC build scripts to bundle the 64-bit TurboJPEG DLL.
+
 
 1.3.0
 =====

diff --git a/release/libjpeg-turbo.nsi.in b/release/libjpeg-turbo.nsi.in
index 8fcd764a08ee2c5ece9930ad4319c804c850d426..0514565c6a12190734591a6930a642ba37e22f1f 100755 (executable)
--- a/release/libjpeg-turbo.nsi.in
+++ b/release/libjpeg-turbo.nsi.in
@@ -40,6 +40,11 @@ Section "@CMAKE_PROJECT_NAME@ SDK for @INST_PLATFORM@ (required)"
        File "@CMAKE_BINARY_DIR@\${BUILDDIR}turbojpeg.dll"
 !endif
        SetOutPath $INSTDIR\bin
+!ifdef GCC
+       File "@CMAKE_BINARY_DIR@\libturbojpeg.dll"
+!else
+       File "@CMAKE_BINARY_DIR@\${BUILDDIR}turbojpeg.dll"
+!endif
 !ifdef GCC
        File "/oname=libjpeg-@DLL_VERSION@.dll" "@CMAKE_BINARY_DIR@\sharedlib\libjpeg-*.dll" 
 !else