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

Only disable filesystem redirection in the 64-bit installers

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@184 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2010-05-10 23:39:22 +00:00
parent be09b20a40
commit ef663e333e
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -160,7 +160,7 @@ sunpkg: all
nsi: all nsi: all
makensis -nocd -DVERSION=$(VERSION) -DAPPNAME=libjpeg-turbo-gcc64 \ makensis -nocd -DVERSION=$(VERSION) -DAPPNAME=libjpeg-turbo-gcc64 \
-DWLIBDIR=.libs -DWSRCDIR=$(srcdir) -DWBLDDIR=. -DWHDRDIR=. \ -DWLIBDIR=.libs -DWSRCDIR=$(srcdir) -DWBLDDIR=. -DWHDRDIR=. -DWIN64 \
-DPLATFORM="GCC 64-bit" -DGCC $(srcdir)/release/libjpeg-turbo.nsi -DPLATFORM="GCC 64-bit" -DGCC $(srcdir)/release/libjpeg-turbo.nsi
else else

4
release/libjpeg-turbo.nsi
View File

@@ -12,9 +12,11 @@ UninstPage uninstConfirm
UninstPage instfiles UninstPage instfiles
Section "libjpeg-turbo SDK for ${PLATFORM} (required)" Section "libjpeg-turbo SDK for ${PLATFORM} (required)"
!ifdef WIN64
${If} ${RunningX64} ${If} ${RunningX64}
${DisableX64FSRedirection} ${DisableX64FSRedirection}
${Endif} ${Endif}
!endif
SectionIn RO SectionIn RO
!ifdef GCC !ifdef GCC
IfFileExists $SYSDIR/libturbojpeg.dll exists 0 IfFileExists $SYSDIR/libturbojpeg.dll exists 0
@@ -78,9 +80,11 @@ Section "libjpeg-turbo SDK for ${PLATFORM} (required)"
SectionEnd SectionEnd
Section "Uninstall" Section "Uninstall"
!ifdef WIN64
${If} ${RunningX64} ${If} ${RunningX64}
${DisableX64FSRedirection} ${DisableX64FSRedirection}
${Endif} ${Endif}
!endif
SetShellVarContext all SetShellVarContext all

2
win/Makefile
View File

@@ -234,7 +234,7 @@ nsi: all
$(RM) $(ODIR)/libjpeg-turbo64.exe $(RM) $(ODIR)/libjpeg-turbo64.exe
makensis -nocd -DVERSION=$(VERSION) -DAPPNAME=libjpeg-turbo64 \ makensis -nocd -DVERSION=$(VERSION) -DAPPNAME=libjpeg-turbo64 \
-DWLIBDIR=windows64 -DWSRCDIR=. -DWBLDDIR=windows64 -DWHDRDIR=win \ -DWLIBDIR=windows64 -DWSRCDIR=. -DWBLDDIR=windows64 -DWHDRDIR=win \
-DPLATFORM="Visual C++ 64-bit" release/libjpeg-turbo.nsi -DPLATFORM="Visual C++ 64-bit" -DWIN64 release/libjpeg-turbo.nsi
else else
nsi: all nsi: all
$(RM) $(ODIR)/libjpeg-turbo.exe $(RM) $(ODIR)/libjpeg-turbo.exe