diff --git a/travis-ci/build_wxwidgets.sh b/travis-ci/build_wxwidgets.sh index 8a76ee6..f522a75 100644 --- a/travis-ci/build_wxwidgets.sh +++ b/travis-ci/build_wxwidgets.sh @@ -11,19 +11,19 @@ echo "Fetch wxWidgets.." cd $HOME/build mkdir -p $HOME/build/wxWidgets/staticlib cd wxWidgets -wget https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.4/wxWidgets-3.1.4.tar.bz2 > /dev/null +wget https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.5/wxWidgets-3.1.5.tar.bz2 > /dev/null echo "Unpacking wxWidgets.." -tar -xvjf wxWidgets-3.1.4.tar.bz2 > /dev/null -cd wxWidgets-3.1.4/ +tar -xvjf wxWidgets-3.1.5.tar.bz2 > /dev/null +cd wxWidgets-3.1.5/ ./autogen.sh if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then -./configure --with-opengl --disable-shared --enable-monolithic --with-libjpeg --with-libtiff --with-libpng --with-zlib --disable-sdltest --enable-unicode --enable-display --enable-propgrid --disable-webkit --disable-webview --disable-webviewwebkit --prefix=`echo $HOME/build/wxWidgets/staticlib` CXXFLAGS="-std=c++0x" +./configure --with-opengl --disable-glcanvasegl --disable-shared --enable-monolithic --with-libjpeg --with-libtiff --with-libpng --with-zlib --disable-sdltest --enable-unicode --enable-display --enable-propgrid --disable-webkit --disable-webview --disable-webviewwebkit --prefix=`echo $HOME/build/wxWidgets/staticlib` CXXFLAGS="-std=c++0x" fi if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then -./configure --with-opengl --disable-shared --enable-monolithic --with-libjpeg --with-libtiff --with-libpng --with-zlib --with-mac --disable-sdltest --enable-unicode --enable-display --enable-propgrid --disable-webkit --disable-webview --disable-webviewwebkit --prefix=`echo $HOME/build/wxWidgets/staticlib` CXXFLAGS="-std=c++0x" --with-libiconv=/usr +./configure --with-opengl --disable-glcanvasegl --disable-shared --enable-monolithic --with-libjpeg --with-libtiff --with-libpng --with-zlib --with-mac --disable-sdltest --enable-unicode --enable-display --enable-propgrid --disable-webkit --disable-webview --disable-webviewwebkit --prefix=`echo $HOME/build/wxWidgets/staticlib` CXXFLAGS="-std=c++0x" --with-libiconv=/usr fi echo "Building wxWidgets.."