mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-04-27 01:58:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of gitlab.linphone.org:BC/public/linphone-desktop into fix/audio_crash_initialization

Browse source
This commit is contained in:
Julien Wadel 2020-03-27 09:02:25 +01:00
commit 6d06aa102b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci-files/job-macosx-desktop.yml
View file

@ -84,7 +84,7 @@ job-macosx-makefile-package:
variables: variables:
- $NIGHTLY_MASTER - $NIGHTLY_MASTER
variables: variables:
CMAKE_OPTIONS: -DENABLE_PACKAGING=YES CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES
extends: job-macosx-makefile extends: job-macosx-makefile
script: script:
- *build_all_script - *build_all_script

2
.gitlab-ci-files/job-windows-desktop.yml
View file

@ -125,7 +125,7 @@ job-windows-vs2017-package:
#this wrapper relays only needed calls to the real compiler #this wrapper relays only needed calls to the real compiler
#cache stats display #cache stats display
- C:\PROGRA~1\Python37\Scripts\cl -s - C:\PROGRA~1\Python37\Scripts\cl -s
- cmake .. -G "Visual Studio 15 2017" -DLINPHONESDK_PLATFORM=Desktop -DENABLE_CSHARP_WRAPPER=YES -DCMAKE_BUILD_TYPE=Release -DENABLE_PACKAGING=YES %DEFAULT_WINDOWS_CMAKE_OPTIONS% %CMAKE_OPTIONS% - cmake .. -G "Visual Studio 15 2017" -DLINPHONESDK_PLATFORM=Desktop -DENABLE_CSHARP_WRAPPER=YES -DCMAKE_BUILD_TYPE=Release -DENABLE_APP_PACKAGING=YES %DEFAULT_WINDOWS_CMAKE_OPTIONS% %CMAKE_OPTIONS%
- cmake --build . --target ALL_BUILD --config Release %LBC_NODEBUG_OPTIONS% -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false - cmake --build . --target ALL_BUILD --config Release %LBC_NODEBUG_OPTIONS% -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false
- C:\PROGRA~1\Python37\Scripts\cl -s - C:\PROGRA~1\Python37\Scripts\cl -s
- mkdir "%CI_PROJECT_DIR%/results" - mkdir "%CI_PROJECT_DIR%/results"