mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-12-24 17:06:16 +03:00
fix distutils not finding vcredist, use /MD
This commit is contained in:
nulano
parent
ae8fd7446f
commit
7fb70695bd
34
.github/workflows/test-windows.yml
vendored
34
.github/workflows/test-windows.yml
vendored
|
|
@ -80,10 +80,11 @@ jobs:
|
|||
EXECUTABLE: bin\python.exe
|
||||
shell: pwsh
|
||||
|
||||
# libjpeg-turbo build is slow, pypy test is slow -> don't do both at once
|
||||
- name: Build dependencies / libjpeg
|
||||
if: "contains(matrix.python-version, 'pypy')"
|
||||
if: false
|
||||
run: |
|
||||
REM FIXME uses /MT not /MD, see makefile.vc and win32.mak for more info
|
||||
|
||||
set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\V7.1A\Include
|
||||
set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32
|
||||
set BUILD=%GITHUB_WORKSPACE%\winbuild\build
|
||||
|
|
@ -92,12 +93,12 @@ jobs:
|
|||
echo on
|
||||
nmake -nologo -f makefile.vc setup-vc6
|
||||
nmake -nologo -f makefile.vc clean
|
||||
nmake -nologo -f makefile.vc nodebug=1 libjpeg.lib
|
||||
nmake -nologo -f makefile.vc nodebug=1 libjpeg.lib cjpeg.exe djpeg.exe
|
||||
copy /Y /B j*.h %INCLIB%
|
||||
copy /Y /B *.lib %INCLIB%
|
||||
copy /Y /B *.exe %INCLIB%
|
||||
|
||||
- name: Build dependencies / libjpeg-turbo
|
||||
if: "!contains(matrix.python-version, 'pypy')"
|
||||
run: |
|
||||
set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\V7.1A\Include
|
||||
set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32
|
||||
|
|
@ -106,12 +107,14 @@ jobs:
|
|||
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ${{ matrix.platform-vcvars }} 8.1
|
||||
echo on
|
||||
set CMAKE=cmake.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_RULE_MESSAGES:BOOL=OFF
|
||||
set CMAKE=%CMAKE% -DENABLE_SHARED:BOOL=OFF -DWITH_JPEG8:BOOL=TRUE -DCMAKE_BUILD_TYPE=Release
|
||||
set CMAKE=%CMAKE% -DENABLE_SHARED:BOOL=OFF -DWITH_JPEG8:BOOL=TRUE -DWITH_CRT_DLL:BOOL=TRUE -DCMAKE_BUILD_TYPE=Release
|
||||
%CMAKE% -G "NMake Makefiles" .
|
||||
nmake -nologo -f Makefile clean
|
||||
nmake -nologo -f Makefile
|
||||
nmake -nologo -f Makefile jpeg-static cjpeg-static djpeg-static
|
||||
copy /Y /B j*.h %INCLIB%
|
||||
copy /Y /B jpeg-static.lib %INCLIB%\libjpeg.lib
|
||||
copy /Y /B cjpeg-static.exe %INCLIB%\cjpeg.exe
|
||||
copy /Y /B djpeg-static.exe %INCLIB%\djpeg.exe
|
||||
|
||||
- name: Build dependencies / zlib
|
||||
run: |
|
||||
|
|
@ -122,7 +125,7 @@ jobs:
|
|||
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ${{ matrix.platform-vcvars }} 8.1
|
||||
echo on
|
||||
nmake -nologo -f win32\Makefile.msc clean
|
||||
nmake -nologo -f win32\Makefile.msc LOC=-MT zlib.lib
|
||||
nmake -nologo -f win32\Makefile.msc zlib.lib
|
||||
copy /Y /B z*.h %INCLIB%
|
||||
copy /Y /B *.lib %INCLIB%
|
||||
copy /Y /B zlib.lib %INCLIB%\z.lib
|
||||
|
|
@ -135,7 +138,7 @@ jobs:
|
|||
cd /D %BUILD%\tiff-4.0.10
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ${{ matrix.platform-vcvars }} 8.1
|
||||
echo on
|
||||
copy %GITHUB_WORKSPACE%\winbuild\tiff-mt.opt nmake.opt
|
||||
copy %GITHUB_WORKSPACE%\winbuild\tiff.opt nmake.opt
|
||||
nmake -nologo -f makefile.vc clean
|
||||
nmake -nologo -f makefile.vc lib
|
||||
copy /Y /B libtiff\tiff*.h %INCLIB%
|
||||
|
|
@ -151,7 +154,7 @@ jobs:
|
|||
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ${{ matrix.platform-vcvars }} 8.1
|
||||
echo on
|
||||
rmdir /S /Q output\release-static
|
||||
nmake -nologo -f Makefile.vc CFG=release-static RTLIBCFG=static OBJDIR=output ARCH=${{ matrix.architecture }} all
|
||||
nmake -nologo -f Makefile.vc CFG=release-static OBJDIR=output ARCH=${{ matrix.architecture }} all
|
||||
mkdir %INCLIB%\webp
|
||||
copy /Y /B src\webp\*.h %INCLIB%\webp
|
||||
copy /Y /B output\release-static\${{ matrix.architecture }}\lib\* %INCLIB%
|
||||
|
|
@ -170,6 +173,7 @@ jobs:
|
|||
set DefaultPlatformToolset=v140
|
||||
set VCTargetsPath=C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\VC\VCTargets
|
||||
set MSBUILD="C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe"
|
||||
powershell -Command "(gc builds\windows\vc2010\freetype.vcxproj) -replace 'MultiThreaded<', 'MultiThreadedDLL<' | Out-File -encoding ASCII builds\windows\vc2010\freetype.vcxproj"
|
||||
%MSBUILD% builds\windows\vc2010\freetype.sln /t:Build /p:Configuration="Release Static" /p:Platform=${{ matrix.platform-msbuild }} /m
|
||||
xcopy /Y /E /Q include %INCLIB%
|
||||
copy /Y /B "objs\${{ matrix.platform-msbuild }}\Release Static\freetype.lib" %INCLIB%
|
||||
|
|
@ -186,7 +190,7 @@ jobs:
|
|||
rmdir /S /Q Projects\VC2015\Release
|
||||
set VCTargetsPath=C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\VC\VCTargets
|
||||
set MSBUILD="C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe"
|
||||
powershell -Command "(gc Projects\VC2015\lcms2_static\lcms2_static.vcxproj) -replace 'MultiThreadedDLL', 'MultiThreaded' | Out-File -encoding ASCII Projects\VC2015\lcms2_static\lcms2_static.vcxproj"
|
||||
powershell -Command "(gc Projects\VC2015\lcms2_static\lcms2_static.vcxproj) -replace 'MultiThreaded<', 'MultiThreadedDLL<' | Out-File -encoding ASCII Projects\VC2015\lcms2_static\lcms2_static.vcxproj"
|
||||
%MSBUILD% Projects\VC2015\lcms2.sln /t:Clean;lcms2_static /p:Configuration="Release" /p:Platform=${{ matrix.platform-msbuild }} /m
|
||||
xcopy /Y /E /Q include %INCLIB%
|
||||
copy /Y /B Lib\MS\*.lib %INCLIB%
|
||||
|
|
@ -201,7 +205,7 @@ jobs:
|
|||
echo on
|
||||
set CMAKE=cmake.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_RULE_MESSAGES:BOOL=OFF
|
||||
set CMAKE=%CMAKE% -DBUILD_THIRDPARTY:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF
|
||||
set CMAKE=%CMAKE% -DOPENJP2_COMPILE_OPTIONS=-MT -DCMAKE_BUILD_TYPE=Release
|
||||
set CMAKE=%CMAKE% -DCMAKE_BUILD_TYPE=Release
|
||||
%CMAKE% -G "NMake Makefiles" .
|
||||
nmake -nologo -f Makefile clean
|
||||
nmake -nologo -f Makefile
|
||||
|
|
@ -220,7 +224,7 @@ jobs:
|
|||
cd /D %BUILD%\libimagequant-ba653c8ccb34dde4e21c6076d85a72d21ed9d971
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ${{ matrix.platform-vcvars }} 8.1
|
||||
echo on
|
||||
echo (gc CMakeLists.txt) -replace 'add_library', "add_compile_options(-MT -openmp-)`r`nadd_library" ^| Out-File -encoding ASCII CMakeLists.txt > patch.ps1
|
||||
echo (gc CMakeLists.txt) -replace 'add_library', "add_compile_options(-openmp-)`r`nadd_library" ^| Out-File -encoding ASCII CMakeLists.txt > patch.ps1
|
||||
echo (gc CMakeLists.txt) -replace ' SHARED', ' STATIC' ^| Out-File -encoding ASCII CMakeLists.txt >> patch.ps1
|
||||
powershell .\patch.ps1
|
||||
set CMAKE=cmake.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_RULE_MESSAGES:BOOL=OFF
|
||||
|
|
@ -231,6 +235,7 @@ jobs:
|
|||
copy /Y /B *.h %INCLIB%
|
||||
copy /Y /B *.lib %INCLIB%
|
||||
|
||||
# for Raqm
|
||||
- name: Build dependencies / HarfBuzz
|
||||
if: "!contains(matrix.python-version, 'pypy')"
|
||||
run: |
|
||||
|
|
@ -242,8 +247,6 @@ jobs:
|
|||
cd /D %BUILD%\harfbuzz-2.6.1
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ${{ matrix.platform-vcvars }} 8.1
|
||||
echo on
|
||||
echo (gc CMakeLists.txt) -replace 'enable_testing', "add_compile_options(-MT)`r`nenable_testing" ^| Out-File -encoding ASCII CMakeLists.txt > patch.ps1
|
||||
powershell .\patch.ps1
|
||||
set CMAKE=cmake.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_RULE_MESSAGES:BOOL=OFF
|
||||
set CMAKE=%CMAKE% -DHB_HAVE_FREETYPE:BOOL=ON -DCMAKE_BUILD_TYPE=Release
|
||||
%CMAKE% -G "NMake Makefiles" .
|
||||
|
|
@ -252,6 +255,7 @@ jobs:
|
|||
copy /Y /B src\*.h %INCLIB%
|
||||
copy /Y /B *.lib %INCLIB%
|
||||
|
||||
# for Raqm
|
||||
- name: Build dependencies / FriBidi
|
||||
if: "!contains(matrix.python-version, 'pypy')"
|
||||
run: |
|
||||
|
|
@ -313,7 +317,6 @@ jobs:
|
|||
set MPLSRC=%GITHUB_WORKSPACE%
|
||||
set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32
|
||||
cd /D %GITHUB_WORKSPACE%
|
||||
set DISTUTILS_USE_SDK=1
|
||||
set LIB=%INCLIB%;%PYTHON%\tcl
|
||||
set INCLUDE=%INCLIB%;%GITHUB_WORKSPACE%\depends\tcl86\include;%INCLUDE%
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ${{ matrix.platform-vcvars }} 8.1
|
||||
|
|
@ -345,7 +348,6 @@ jobs:
|
|||
set MPLSRC=%GITHUB_WORKSPACE%
|
||||
set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32
|
||||
cd /D %GITHUB_WORKSPACE%
|
||||
set DISTUTILS_USE_SDK=1
|
||||
set LIB=%INCLIB%;%PYTHON%\tcl
|
||||
set INCLUDE=%INCLIB%;%GITHUB_WORKSPACE%\depends\tcl86\include;%INCLUDE%
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ${{ matrix.platform-vcvars }} 8.1
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ setlocal
|
|||
+ vc_setup(compiler, bit)
|
||||
+ r"""
|
||||
rem do after building jpeg and zlib
|
||||
copy %%~dp0\tiff-md.opt %%TIFF%%\nmake.opt
|
||||
copy %%~dp0\tiff.opt %%TIFF%%\nmake.opt
|
||||
|
||||
cd /D %%TIFF%%
|
||||
nmake -nologo -f makefile.vc clean
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.13)
|
|||
project(fribidi)
|
||||
|
||||
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
||||
add_compile_options(-MT)
|
||||
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
include_directories(lib)
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ find_library(harfbuzz NAMES harfbuzz)
|
|||
find_library(freetype NAMES freetype)
|
||||
|
||||
add_definitions(-DFRIBIDI_ENTRY=extern)
|
||||
add_compile_options(-MT)
|
||||
|
||||
|
||||
function(raqm_conf)
|
||||
|
|
|
|||
|
|
@ -1,216 +0,0 @@
|
|||
# $Id: nmake.opt,v 1.18 2006/06/07 16:33:45 dron Exp $
|
||||
#
|
||||
# Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
|
||||
#
|
||||
# Permission to use, copy, modify, distribute, and sell this software and
|
||||
# its documentation for any purpose is hereby granted without fee, provided
|
||||
# that (i) the above copyright notices and this permission notice appear in
|
||||
# all copies of the software and related documentation, and (ii) the names of
|
||||
# Sam Leffler and Silicon Graphics may not be used in any advertising or
|
||||
# publicity relating to the software without the specific, prior written
|
||||
# permission of Sam Leffler and Silicon Graphics.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
|
||||
# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
|
||||
# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
|
||||
#
|
||||
# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
|
||||
# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
|
||||
# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
|
||||
# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
|
||||
# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
|
||||
# OF THIS SOFTWARE.
|
||||
|
||||
# Compile time parameters for MS Visual C++ compiler.
|
||||
# You may edit this file to specify building options.
|
||||
|
||||
#
|
||||
###### Edit the following lines to choose a feature set you need. #######
|
||||
#
|
||||
|
||||
#
|
||||
# Select WINMODE_CONSOLE to build a library which reports errors to stderr, or
|
||||
# WINMODE_WINDOWED to build such that errors are reported via MessageBox().
|
||||
#
|
||||
WINMODE_CONSOLE = 1
|
||||
#WINMODE_WINDOWED = 1
|
||||
|
||||
#
|
||||
# Comment out the following lines to disable internal codecs.
|
||||
#
|
||||
# Support for CCITT Group 3 & 4 algorithms
|
||||
CCITT_SUPPORT = 1
|
||||
# Support for Macintosh PackBits algorithm
|
||||
PACKBITS_SUPPORT = 1
|
||||
# Support for LZW algorithm
|
||||
LZW_SUPPORT = 1
|
||||
# Support for ThunderScan 4-bit RLE algorithm
|
||||
THUNDER_SUPPORT = 1
|
||||
# Support for NeXT 2-bit RLE algorithm
|
||||
NEXT_SUPPORT = 1
|
||||
# Support for LogLuv high dynamic range encoding
|
||||
LOGLUV_SUPPORT = 1
|
||||
|
||||
#
|
||||
# Uncomment and edit following lines to enable JPEG support.
|
||||
#
|
||||
JPEG_SUPPORT = 1
|
||||
JPEG_INCLUDE = -I$(INCLIB)
|
||||
JPEG_LIB = $(INCLIB)/libjpeg.lib
|
||||
|
||||
#
|
||||
# Uncomment and edit following lines to enable ZIP support
|
||||
# (required for Deflate compression and Pixar log-format)
|
||||
#
|
||||
ZIP_SUPPORT = 1
|
||||
ZLIB_INCLUDE = -I$(INCLIB)
|
||||
ZLIB_LIB = $(INCLIB)/zlib.lib
|
||||
|
||||
#
|
||||
# Uncomment and edit following lines to enable ISO JBIG support
|
||||
#
|
||||
#JBIG_SUPPORT = 1
|
||||
#JBIGDIR = d:/projects/jbigkit
|
||||
#JBIG_INCLUDE = -I$(JBIGDIR)/libjbig
|
||||
#JBIG_LIB = $(JBIGDIR)/libjbig/jbig.lib
|
||||
|
||||
#
|
||||
# Uncomment following line to enable Pixar log-format algorithm
|
||||
# (Zlib required).
|
||||
#
|
||||
#PIXARLOG_SUPPORT = 1
|
||||
|
||||
#
|
||||
# Comment out the following lines to disable strip chopping
|
||||
# (whether or not to convert single-strip uncompressed images to multiple
|
||||
# strips of specified size to reduce memory usage). Default strip size
|
||||
# is 8192 bytes, it can be configured via the STRIP_SIZE_DEFAULT parameter
|
||||
#
|
||||
STRIPCHOP_SUPPORT = 1
|
||||
STRIP_SIZE_DEFAULT = 8192
|
||||
|
||||
#
|
||||
# Comment out the following lines to disable treating the fourth sample with
|
||||
# no EXTRASAMPLE_ value as being ASSOCALPHA. Many packages produce RGBA
|
||||
# files but don't mark the alpha properly.
|
||||
#
|
||||
EXTRASAMPLE_AS_ALPHA_SUPPORT = 1
|
||||
|
||||
#
|
||||
# Comment out the following lines to disable picking up YCbCr subsampling
|
||||
# info from the JPEG data stream to support files lacking the tag.
|
||||
# See Bug 168 in Bugzilla, and JPEGFixupTestSubsampling() for details.
|
||||
#
|
||||
CHECK_JPEG_YCBCR_SUBSAMPLING = 1
|
||||
|
||||
#
|
||||
####################### Compiler related options. #######################
|
||||
#
|
||||
|
||||
#
|
||||
# Pick debug or optimized build flags. We default to an optimized build
|
||||
# with no debugging information.
|
||||
# NOTE: /EHsc option required if you want to build the C++ stream API
|
||||
#
|
||||
OPTFLAGS = /Ox /MT /EHsc /W3 /D_CRT_SECURE_NO_DEPRECATE
|
||||
#OPTFLAGS = /Zi
|
||||
|
||||
#
|
||||
# Uncomment following line to enable using Windows Common RunTime Library
|
||||
# instead of Windows specific system calls. See notes on top of tif_unix.c
|
||||
# module for details.
|
||||
#
|
||||
USE_WIN_CRT_LIB = 1
|
||||
|
||||
# Compiler specific options. You may probably want to adjust compilation
|
||||
# parameters in CFLAGS variable. Refer to your compiler documentation
|
||||
# for the option reference.
|
||||
#
|
||||
MAKE = nmake /nologo
|
||||
CC = cl /nologo
|
||||
CXX = cl /nologo
|
||||
AR = lib /nologo
|
||||
LD = link /nologo
|
||||
|
||||
CFLAGS = $(OPTFLAGS) $(INCL) $(EXTRAFLAGS)
|
||||
CXXFLAGS = $(OPTFLAGS) $(INCL) $(EXTRAFLAGS)
|
||||
EXTRAFLAGS =
|
||||
LIBS =
|
||||
|
||||
# Name of the output shared library
|
||||
DLLNAME = libtiff.dll
|
||||
|
||||
#
|
||||
########### There is nothing to edit below this line normally. ###########
|
||||
#
|
||||
|
||||
# Set the native cpu bit order
|
||||
EXTRAFLAGS = -DFILLODER_LSB2MSB $(EXTRAFLAGS)
|
||||
|
||||
!IFDEF WINMODE_WINDOWED
|
||||
EXTRAFLAGS = -DTIF_PLATFORM_WINDOWED $(EXTRAFLAGS)
|
||||
LIBS = user32.lib $(LIBS)
|
||||
!ELSE
|
||||
EXTRAFLAGS = -DTIF_PLATFORM_CONSOLE $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
# Codec stuff
|
||||
!IFDEF CCITT_SUPPORT
|
||||
EXTRAFLAGS = -DCCITT_SUPPORT $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF PACKBITS_SUPPORT
|
||||
EXTRAFLAGS = -DPACKBITS_SUPPORT $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF LZW_SUPPORT
|
||||
EXTRAFLAGS = -DLZW_SUPPORT $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF THUNDER_SUPPORT
|
||||
EXTRAFLAGS = -DTHUNDER_SUPPORT $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF NEXT_SUPPORT
|
||||
EXTRAFLAGS = -DNEXT_SUPPORT $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF LOGLUV_SUPPORT
|
||||
EXTRAFLAGS = -DLOGLUV_SUPPORT $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF JPEG_SUPPORT
|
||||
LIBS = $(LIBS) $(JPEG_LIB)
|
||||
EXTRAFLAGS = -DJPEG_SUPPORT -DOJPEG_SUPPORT $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF ZIP_SUPPORT
|
||||
LIBS = $(LIBS) $(ZLIB_LIB)
|
||||
EXTRAFLAGS = -DZIP_SUPPORT $(EXTRAFLAGS)
|
||||
!IFDEF PIXARLOG_SUPPORT
|
||||
EXTRAFLAGS = -DPIXARLOG_SUPPORT $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
!IFDEF JBIG_SUPPORT
|
||||
LIBS = $(LIBS) $(JBIG_LIB)
|
||||
EXTRAFLAGS = -DJBIG_SUPPORT $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF STRIPCHOP_SUPPORT
|
||||
EXTRAFLAGS = -DSTRIPCHOP_DEFAULT=TIFF_STRIPCHOP -DSTRIP_SIZE_DEFAULT=$(STRIP_SIZE_DEFAULT) $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF EXTRASAMPLE_AS_ALPHA_SUPPORT
|
||||
EXTRAFLAGS = -DDEFAULT_EXTRASAMPLE_AS_ALPHA $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF CHECK_JPEG_YCBCR_SUBSAMPLING
|
||||
EXTRAFLAGS = -DCHECK_JPEG_YCBCR_SUBSAMPLING $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF USE_WIN_CRT_LIB
|
||||
EXTRAFLAGS = -DAVOID_WIN32_FILEIO $(EXTRAFLAGS)
|
||||
!ELSE
|
||||
EXTRAFLAGS = -DUSE_WIN32_FILEIO $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
Loading…
Reference in New Issue
Block a user