Script copypasta err, unify wx cache dirs

cjcliffe · Jan 9, 2019 · 45118b4 · 45118b4
1 parent dd49fba
commit 45118b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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
diff --git a/travis-ci/build_wxwidgets.sh b/travis-ci/build_wxwidgets.sh
@@ -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.."