comicsansg/CubicSDR
comicsansg
/
CubicSDR
mirror of https://github.com/cjcliffe/CubicSDR.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Script copypasta err, unify wx cache dirs

This commit is contained in:
Charles J. Cliffe 2019-01-08 21:50:47 -05:00
parent dd49fbae4d
commit 45118b44e5
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -17,5 +17,4 @@ script:
- bash travis-ci/build_cubicsdr.sh
cache:
directories:
- /home/travis/build/wxWidgets/staticlib
- /Users/travis/build/wxWidgets/staticlib
- $HOME/build/wxWidgets/staticlib

4
travis-ci/build_wxwidgets.sh
View File

@ -12,11 +12,11 @@ tar -xvjf wxWidgets-3.1.2.tar.bz2 > /dev/null
cd wxWidgets-3.1.2/
./autogen.sh
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
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"
fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
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 --with-macosx-version-min=10.9 --prefix=`echo $HOME/build/wxWidgets/staticlib` CXXFLAGS="-std=c++0x" --with-libiconv=/usr
echo "Building wxWidgets.."