Create separate packages for Win64 binaries

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

diff --git a/Makefile.am b/Makefile.am
index 01c96412abe608cac01fa7e509e67f17bc61a44e..dd6774960a8ca05b09d1ec8b401b35b9862610c5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,15 +158,20 @@ sunpkg: all
        sh $(srcdir)/release/makesunpkg ${PACKAGE_NAME} ${VERSION} ${BUILD} \
                ${DEBARCH} ${srcdir} $(CC) $(CXX) combined
 
+nsi: all
+       makensis -nocd -DVERSION=$(VERSION) -DAPPNAME=libjpeg-turbo-gcc64 \
+               -DWLIBDIR=.libs -DWSRCDIR=$(srcdir) -DWBLDDIR=. -DWHDRDIR=. \
+               -DPLATFORM="GCC 64-bit" -DGCC $(srcdir)/release/libjpeg-turbo.nsi
+
 else
 
 sunpkg: all
        sh $(srcdir)/release/makesunpkg ${PACKAGE_NAME} ${VERSION} ${BUILD} \
                ${DEBARCH} ${srcdir} $(CC) $(CXX)
 
-endif
-
 nsi: all
        makensis -nocd -DVERSION=$(VERSION) -DAPPNAME=libjpeg-turbo-gcc \
                -DWLIBDIR=.libs -DWSRCDIR=$(srcdir) -DWBLDDIR=. -DWHDRDIR=. \
                -DPLATFORM="GCC" -DGCC $(srcdir)/release/libjpeg-turbo.nsi
+
+endif

diff --git a/README-turbo.txt b/README-turbo.txt
index 801af94fe28482a932cd00f6ecb69b0aded7cacc..0006ae5c826173deaf8119c00c0b54494c262436 100755 (executable)
--- a/README-turbo.txt
+++ b/README-turbo.txt
@@ -138,15 +138,15 @@ of libjpeg by setting
 
 If using Cygwin, then set
 
-  CPATH=/cygdrive/c/libjpeg-turbo-gcc/include
+  CPATH=/cygdrive/c/libjpeg-turbo-gcc[64]/include
   and
-  LIBRARY_PATH=/cygdrive/c/libjpeg-turbo-gcc/lib
+  LIBRARY_PATH=/cygdrive/c/libjpeg-turbo-gcc[64]/lib
 
 If using MinGW, then set
 
-  CPATH=/c/libjpeg-turbo-gcc/include
+  CPATH=/c/libjpeg-turbo-gcc[64]/include
   and
-  LIBRARY_PATH=/c/libjpeg-turbo-gcc/lib
+  LIBRARY_PATH=/c/libjpeg-turbo-gcc[64]/lib
 
 Building against libjpeg-turbo is useful, for instance, if you want to build an
 application that leverages the libjpeg-turbo colorspace extensions (see below.)
@@ -166,10 +166,10 @@ On OS X, simply add /opt/libjpeg-turbo/{lib}/libjpeg.a to the linker command
 line (this also works on Linux and Solaris.)
 
 To build Visual C++ applications using libjpeg-turbo, add
-c:\libjpeg-turbo\include to your system or user INCLUDE environment variable
-and c:\libjpeg-turbo\lib to your system or user LIB environment variable, and
-then link against either jpeg.lib (to use jpeg62.dll) or jpeg-static.lib (to
-use the static version of libjpeg-turbo.)
+c:\libjpeg-turbo[64]\include to your system or user INCLUDE environment
+variable and c:\libjpeg-turbo[64]\lib to your system or user LIB environment
+variable, and then link against either jpeg.lib (to use jpeg62.dll) or
+jpeg-static.lib (to use the static version of libjpeg-turbo.)
 
 =====================
 Colorspace Extensions

diff --git a/release/libjpeg-turbo.nsi b/release/libjpeg-turbo.nsi
index 28c6d5633aa22da955703a5fb620477726175aae..dab6e268898962c9a650bd209335dce1f2668103 100644 (file)
--- a/release/libjpeg-turbo.nsi
+++ b/release/libjpeg-turbo.nsi
@@ -1,3 +1,4 @@
+!include x64.nsh
 Name "libjpeg-turbo SDK for ${PLATFORM}"
 OutFile ${WBLDDIR}\${APPNAME}.exe
 InstallDir c:\${APPNAME}
@@ -11,6 +12,9 @@ UninstPage uninstConfirm
 UninstPage instfiles
 
 Section "libjpeg-turbo SDK for ${PLATFORM} (required)"
+       ${If} ${RunningX64}
+       ${DisableX64FSRedirection}
+       ${Endif}
        SectionIn RO
 !ifdef GCC
        IfFileExists $SYSDIR/libturbojpeg.dll exists 0
@@ -74,6 +78,9 @@ Section "libjpeg-turbo SDK for ${PLATFORM} (required)"
 SectionEnd
 
 Section "Uninstall"
+       ${If} ${RunningX64}
+       ${DisableX64FSRedirection}
+       ${Endif}
 
        SetShellVarContext all
 

diff --git a/win/Makefile b/win/Makefile
index 382857c95bd1d034ae80978d479a26e873837a3b..6bf95d42f1c03ffb630796667d9a651bfc35cc8f 100755 (executable)
--- a/win/Makefile
+++ b/win/Makefile
@@ -229,11 +229,19 @@ $(ODIR)/jpegut.exe: $(ODIR)/jpegut.obj $(ODIR)/turbojpeg.lib
        $(LINK) $(LDFLAGS) -out:$@ $^
 
 
+ifeq ($(WIN64), yes)
+dist: 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
+else
 dist: all
        $(RM) $(ODIR)/libjpeg-turbo.exe
        makensis -nocd -DVERSION=$(VERSION) -DAPPNAME=libjpeg-turbo \
                -DWLIBDIR=windows -DWSRCDIR=. -DWBLDDIR=windows -DWHDRDIR=win \
                -DPLATFORM="Visual C++" release/libjpeg-turbo.nsi
+endif
 
 
 test: testclean $(ODIR)/cjpeg.exe $(ODIR)/djpeg.exe $(ODIR)/jpegtran.exe \