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 01c9641..dd67749 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,15 +158,20 @@
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 801af94..0006ae5 100755
--- a/README-turbo.txt
+++ b/README-turbo.txt
@@ -138,15 +138,15 @@
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 @@
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 28c6d56..dab6e26 100644
--- 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 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 @@
SectionEnd
Section "Uninstall"
+ ${If} ${RunningX64}
+ ${DisableX64FSRedirection}
+ ${Endif}
SetShellVarContext all
diff --git a/win/Makefile b/win/Makefile
index 382857c..6bf95d4 100755
--- a/win/Makefile
+++ b/win/Makefile
@@ -229,11 +229,19 @@
$(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 \