Fix wx cache logic
This commit is contained in:
parent
45118b44e5
commit
10ff7a5453
|
@ -1,16 +1,22 @@
|
|||
# wxWidgets
|
||||
if [ ! -f "$HOME/build/wxWidgets/staticlib/bin/wx-config" ]; then
|
||||
if [ -f "$HOME/build/wxWidgets/staticlib/bin/wx-config" ]; then
|
||||
echo "wxWidgets cache found; skipping.."
|
||||
exit 0
|
||||
else
|
||||
echo "wxWidgets cache not found; building.."
|
||||
fi
|
||||
|
||||
echo "wxWidgets cache not found; building."
|
||||
|
||||
echo "Fetch wxWidgets.."
|
||||
cd $HOME/build
|
||||
mkdir -p $HOME/build/wxWidgets/staticlib
|
||||
cd wxWidgets
|
||||
wget https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.2/wxWidgets-3.1.2.tar.bz2
|
||||
wget https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.2/wxWidgets-3.1.2.tar.bz2 > /dev/null
|
||||
|
||||
echo "Unpacking wxWidgets.."
|
||||
tar -xvjf wxWidgets-3.1.2.tar.bz2 > /dev/null
|
||||
cd wxWidgets-3.1.2/
|
||||
./autogen.sh
|
||||
./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"
|
||||
|
@ -18,9 +24,9 @@ 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 --with-macosx-version-min=10.9 --prefix=`echo $HOME/build/wxWidgets/staticlib` CXXFLAGS="-std=c++0x" --with-libiconv=/usr
|
||||
fi
|
||||
|
||||
echo "Building wxWidgets.."
|
||||
make -j2
|
||||
make install
|
||||
|
||||
fi
|
Loading…
Reference in New Issue