diff options
| author | Aleks Kissinger <aleks0@gmail.com> | 2018-12-20 22:43:18 +0100 |
|---|---|---|
| committer | Aleks Kissinger <aleks0@gmail.com> | 2018-12-20 22:43:18 +0100 |
| commit | 9e2724e96872d1dc320a00565152de227c836285 (patch) | |
| tree | 58c39d10f1b48a1ac610e974cbb4397dba75d686 | |
| parent | 3b132a72ebc2694dfd1695e6a45e34e60fa1f75e (diff) | |
various fixes to build scripts
| -rw-r--r-- | .appveyor.yml | 4 | ||||
| -rw-r--r-- | .travis.yml | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 8f32415..dc81831 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -16,7 +16,7 @@ install: - cmd: 'C:\Qt\5.11.2\mingw53_32\bin\qtenv2.bat' - cmd: cd C:\projects\tikzit - sh: sudo apt-get update - - sh: sudo apt-get -y install flex bison qt5-default poppler + - sh: sudo apt-get -y install flex bison qt5-default libpoppler-dev libpoppler-qt5-1 before_build: - ps: (new-object net.webclient).DownloadFile('http://tikzit.github.io/download/win32-deps.zip', 'c:\projects\tikzit\win32-deps.zip') @@ -25,7 +25,7 @@ before_build: build_script: - qmake -v - qmake - - cmd: nmake.exe + - cmd: mingw32-make - sh: make after_build: diff --git a/.travis.yml b/.travis.yml index 45b5146..722688d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,12 +12,12 @@ matrix: - FILE=tikzit-osx.dmg - QTVER=511 - DEPLOY_TIKZIT=1 - - os: osx - compiler: clang - env: - - FILE=tikzit-osx-mountain.dmg - - QTVER=56 - - DEPLOY_TIKZIT=1 + # - os: osx + # compiler: clang + # env: + # - FILE=tikzit-osx-mountain.dmg + # - QTVER=56 + # - DEPLOY_TIKZIT=1 before_install: # - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 56 ]] || curl https://raw.githubusercontent.com/GiovanniBussi/macports-ci/master/macports-ci > macports-ci' |