Only disable filesystem redirection in the 64-bit installers

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@184 632fc199-4ca6-4c93-a231-07263d6284db
libjpeg-turbo · May 10, 2010 · ef663e3 · ef663e3
1 parent be09b20
commit ef663e3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -160,7 +160,7 @@ sunpkg: all
 
 nsi: all
 	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
 
 else

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

diff --git a/win/Makefile b/win/Makefile
@@ -234,7 +234,7 @@ nsi: all
 	$(RM) $(ODIR)/libjpeg-turbo64.exe
 	makensis -nocd -DVERSION=$(VERSION) -DAPPNAME=libjpeg-turbo64 \
 		-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
 nsi: all
 	$(RM) $(ODIR)/libjpeg-turbo.exe