ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-19 11:26:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix meson version to 0.48.2; updated Qt to 5.10.1 (#996)

Browse Source
This commit is contained in:
xarkes 2018-12-11 19:22:45 +01:00 committed by GitHub
parent fc350849a3
commit 7ce1790fcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.appveyor.yml
View File

@ -9,8 +9,8 @@ configuration:
# Environment # Environment
environment: environment:
NINJA_URL: https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip NINJA_URL: https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip
QT32PATH: 'C:\Qt\5.9\msvc2015' QT32PATH: 'C:\Qt\5.10.1\msvc2015'
QT64PATH: 'C:\Qt\5.9\msvc2015_64' QT64PATH: 'C:\Qt\5.10.1\msvc2015_64'
VSVARSALLPATH: 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat' VSVARSALLPATH: 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat'
matrix: matrix:
# Build: qmake vs2015 x86 shared # Build: qmake vs2015 x86 shared
@ -34,7 +34,7 @@ install:
- cmd: set "PATH=%CD%;%PYTHON%;%PATH%" - cmd: set "PATH=%CD%;%PYTHON%;%PATH%"
- cmd: call "%VSVARSALLPATH%" %ARCH% - cmd: call "%VSVARSALLPATH%" %ARCH%
- cmd: if "%ARCH%" == "x64" ( set "PATH=%QT64PATH%\bin;%PATH%" ) else ( set "PATH=%QT32PATH%\bin;%PATH%" ) - cmd: if "%ARCH%" == "x64" ( set "PATH=%QT64PATH%\bin;%PATH%" ) else ( set "PATH=%QT32PATH%\bin;%PATH%" )
- cmd: python -m pip install meson - cmd: python -m pip install meson==0.48.2
- cmd: powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; wget %NINJA_URL% -OutFile ninja.zip; Expand-Archive .\ninja.zip -DestinationPath ." - cmd: powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; wget %NINJA_URL% -OutFile ninja.zip; Expand-Archive .\ninja.zip -DestinationPath ."
# Artifacts # Artifacts
- cmd: set "ARTIFACT_NAME=Cutter_%ARCH%" - cmd: set "ARTIFACT_NAME=Cutter_%ARCH%"

2
src/meson.build
View File

@ -1,7 +1,7 @@
project('Cutter', 'cpp', default_options: 'cpp_std=c++11', meson_version: '>=0.47.0') project('Cutter', 'cpp', default_options: 'cpp_std=c++11', meson_version: '>=0.47.0')
qt5_mod = import('qt5') qt5_mod = import('qt5')
py3_exe = import('python3').find_python() py3_exe = import('python').find_installation('python3')
qt_modules = [] qt_modules = []
feature_define_args = [] feature_define_args = []