Merge branch 'winbuild' of https://github.com/wiredfool/Pillow into winbuild

This commit is contained in:
wiredfool 2014-03-19 05:08:25 +00:00
commit 095c3d6260

View File

@ -26,6 +26,12 @@ py -3 unzip.py zlib128.zip %BUILD%
set ZLIB=%BUILD%\zlib-1.2.8
copy /Y /B zlib128.zip %INCLIB%
rem Get libjpeg
py -3 fetch.py http://www.ijg.org/files/jpegsr9a.zip
py -3 unzip.py jpegsr9a.zip %BUILD%
set LIBJPEG=%BUILD%\jpeg-9a
copy /Y /B jpegsr9a.zip %INCLIB%
rem Get tcl/tk
py -3 fetch.py http://hivelocity.dl.sourceforge.net/project/tcl/Tcl/8.5.13/tcl8513-src.zip
py -3 unzip.py tcl8513-src.zip %BUILD%
@ -45,6 +51,17 @@ call "%ProgramFiles%\Microsoft SDKs\Windows\v7.0\Bin\SetEnv.Cmd" /Release /x64 /
set INCLIB=%INCLIB%\msvcr90-x64
mkdir %INCLIB%
rem Build libjpeg
setlocal
cd /D %LIBJPEG%
nmake -f makefile.vc setup-vc6
nmake -f makefile.vc clean
nmake -f makefile.vc all
copy /Y /B *.dll %INCLIB%
copy /Y /B *.lib %INCLIB%
copy /Y /B libjpeg.h %INCLIB%
endlocal
rem Build zlib
setlocal
cd /D %ZLIB%