Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cygwin-python'

Browse Source 
Fix Python problem in Cygwin build on AppVeyor correctly.
This commit is contained in:
Vadim Zeitlin
2017-11-03 19:45:44 +01:00
parent d57d9ffaf7 2e9e38aba1
commit 6d3530a653
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@@ -1,7 +1,5 @@
version: '{build}' version: '{build}'
os: Previous Visual Studio 2015
branches: branches:
only: only:
- master - master

5
build/tools/appveyor.bat
View File

@@ -36,14 +36,11 @@ bash -lc "CXXFLAGS=-Wno-deprecated-declarations ./configure --disable-optimise &
goto :eof goto :eof
:cygwin :cygwin
C:\cygwin\setup-x86.exe -qnNdO -R C:/cygwin -s http://cygwin.mirror.constant.com -l C:/cygwin/var/cache/setup -P libjpeg-devel -P libpng-devel -P libtiff-devel -P libexpat-devel C:\cygwin\setup-x86.exe -qgnNdO -R C:/cygwin -s http://cygwin.mirror.constant.com -l C:/cygwin/var/cache/setup -P libjpeg-devel -P libpng-devel -P libtiff-devel -P libexpat-devel
path c:\cygwin\bin;%path% path c:\cygwin\bin;%path%
set CHERE_INVOKING=yes set CHERE_INVOKING=yes
:: Workaround for "configure: Bad file descriptor" :: Workaround for "configure: Bad file descriptor"
perl -i".bak" -pe "s/^test -n \".DJDIR\"/#$&/" configure perl -i".bak" -pe "s/^test -n \".DJDIR\"/#$&/" configure
:: Workaround for currently broken Python under Cygwin: don't use it for
:: running gen_iface.py.
touch include/wx/stc/stc.h
bash -lc "g++ --version" bash -lc "g++ --version"
bash -lc "LDFLAGS=-L/usr/lib/w32api ./configure --disable-optimise --disable-shared && make -j3" bash -lc "LDFLAGS=-L/usr/lib/w32api ./configure --disable-optimise --disable-shared && make -j3"
goto :eof goto :eof