python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-26 18:06:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Changed Visual Studio 2008 to 2010

Browse Source
This commit is contained in:
Andrew Murray 2019-04-06 12:41:59 +11:00
parent d61ab018fe
commit 9e03c9d232
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winbuild/build_dep.py
View File

@ -238,9 +238,9 @@ setlocal
rd /S /Q %%LCMS%%\Lib rd /S /Q %%LCMS%%\Lib
rd /S /Q %%LCMS%%\Projects\VC%(vc_version)s\Release rd /S /Q %%LCMS%%\Projects\VC%(vc_version)s\Release
%%MSBUILD%% %%LCMS%%\Projects\VC%(vc_version)s\lcms2.sln /t:Clean /p:Configuration="Release" /p:Platform=Win32 /m %%MSBUILD%% %%LCMS%%\Projects\VC%(vc_version)s\lcms2.sln /t:Clean /p:Configuration="Release" /p:Platform=Win32 /m
%%MSBUILD%% %%LCMS%%\Projects\VC%(vc_version)s\lcms2.sln /t:lcms2_static /p:Configuration="Release" /p:Platform=Win32 /m %%MSBUILD%% %%LCMS%%\Projects\VC%(vc_version)s\lcms2.sln /t:lcms2_static /p:Configuration="Release" /p:Platform=Win32 /p:PlatformToolset=v90 /m
xcopy /Y /E /Q %%LCMS%%\include %%INCLIB%% xcopy /Y /E /Q %%LCMS%%\include %%INCLIB%%
copy /Y /B %%LCMS%%\Projects\VC%(vc_version)s\Release\*.lib %%INCLIB%% copy /Y /B %%LCMS%%\Lib\MS\*.lib %%INCLIB%%
endlocal endlocal
""" % compiler # noqa: E501 """ % compiler # noqa: E501
@ -265,7 +265,7 @@ rem Build gs
setlocal setlocal
""" + vc_setup(compiler, bit) + r""" """ + vc_setup(compiler, bit) + r"""
set MSVC_VERSION=""" + { set MSVC_VERSION=""" + {
"2008": "9", "2010": "90",
"2015": "14" "2015": "14"
}[compiler['vc_version']] + r""" }[compiler['vc_version']] + r"""
set RCOMP="C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin\RC.Exe" set RCOMP="C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin\RC.Exe"
@ -308,7 +308,7 @@ if 'PYTHON' in os.environ:
else: else:
# for compiler in all_compilers(): # for compiler in all_compilers():
# add_compiler(compiler) # add_compiler(compiler)
add_compiler(compilers[7.0][2008][32], 32) add_compiler(compilers[7.0][2010][32], 32)
with open('build_deps.cmd', 'w') as f: with open('build_deps.cmd', 'w') as f:
f.write("\n".join(script)) f.write("\n".join(script))

10
winbuild/config.py
View File

@ -3,8 +3,8 @@ import os
SF_MIRROR = 'http://iweb.dl.sourceforge.net' SF_MIRROR = 'http://iweb.dl.sourceforge.net'
PILLOW_DEPENDS_DIR = 'C:\\pillow-depends\\' PILLOW_DEPENDS_DIR = 'C:\\pillow-depends\\'
pythons = {'27': {'compiler': 7, 'vc': 2008}, pythons = {'27': {'compiler': 7, 'vc': 2010},
'pypy2': {'compiler': 7, 'vc': 2008}, 'pypy2': {'compiler': 7, 'vc': 2010},
'35': {'compiler': 7.1, 'vc': 2015}, '35': {'compiler': 7.1, 'vc': 2015},
'36': {'compiler': 7.1, 'vc': 2015}, '36': {'compiler': 7.1, 'vc': 2015},
'37': {'compiler': 7.1, 'vc': 2015}} '37': {'compiler': 7.1, 'vc': 2015}}
@ -83,10 +83,10 @@ libs = {
compilers = { compilers = {
7: { 7: {
2008: { 2010: {
64: { 64: {
'env_version': 'v7.0', 'env_version': 'v7.0',
'vc_version': '2008', 'vc_version': '2010',
'env_flags': '/x64 /xp', 'env_flags': '/x64 /xp',
'inc_dir': 'msvcr90-x64', 'inc_dir': 'msvcr90-x64',
'platform': 'x64', 'platform': 'x64',
@ -94,7 +94,7 @@ compilers = {
}, },
32: { 32: {
'env_version': 'v7.0', 'env_version': 'v7.0',
'vc_version': '2008', 'vc_version': '2010',
'env_flags': '/x86 /xp', 'env_flags': '/x86 /xp',
'inc_dir': 'msvcr90-x32', 'inc_dir': 'msvcr90-x32',
'platform': 'Win32', 'platform': 'Win32',