This commit is contained in:
xarkes 2018-02-25 20:17:03 +01:00 committed by xarkes
parent 9434476c11
commit a738c020f4
3 changed files with 23 additions and 4 deletions

View File

@ -15,7 +15,6 @@ branches:
# Environment
environment:
PYTHON: 'C:\Python36-x64'
NINJA_URL: https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip
QTDIR: 'C:\Qt\5.10.0\msvc2015_64'
QT32PATH: 'C:\Qt\5.10.0\msvc2015'
@ -24,12 +23,15 @@ environment:
matrix:
# Build: qmake vs2015 x86 shared
- ARCH: x86
PYTHON: 'C:\Python36'
QMAKE: 1
# Build: qmake vs2015 x64 shared
- ARCH: x64
PYTHON: 'C:\Python36-x64'
QMAKE: 1
# Build: meson ninja x64 static
- ARCH: x64
PYTHON: 'C:\Python36-x64'
MESON: 1
BACKEND: ninja

View File

@ -30,7 +30,7 @@ before_install:
install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew install p7zip ccache qt5 &&
brew install p7zip ccache qt5 python3 &&
export PATH="/usr/local/opt/qt/bin:$PATH"
; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then

View File

@ -27,14 +27,31 @@ macx {
QMAKE_INFO_PLIST = apple/Info.plist
}
unix:exists(/usr/local/include/libr) {
INCLUDEPATH += /usr/local/include/libr
}
# Libraries
include(lib_radare2.pri)
PKGCONFIG += python3
win32 {
pythonpath = $$quote($$system("where python"))
pythonpath = $$replace(pythonpath, ".exe ", ".exe;")
pythonpath = $$section(pythonpath, ";", 0, 0)
pythonpath = $$clean_path($$dirname(pythonpath))
LIBS += -L$${pythonpath} -L$${pythonpath}/libs -lpython3
INCLUDEPATH += $${pythonpath}/include
message($$pythonpath)
message($$LIBS)
message($$INCLUDEPATH)
}
unix|macx {
CONFIG += link_pkgconfig
!packagesExist(python3) {
error("ERROR: Python 3 could not be found. Make sure it is available to pkg-config.")
}
PKGCONFIG += python3
}
SOURCES += \
main.cpp \