From 4d877931ab19bb5450ce55bfb776422113eeb869 Mon Sep 17 00:00:00 2001 From: DRC Date: Thu, 19 Sep 2013 22:55:57 +0000 Subject: [PATCH] In the Windows installer packages, place a duplicate copy of turbojpeg.dll in c:\libjpeg-turbo[-gcc][64]\bin. This is mainly to give installers an easy way to find the DLL for the purposes of bundling it. Specifically, this was necessary for TurboVNC, becuase 32-bit CMake running on 64-bit Windows cannot ever access the "real" c:\windows\system32 directory. git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@1026 632fc199-4ca6-4c93-a231-07263d6284db --- ChangeLog.txt | 7 +++++++ release/libjpeg-turbo.nsi.in | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 72b236c..68552bf 100644 --- 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 8fcd764..0514565 100755 --- 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 -- 2.40.0