Skip to content

Commit

Permalink
add alsa to deb package; fix
Browse files Browse the repository at this point in the history
  • Loading branch information
gillesdegottex committed Jul 10, 2016
1 parent fd8be99 commit 8ecf55d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ install:

script:
- echo $TRAVIS_BUILD_DIR
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then source /opt/qt52/bin/qt52-env.sh && qmake fmit.pro; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then source /opt/qt52/bin/qt52-env.sh && qmake "CONFIG+=acs_alsa" fmit.pro; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then qmake "FFT_LIBDIR=/usr/local/opt/fftw" fmit.pro; fi
- make

Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ build_script:
- ps: Get-ChildItem c:\projects\fmit\lib
- ps: Get-ChildItem c:\projects\fmit\lib\libfft
- ps: .\distrib\package_windows_appveyor.ps1 $env:platform
- ps: Move-Item distrib/FMIT-*-Win*bit.exe .
- ps: Move-Item distrib/fmit-*-win*bit.exe .
- ps: Get-ChildItem .
#- ps: $GITPROJECTVERSION = (git describe --tags --always) | Out-String
#- ps: $GITPROJECTVERSION = $GITPROJECTVERSION -replace "`n|`r"
Expand All @@ -79,7 +79,7 @@ build_script:


artifacts:
- path: FMIT-*-Win*bit.exe
- path: fmit-*-win*bit.exe
name: newinstallers # Reference used for deployment

deploy:
Expand Down
2 changes: 1 addition & 1 deletion fmit.pro
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ message(CONFIG=$$CONFIG)
# (if fail, fall back on the version present in the README.txt file)
FMITVERSIONGITPRO = $$system(git describe --tags --always)
FMITBRANCHGITPRO = $$system(git rev-parse --abbrev-ref HEAD)
message(Git: DFasma version: $$DFASMAVERSIONGITPRO Branch: $$FMITBRANCHGITPRO)
message(Git: FMIT version: $$FMITVERSIONGITPRO Branch: $$FMITBRANCHGITPRO)
DEFINES += FMITVERSIONGIT=$$FMITVERSIONGITPRO
DEFINES += FMITBRANCHGIT=$$FMITBRANCHGITPRO

Expand Down

0 comments on commit 8ecf55d

Please sign in to comment.