Skip to content

Commit 34af88a

Browse files
committed
win: fix for local freetype on py27
1 parent d3e04dd commit 34af88a

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

setupext.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1044,10 +1044,15 @@ def do_custom_build(self):
10441044
set MSBUILD=C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\MSBuild.exe
10451045
rd /S /Q %FREETYPE%\\objs
10461046
%MSBUILD% %FREETYPE%\\builds\\windows\\{vc20xx}\\freetype.sln /t:Clean;Build /p:Configuration="{config}";Platform={WinXX}
1047+
echo Build completed, moving result"
10471048
:: move to the "normal" path for the unix builds...
10481049
mkdir %FREETYPE%\\objs\\.libs
10491050
:: REMINDER: fix when changing the version
1050-
copy %FREETYPE%\\objs\\{vc20xx}\\{xXX}\\freetype261.lib %FREETYPE%\\objs\\.libs\\libfreetype.lib
1051+
copy %FREETYPE%\\objs\\{vc20xx}\\{xXX}\\freetype261.lib %FREETYPE%\\objs\\.libs\\libfreetype.lib
1052+
if errorlevel 1 (
1053+
rem This is a py27 version, which has a different location for the lib file :-/
1054+
copy %FREETYPE%\\objs\\{WinXX}\\{vc20xx}\\freetype261.lib %FREETYPE%\\objs\\.libs\\libfreetype.lib
1055+
)
10511056
"""
10521057
from setup_external_compile import fixproj, prepare_build_cmd, VS2010, X64, tar_extract
10531058
vc = 'vc2010' if VS2010 else 'vc2008'

0 commit comments

Comments
 (0)