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

Add a build using GTK+ 3 to Travis

Browse Source 
We need to test both wxGTK2 and wxGTK3 builds.
This commit is contained in:
Vadim Zeitlin
2017-11-22 02:33:53 +01:00
parent 38e441bdd8
commit 2ee40f8a60
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -14,7 +14,7 @@ matrix:
compiler: gcc compiler: gcc
- dist: trusty - dist: trusty
compiler: gcc compiler: gcc
env: wxCONFIGURE_FLAGS="--enable-cxx11 --enable-stl" wxMAKEFILE_FLAGS="CXXFLAGS=-std=c++11" env: wxGTK_VERSION=3 wxCONFIGURE_FLAGS="--enable-cxx11 --enable-stl" wxMAKEFILE_FLAGS="CXXFLAGS=-std=c++11"
- dist: trusty - dist: trusty
compiler: clang compiler: clang
env: wxCONFIGURE_FLAGS="--disable-shared --disable-sys-libs" env: wxCONFIGURE_FLAGS="--disable-shared --disable-sys-libs"

6
build/tools/before_install.sh
View File

@@ -10,7 +10,11 @@ case $(uname -s) in
Linux) Linux)
if [ -f /etc/apt/sources.list ]; then if [ -f /etc/apt/sources.list ]; then
$SUDO apt-get update $SUDO apt-get update
$SUDO apt-get install -y libgtk2.0-dev libnotify-dev case "$wxGTK_VERSION" in
3) libgtk_dev=libgtk-3-dev ;;
*) libgtk_dev=libgtk2.0-dev;;
esac
$SUDO apt-get install -y $libgtk_dev libnotify-dev
fi fi
;; ;;