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

Create separate packages for Win64 binaries

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

9
Makefile.am
View File

@@ -158,15 +158,20 @@ sunpkg: all
sh $(srcdir)/release/makesunpkg ${PACKAGE_NAME} ${VERSION} ${BUILD} \ sh $(srcdir)/release/makesunpkg ${PACKAGE_NAME} ${VERSION} ${BUILD} \
${DEBARCH} ${srcdir} $(CC) $(CXX) combined ${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 else
sunpkg: all sunpkg: all
sh $(srcdir)/release/makesunpkg ${PACKAGE_NAME} ${VERSION} ${BUILD} \ sh $(srcdir)/release/makesunpkg ${PACKAGE_NAME} ${VERSION} ${BUILD} \
${DEBARCH} ${srcdir} $(CC) $(CXX) ${DEBARCH} ${srcdir} $(CC) $(CXX)
endif
nsi: all nsi: all
makensis -nocd -DVERSION=$(VERSION) -DAPPNAME=libjpeg-turbo-gcc \ makensis -nocd -DVERSION=$(VERSION) -DAPPNAME=libjpeg-turbo-gcc \
-DWLIBDIR=.libs -DWSRCDIR=$(srcdir) -DWBLDDIR=. -DWHDRDIR=. \ -DWLIBDIR=.libs -DWSRCDIR=$(srcdir) -DWBLDDIR=. -DWHDRDIR=. \
-DPLATFORM="GCC" -DGCC $(srcdir)/release/libjpeg-turbo.nsi -DPLATFORM="GCC" -DGCC $(srcdir)/release/libjpeg-turbo.nsi
endif

16
README-turbo.txt
View File

@@ -138,15 +138,15 @@ of libjpeg by setting
If using Cygwin, then set If using Cygwin, then set
CPATH=/cygdrive/c/libjpeg-turbo-gcc/include CPATH=/cygdrive/c/libjpeg-turbo-gcc[64]/include
and and
LIBRARY_PATH=/cygdrive/c/libjpeg-turbo-gcc/lib LIBRARY_PATH=/cygdrive/c/libjpeg-turbo-gcc[64]/lib
If using MinGW, then set If using MinGW, then set
CPATH=/c/libjpeg-turbo-gcc/include CPATH=/c/libjpeg-turbo-gcc[64]/include
and 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 Building against libjpeg-turbo is useful, for instance, if you want to build an
application that leverages the libjpeg-turbo colorspace extensions (see below.) 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.) line (this also works on Linux and Solaris.)
To build Visual C++ applications using libjpeg-turbo, add To build Visual C++ applications using libjpeg-turbo, add
c:\libjpeg-turbo\include to your system or user INCLUDE environment variable c:\libjpeg-turbo[64]\include to your system or user INCLUDE environment
and c:\libjpeg-turbo\lib to your system or user LIB environment variable, and variable and c:\libjpeg-turbo[64]\lib to your system or user LIB environment
then link against either jpeg.lib (to use jpeg62.dll) or jpeg-static.lib (to variable, and then link against either jpeg.lib (to use jpeg62.dll) or
use the static version of libjpeg-turbo.) jpeg-static.lib (to use the static version of libjpeg-turbo.)
===================== =====================
Colorspace Extensions Colorspace Extensions

7
release/libjpeg-turbo.nsi
View File

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

8
win/Makefile
View File

@@ -229,11 +229,19 @@ $(ODIR)/jpegut.exe: $(ODIR)/jpegut.obj $(ODIR)/turbojpeg.lib
$(LINK) $(LDFLAGS) -out:$@ $^ $(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 dist: all
$(RM) $(ODIR)/libjpeg-turbo.exe $(RM) $(ODIR)/libjpeg-turbo.exe
makensis -nocd -DVERSION=$(VERSION) -DAPPNAME=libjpeg-turbo \ makensis -nocd -DVERSION=$(VERSION) -DAPPNAME=libjpeg-turbo \
-DWLIBDIR=windows -DWSRCDIR=. -DWBLDDIR=windows -DWHDRDIR=win \ -DWLIBDIR=windows -DWSRCDIR=. -DWBLDDIR=windows -DWHDRDIR=win \
-DPLATFORM="Visual C++" release/libjpeg-turbo.nsi -DPLATFORM="Visual C++" release/libjpeg-turbo.nsi
endif
test: testclean $(ODIR)/cjpeg.exe $(ODIR)/djpeg.exe $(ODIR)/jpegtran.exe \ test: testclean $(ODIR)/cjpeg.exe $(ODIR)/djpeg.exe $(ODIR)/jpegtran.exe \