Skip to content

Commit

Permalink
Merge pull request #101 from MrYadro/backport_tvg-shift=0
Browse files Browse the repository at this point in the history
backport tvg-shift=0 fix to Krypton
  • Loading branch information
Jalle19 authored Jan 20, 2017
2 parents c9365a4 + 7a99a34 commit c06f367
Show file tree
Hide file tree
Showing 2 changed files with 98 additions and 96 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ language: cpp
#
# Define the build matrix
#
# Travis defaults to building on Ubuntu Precise when building on
# Linux. We need Trusty in order to get up to date versions of
# Travis defaults to building on Ubuntu Precise when building on
# Linux. We need Trusty in order to get up to date versions of
# cmake and g++.
#
matrix:
include:
- os: linux
dist: trusty
dist: trusty
sudo: required
compiler: gcc
- os: linux
dist: trusty
dist: trusty
sudo: required
compiler: clang
- os: osx
Expand All @@ -23,7 +23,7 @@ matrix:
osx_image: xcode6.1

#
# Some of the OS X images don't have cmake, contrary to what people
# Some of the OS X images don't have cmake, contrary to what people
# on the Internet say
#
before_install:
Expand All @@ -38,6 +38,6 @@ before_script:
- cd $TRAVIS_BUILD_DIR/..
- git clone --depth=1 https://github.com/xbmc/xbmc.git
- cd pvr.iptvsimple && mkdir build && cd build
- cmake -DADDONS_TO_BUILD=pvr.iptvsimple -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/project/cmake/addons
- cmake -DADDONS_TO_BUILD=pvr.iptvsimple -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons

script: make
Loading

0 comments on commit c06f367

Please sign in to comment.