Skip to content

Commit 1a5148d

Browse files
authored
Merge pull request #2 from labstreaminglayer/qt
[WIP] Port to CMake + Qt5 + QtMultimedia
2 parents a06c725 + 0fa257c commit 1a5148d

15 files changed

Lines changed: 592 additions & 675 deletions

.appveyor.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
version: 1.13.0.{build}
2+
pull_requests:
3+
do_not_increment_build_number: true
4+
shallow_clone: true
5+
environment:
6+
lsltag: 1.13.0-b12
7+
lslversion: 1.13.0
8+
LSLDIST_URL: "https://github.com/sccn/liblsl/releases/download"
9+
CMakeArgs: ""
10+
matrix:
11+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
12+
QTCOMPILER: msvc2017_64
13+
QTVER: 5.13
14+
- APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1604
15+
DEPLOYNAME: Linux64-xenial
16+
install:
17+
- cmd: appveyor DownloadFile https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip -FileName ninja.zip
18+
- cmd: appveyor DownloadFile %LSLDIST_URL%/%lsltag%/liblsl-%lslversion%-Win64.7z -FileName liblsl_x64.7z
19+
- cmd: 7z x ninja.zip
20+
- cmd: set PATH=%cd%;%PATH%
21+
- cmd: 7z x liblsl_x64.7z -oLSL
22+
- cmd: ninja --version
23+
- sh: set -x
24+
- sh: wget ${LSLDIST_URL}/${lsltag}/liblsl-${lslversion}-${DEPLOYNAME}.deb -O lsl.deb
25+
- sh: dpkg -x lsl.deb LSL
26+
- sh: sudo apt update && sudo apt install -y qtbase5-dev qtmultimedia5-dev
27+
build_script:
28+
- cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
29+
- cmd: cmake -S . -B build -G Ninja -DQt5_DIR=C:/Qt/%QTVER%/%QTCOMPILER%/lib/cmake/Qt5 -DBOOST_ROOT=C:/Libraries/boost_1_69_0 -DLSL_INSTALL_ROOT=LSL/ %CMakeArgs%
30+
- sh: cmake -S . -B build -DLSL_INSTALL_ROOT=LSL/usr -DLSL_UNIXFOLDERS=1 ${CMakeArgs}
31+
- cd build
32+
- cmake --build . --config Release --target install
33+
- cpack -C Release
34+
artifacts:
35+
- path: 'build/*.deb'
36+
- path: 'build/*.tar.*'
37+
- path: 'build/*.7z'

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ ui_*.h
22
/build*/
33
/CMakeLists.txt.user
44
/CMakeLists.json
5+
/CMakeSettings.json
6+
.vs/
7+
out/

AudioCaptureWin.pro

Lines changed: 0 additions & 24 deletions
This file was deleted.

AudioCaptureWin.sln

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)